From 15e832af5b29794df593df08d16865fc4355cfc6 Mon Sep 17 00:00:00 2001
From: "laurent.perron@gmail.com"
 <laurent.perron@gmail.com@59fed7e4-672f-1a80-1451-5ac2ff6d83f1>
Date: Sun, 29 Dec 2013 14:54:48 +0000
Subject: [PATCH] fix problem with native libraries not found in python3; align
 display

---
 examples/python/hidato_table.py |  8 ++++----
 makefiles/Makefile.python.mk    | 26 ++++++++++++++------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/examples/python/hidato_table.py b/examples/python/hidato_table.py
index 19c5616ac8..3e32a1bf23 100644
--- a/examples/python/hidato_table.py
+++ b/examples/python/hidato_table.py
@@ -168,10 +168,10 @@ def Solve(model):
 
   solver.EndSearch()
 
-  print('num_solutions: %i' % num_solutions)
-  print('failures: %i' % solver.Failures())
-  print('branches: %i' % solver.Branches())
-  print('wall time:%i' % solver.WallTime())
+  print('solutions : %i' % num_solutions)
+  print('failures  : %i' % solver.Failures())
+  print('branches  : %i' % solver.Branches())
+  print('wall time : %i' % solver.WallTime())
 
 
 def PrintOneSolution(positions, rows, cols, num_solution):
diff --git a/makefiles/Makefile.python.mk b/makefiles/Makefile.python.mk
index 33394af5c2..473caa51f3 100644
--- a/makefiles/Makefile.python.mk
+++ b/makefiles/Makefile.python.mk
@@ -12,18 +12,10 @@ python: pycp pyalgorithms pygraph pylp
 
 # Clean target
 clean_python:
-	-$(DEL) $(GEN_DIR)$Sortools$Salgorithms$S*python_wrap*
-	-$(DEL) $(GEN_DIR)$Sortools$Sconstraint_solver$S*python_wrap*
-	-$(DEL) $(GEN_DIR)$Sortools$Sgraph$S*python_wrap*
-	-$(DEL) $(GEN_DIR)$Sortools$Slinear_solver$S*python_wrap*
-	-$(DEL) $(GEN_DIR)$Sortools$Salgorithms$S*.py
-	-$(DEL) $(GEN_DIR)$Sortools$Sconstraint_solver$S*.py
-	-$(DEL) $(GEN_DIR)$Sortools$Sgraph$S*.py
-	-$(DEL) $(GEN_DIR)$Sortools$Slinear_solver$S*.py
-	-$(DEL) $(GEN_DIR)$Sortools$Salgorithms$S*.pyc
-	-$(DEL) $(GEN_DIR)$Sortools$Sconstraint_solver$S*.pyc
-	-$(DEL) $(GEN_DIR)$Sortools$Sgraph$S*.pyc
-	-$(DEL) $(GEN_DIR)$Sortools$Slinear_solver$S*.pyc
+	-$(DELREC) $(GEN_DIR)$Sortools$Salgorithms$S*
+	-$(DELREC) $(GEN_DIR)$Sortools$Sconstraint_solver$S*
+	-$(DELREC) $(GEN_DIR)$Sortools$Sgraph$S*
+	-$(DELREC) $(GEN_DIR)$Sortools$Slinear_solver$S*
 	-$(DEL) $(GEN_DIR)$Salgorithms$S*python_wrap*
 	-$(DEL) $(GEN_DIR)$Sconstraint_solver$S*python_wrap*
 	-$(DEL) $(GEN_DIR)$Sgraph$S*python_wrap*
@@ -54,6 +46,8 @@ $(LIB_DIR)/_pywrapknapsack_solver.$(DYNAMIC_SWIG_LIB_SUFFIX): $(OBJ_DIR)/knapsac
 	$(DYNAMIC_LD) $(LDOUT)$(LIB_DIR)$S_pywrapknapsack_solver.$(DYNAMIC_SWIG_LIB_SUFFIX) $(OBJ_DIR)$Sknapsack_solver_python_wrap.$O $(STATIC_ALGORITHMS_LNK) $(STATIC_LD_FLAGS) $(PYTHON_LNK)
 ifeq "$(SYSTEM)" "win"
 	copy $(LIB_DIR)\\_pywrapknapsack_solver.dll $(GEN_DIR)\\ortools\\algorithms\\_pywrapknapsack_solver.pyd
+else
+	cp $(LIB_DIR)/_pywrapknapsack_solver.$(DYNAMIC_SWIG_LIB_SUFFIX) $(GEN_DIR)/ortools/algorithms
 endif
 
 # pywrapgraph
@@ -71,6 +65,8 @@ $(LIB_DIR)/_pywrapgraph.$(DYNAMIC_SWIG_LIB_SUFFIX): $(OBJ_DIR)/pywrapgraph_pytho
 	$(DYNAMIC_LD) $(LDOUT)$(LIB_DIR)$S_pywrapgraph.$(DYNAMIC_SWIG_LIB_SUFFIX) $(OBJ_DIR)$Spywrapgraph_python_wrap.$O $(STATIC_GRAPH_LNK) $(STATIC_LD_FLAGS) $(PYTHON_LNK)
 ifeq "$(SYSTEM)" "win"
 	copy $(LIB_DIR)\\_pywrapgraph.dll $(GEN_DIR)\\ortools\\graph\\_pywrapgraph.pyd
+else
+	cp $(LIB_DIR)/_pywrapgraph.$(DYNAMIC_SWIG_LIB_SUFFIX) $(GEN_DIR)/ortools/graph
 endif
 
 # pywrapcp
@@ -89,6 +85,8 @@ $(LIB_DIR)/_pywrapcp.$(DYNAMIC_SWIG_LIB_SUFFIX): $(OBJ_DIR)/constraint_solver_py
 	$(DYNAMIC_LD) $(LDOUT)$(LIB_DIR)$S_pywrapcp.$(DYNAMIC_SWIG_LIB_SUFFIX) $(OBJ_DIR)$Sconstraint_solver_python_wrap.$O $(STATIC_CP_LNK) $(STATIC_LD_FLAGS) $(PYTHON_LNK)
 ifeq "$(SYSTEM)" "win"
 	copy $(LIB_DIR)\\_pywrapcp.dll $(GEN_DIR)\\ortools\\constraint_solver\\_pywrapcp.pyd
+else
+	cp $(LIB_DIR)/_pywrapcp.$(DYNAMIC_SWIG_LIB_SUFFIX) $(GEN_DIR)/ortools/constraint_solver
 endif
 
 # pywraprouting
@@ -105,6 +103,8 @@ $(LIB_DIR)/_pywraprouting.$(DYNAMIC_SWIG_LIB_SUFFIX): $(OBJ_DIR)/routing_python_
 	$(DYNAMIC_LD) $(LDOUT)$(LIB_DIR)$S_pywraprouting.$(DYNAMIC_SWIG_LIB_SUFFIX) $(OBJ_DIR)$Srouting_python_wrap.$O $(STATIC_ROUTING_LNK) $(STATIC_LD_FLAGS) $(PYTHON_LNK)
 ifeq "$(SYSTEM)" "win"
 	copy $(LIB_DIR)\\_pywraprouting.dll $(GEN_DIR)\\ortools\\constraint_solver\\_pywraprouting.pyd
+else
+	cp $(LIB_DIR)/_pywraprouting.$(DYNAMIC_SWIG_LIB_SUFFIX) $(GEN_DIR)/ortools/constraint_solver
 endif
 
 # pywraplp
@@ -123,6 +123,8 @@ $(LIB_DIR)/_pywraplp.$(DYNAMIC_SWIG_LIB_SUFFIX): $(OBJ_DIR)/linear_solver_python
 	$(DYNAMIC_LD) $(LDOUT)$(LIB_DIR)$S_pywraplp.$(DYNAMIC_SWIG_LIB_SUFFIX) $(OBJ_DIR)$Slinear_solver_python_wrap.$O $(STATIC_LP_LNK) $(STATIC_LD_FLAGS) $(PYTHON_LNK)
 ifeq "$(SYSTEM)" "win"
 	copy $(LIB_DIR)\\_pywraplp.dll $(GEN_DIR)\\ortools\\linear_solver\\_pywraplp.pyd
+else
+	cp $(LIB_DIR)/_pywraplp.$(DYNAMIC_SWIG_LIB_SUFFIX) $(GEN_DIR)/ortools/linear_solver
 endif
 
 # Run a single example