1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
|
diff -ur cgal-python-0.9.4-beta1.orig/bindings/Alpha_shapes_2/Makefile cgal-python-0.9.4-beta1/bindings/Alpha_shapes_2/Makefile
--- cgal-python-0.9.4-beta1.orig/bindings/Alpha_shapes_2/Makefile 2009-03-17 16:34:46.000000000 +0200
+++ cgal-python-0.9.4-beta1/bindings/Alpha_shapes_2/Makefile 2010-02-26 01:40:39.000000000 +0200
@@ -12,7 +12,7 @@
all: $(OBJ_of_Kernel_module) $(OBJ_of_Triangulation_2_module)
@echo 'Creating a Python modules'
- @g++ $(CGAL_PYTHON_LDFLAGS) $(OBJ_of_Kernel_module) -o $(Kernel_module).so
+ @g++ $(LDFLAGS) $(OBJ_of_Kernel_module) -o $(Kernel_module).so $(CGAL_PYTHON_LDFLAGS)
@echo '$(Kernel_module) module is created in ./$(Kernel_module)/$(Kernel_module).so'
.cpp.o:
diff -ur cgal-python-0.9.4-beta1.orig/bindings/Alpha_shapes_3/Makefile cgal-python-0.9.4-beta1/bindings/Alpha_shapes_3/Makefile
--- cgal-python-0.9.4-beta1.orig/bindings/Alpha_shapes_3/Makefile 2009-03-17 16:34:46.000000000 +0200
+++ cgal-python-0.9.4-beta1/bindings/Alpha_shapes_3/Makefile 2010-02-26 01:40:22.000000000 +0200
@@ -12,7 +12,7 @@
all: $(OBJ_of_Kernel_module) $(OBJ_of_Triangulation_3_module)
@echo 'Creating a Python modules'
- @g++ $(CGAL_PYTHON_LDFLAGS) $(OBJ_of_Kernel_module) -o $(Kernel_module).so
+ @g++ $(LDFLAGS) $(OBJ_of_Kernel_module) -o $(Kernel_module).so $(CGAL_PYTHON_LDFLAGS)
@echo '$(Kernel_module) module is created in ./$(Kernel_module)/$(Kernel_module).so'
.cpp.o:
diff -ur cgal-python-0.9.4-beta1.orig/bindings/Convex_hull_2/Makefile cgal-python-0.9.4-beta1/bindings/Convex_hull_2/Makefile
--- cgal-python-0.9.4-beta1.orig/bindings/Convex_hull_2/Makefile 2009-03-17 16:34:46.000000000 +0200
+++ cgal-python-0.9.4-beta1/bindings/Convex_hull_2/Makefile 2010-02-26 01:41:08.000000000 +0200
@@ -11,7 +11,7 @@
all: $(OBJ_of_Convex_hull_module) $(OBJ_of_Triangulation_2_module)
@echo 'Creating a Python modules'
- @g++ $(CGAL_PYTHON_LDFLAGS) $(OBJ_of_Convex_hull_module) -o $(Convex_hull_module).so
+ @g++ $(LDFLAGS) $(OBJ_of_Convex_hull_module) -o $(Convex_hull_module).so $(CGAL_PYTHON_LDFLAGS)
@echo '$(Convex_hull_module) module is created in ./$(Convex_hull_module)/$(Convex_hull_module).so'
.cpp.o:
diff -ur cgal-python-0.9.4-beta1.orig/bindings/Geometric_Optimisation/Makefile cgal-python-0.9.4-beta1/bindings/Geometric_Optimisation/Makefile
--- cgal-python-0.9.4-beta1.orig/bindings/Geometric_Optimisation/Makefile 2009-03-17 16:34:47.000000000 +0200
+++ cgal-python-0.9.4-beta1/bindings/Geometric_Optimisation/Makefile 2010-02-26 01:41:49.000000000 +0200
@@ -15,7 +15,7 @@
all: $(OBJ_of_Optimisation_module)
@echo 'Creating a Python modules'
- @g++ $(CGAL_PYTHON_LDFLAGS) $(OBJ_of_Optimisation_module) -o $(Optimisation_module).so
+ @g++ $(LDFLAGS) $(OBJ_of_Optimisation_module) -o $(Optimisation_module).so $(CGAL_PYTHON_LDFLAGS)
@echo '$(Optimisation_module) module is created in ./$(Optimisation_module)/$(Optimisation_module).so'
.cpp.o:
diff -ur cgal-python-0.9.4-beta1.orig/bindings/Kernel/Makefile cgal-python-0.9.4-beta1/bindings/Kernel/Makefile
--- cgal-python-0.9.4-beta1.orig/bindings/Kernel/Makefile 2009-03-17 16:34:46.000000000 +0200
+++ cgal-python-0.9.4-beta1/bindings/Kernel/Makefile 2010-02-26 01:39:57.000000000 +0200
@@ -41,7 +41,7 @@
all: $(OBJ_of_Kernel_module)
@echo 'Creating a Python modules'
- @g++ $(CGAL_PYTHON_LDFLAGS) $(OBJ_of_Kernel_module) -o $(Kernel_module).so
+ @g++ $(LDFLAGS) $(OBJ_of_Kernel_module) -o $(Kernel_module).so $(CGAL_PYTHON_LDFLAGS)
@echo 'Kernel is created in ./$(Kernel_module)/'
.cpp.o:
diff -ur cgal-python-0.9.4-beta1.orig/bindings/makefile.inc cgal-python-0.9.4-beta1/bindings/makefile.inc
--- cgal-python-0.9.4-beta1.orig/bindings/makefile.inc 2009-03-17 16:34:47.000000000 +0200
+++ cgal-python-0.9.4-beta1/bindings/makefile.inc 2010-02-26 01:48:10.000000000 +0200
@@ -9,7 +9,6 @@
# as it would prefer, e.g. -lpython2.4 on FC5.
LDOPT=`(uname | grep Darwin > /dev/null) && echo "-dynamiclib -lpython" || echo "-shared"`
-CGAL_PYTHON_LDFLAGS=$(LDOPT) -lboost_python $(LDFLAGS) $(CGAL_LDFLAGS)
-
+CGAL_PYTHON_LDFLAGS=$(LDOPT) -lboost_python -lCGAL -lCGAL_Core -lmpfr $(CGAL_LDFLAGS)
CGAL_PYTHON_CXXFLAGS=-fPIC -DCGAL_DONT_USE_LAZY_KERNEL $(CXXFLAGS) $(CPPFLAGS) $(CGAL_CXXFLAGS) -I../.. -O2
diff -ur cgal-python-0.9.4-beta1.orig/bindings/Mesh_2/Makefile cgal-python-0.9.4-beta1/bindings/Mesh_2/Makefile
--- cgal-python-0.9.4-beta1.orig/bindings/Mesh_2/Makefile 2009-03-17 16:34:47.000000000 +0200
+++ cgal-python-0.9.4-beta1/bindings/Mesh_2/Makefile 2010-02-26 01:40:53.000000000 +0200
@@ -12,7 +12,7 @@
all:$(OBJ_of_Mesh_2_module)
@echo 'Creating a Python modules'
- @g++ $(CGAL_PYTHON_LDFLAGS) $(OBJ_of_Mesh_2_module) -o $(Mesh_2_module).so
+ @g++ $(LDFLAGS) $(OBJ_of_Mesh_2_module) -o $(Mesh_2_module).so $(CGAL_PYTHON_LDFLAGS)
@echo '$(Mesh_2_module) module is created in ./$(Mesh_2_module)/$(Mesh_2_module).so'
.cpp.o:
diff -ur cgal-python-0.9.4-beta1.orig/bindings/Polyhedron/Makefile cgal-python-0.9.4-beta1/bindings/Polyhedron/Makefile
--- cgal-python-0.9.4-beta1.orig/bindings/Polyhedron/Makefile 2009-03-17 16:34:46.000000000 +0200
+++ cgal-python-0.9.4-beta1/bindings/Polyhedron/Makefile 2010-02-26 01:41:38.000000000 +0200
@@ -13,7 +13,7 @@
all:$(OBJ_of_Polyhedron_module)
@echo 'Creating a Python modules'
- @g++ $(CGAL_PYTHON_LDFLAGS) $(OBJ_of_Polyhedron_module) -o $(Polyhedron_module).so
+ @g++ $(LDFLAGS) $(OBJ_of_Polyhedron_module) -o $(Polyhedron_module).so $(CGAL_PYTHON_LDFLAGS)
@echo '$(Polyhedron_module) module is created in ./$(Polyhedron_module)/$(Polyhedron_module).so'
.cpp.o:
diff -ur cgal-python-0.9.4-beta1.orig/bindings/Triangulations_2/Makefile cgal-python-0.9.4-beta1/bindings/Triangulations_2/Makefile
--- cgal-python-0.9.4-beta1.orig/bindings/Triangulations_2/Makefile 2009-03-17 16:34:46.000000000 +0200
+++ cgal-python-0.9.4-beta1/bindings/Triangulations_2/Makefile 2010-02-26 01:41:24.000000000 +0200
@@ -17,7 +17,7 @@
all:$(OBJ_of_Triangulation_2_module)
@echo 'Creating a Python modules'
- @g++ $(CGAL_PYTHON_LDFLAGS) $(OBJ_of_Triangulation_2_module) -o $(Triangulation_2_module).so
+ @g++ $(LDFLAGS) $(OBJ_of_Triangulation_2_module) -o $(Triangulation_2_module).so $(CGAL_PYTHON_LDFLAGS)
@echo '$(Triangulation_2_module) module is created in ./$(Triangulation_2_module)/$(Triangulation_2_module).so'
.cpp.o:
diff -ur cgal-python-0.9.4-beta1.orig/bindings/Triangulations_3/Makefile cgal-python-0.9.4-beta1/bindings/Triangulations_3/Makefile
--- cgal-python-0.9.4-beta1.orig/bindings/Triangulations_3/Makefile 2009-03-17 16:34:46.000000000 +0200
+++ cgal-python-0.9.4-beta1/bindings/Triangulations_3/Makefile 2010-02-26 01:39:41.000000000 +0200
@@ -14,7 +14,7 @@
all:$(OBJ_of_Triangulation_3_module)
@echo 'Creating a Python modules'
- @g++ $(CGAL_PYTHON_LDFLAGS) $(OBJ_of_Triangulation_3_module) -o $(Triangulation_3_module).so
+ @g++ $(LDFLAGS) $(OBJ_of_Triangulation_3_module) -o $(Triangulation_3_module).so $(CGAL_PYTHON_LDFLAGS)
@echo '$(Triangulation_3_module) module is created in ./$(Triangulation_3_module)/$(Triangulation_3_module).so'
.cpp.o:
|
GitWeb