source: issm/oecreview/Archive/14312-15392/ISSM-14888-14889.diff@ 15393

Last change on this file since 15393 was 15393, checked in by Mathieu Morlighem, 12 years ago

NEW: adding Archive/14312-15392 for oecreview
File size: 12.9 KB
RevLine 
[15393]1Index: ../trunk-jpl/src/wrappers/python/Makefile.am
2===================================================================
3--- ../trunk-jpl/src/wrappers/python/Makefile.am (revision 14888)
4+++ ../trunk-jpl/src/wrappers/python/Makefile.am (revision 14889)
5@@ -87,53 +87,53 @@
6 #Bin sources {{{
7 BamgConvertMesh_la_SOURCES = ../BamgConvertMesh/BamgConvertMesh.cpp\
8 ../BamgConvertMesh/BamgConvertMesh.h
9-BamgConvertMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
10+BamgConvertMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
11
12 BamgMesher_la_SOURCES = ../BamgMesher/BamgMesher.cpp\
13 ../BamgMesher/BamgMesher.h
14-BamgMesher_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
15+BamgMesher_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
16
17 ContourToMesh_la_SOURCES = ../ContourToMesh/ContourToMesh.cpp\
18 ../ContourToMesh/ContourToMesh.h
19-ContourToMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
20+ContourToMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
21
22 ContourToNodes_la_SOURCES = ../ContourToNodes/ContourToNodes.cpp\
23 ../ContourToNodes/ContourToNodes.h
24-ContourToNodes_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
25+ContourToNodes_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
26
27 ElementConnectivity_la_SOURCES = ../ElementConnectivity/ElementConnectivity.cpp\
28 ../ElementConnectivity/ElementConnectivity.h
29-ElementConnectivity_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
30+ElementConnectivity_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
31
32 EnumToString_la_SOURCES = ../EnumToString/EnumToString.cpp\
33 ../EnumToString/EnumToString.h
34-EnumToString_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
35+EnumToString_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
36
37 InterpFromMeshToMesh2d_la_SOURCES = ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp\
38 ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h
39-InterpFromMeshToMesh2d_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB)
40+InterpFromMeshToMesh2d_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB) $(GSLLIB)
41
42 InterpFromGridToMesh_la_SOURCES = ../InterpFromGridToMesh/InterpFromGridToMesh.cpp\
43 ../InterpFromGridToMesh/InterpFromGridToMesh.h
44-InterpFromGridToMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB)
45+InterpFromGridToMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB) $(GSLLIB)
46
47 MeshProfileIntersection_la_SOURCES = ../MeshProfileIntersection/MeshProfileIntersection.cpp\
48 ../MeshProfileIntersection/MeshProfileIntersection.h
49-MeshProfileIntersection_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
50+MeshProfileIntersection_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
51
52 NodeConnectivity_la_SOURCES = ../NodeConnectivity/NodeConnectivity.cpp\
53 ../NodeConnectivity/NodeConnectivity.h
54-NodeConnectivity_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
55+NodeConnectivity_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
56
57 StringToEnum_la_SOURCES = ../StringToEnum/StringToEnum.cpp\
58 ../StringToEnum/StringToEnum.h
59-StringToEnum_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
60+StringToEnum_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
61
62 TriMesh_la_SOURCES = ../TriMesh/TriMesh.cpp\
63 ../TriMesh/TriMesh.h
64-TriMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(TRIANGLELIB)
65+TriMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(TRIANGLELIB) $(GSLLIB)
66
67 TriMeshProcessRifts_la_SOURCES = ../TriMeshProcessRifts/TriMeshProcessRifts.cpp\
68 ../TriMeshProcessRifts/TriMeshProcessRifts.h
69-TriMeshProcessRifts_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
70+TriMeshProcessRifts_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
71 #}}}
72Index: ../trunk-jpl/src/wrappers/matlab/Makefile.am
73===================================================================
74--- ../trunk-jpl/src/wrappers/matlab/Makefile.am (revision 14888)
75+++ ../trunk-jpl/src/wrappers/matlab/Makefile.am (revision 14889)
76@@ -130,131 +130,131 @@
77 #Bin sources {{{
78 AverageFilter_la_SOURCES = ../AverageFilter/AverageFilter.cpp\
79 ../AverageFilter/AverageFilter.h
80-AverageFilter_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
81+AverageFilter_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
82
83 BamgMesher_la_SOURCES = ../BamgMesher/BamgMesher.cpp\
84 ../BamgMesher/BamgMesher.h
85-BamgMesher_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
86+BamgMesher_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
87
88 BamgConvertMesh_la_SOURCES = ../BamgConvertMesh/BamgConvertMesh.cpp\
89 ../BamgConvertMesh/BamgConvertMesh.h
90-BamgConvertMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
91+BamgConvertMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
92
93 BamgTriangulate_la_SOURCES = ../BamgTriangulate/BamgTriangulate.cpp\
94 ../BamgTriangulate/BamgTriangulate.h
95-BamgTriangulate_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
96+BamgTriangulate_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
97
98 Chaco_la_SOURCES = ../Chaco/Chaco.cpp\
99 ../Chaco/Chaco.h
100-Chaco_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(CHACOLIB)
101+Chaco_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(CHACOLIB) $(GSLLIB)
102
103 ContourToMesh_la_SOURCES = ../ContourToMesh/ContourToMesh.cpp\
104 ../ContourToMesh/ContourToMesh.h
105-ContourToMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB)
106+ContourToMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB) $(GSLLIB)
107
108 ContourToNodes_la_SOURCES = ../ContourToNodes/ContourToNodes.cpp\
109 ../ContourToNodes/ContourToNodes.h
110-ContourToNodes_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
111+ContourToNodes_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
112
113 ElementConnectivity_la_SOURCES = ../ElementConnectivity/ElementConnectivity.cpp\
114 ../ElementConnectivity/ElementConnectivity.h
115-ElementConnectivity_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
116+ElementConnectivity_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
117
118 EnumToString_la_SOURCES = ../EnumToString/EnumToString.cpp\
119 ../EnumToString/EnumToString.h
120-EnumToString_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
121+EnumToString_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
122
123 StringToEnum_la_SOURCES = ../StringToEnum/StringToEnum.cpp\
124 ../StringToEnum/StringToEnum.h
125-StringToEnum_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
126+StringToEnum_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
127
128 HoleFiller_la_SOURCES = ../HoleFiller/HoleFiller.cpp\
129 ../HoleFiller/HoleFiller.h
130-HoleFiller_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
131+HoleFiller_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
132
133 InternalFront_la_SOURCES = ../InternalFront/InternalFront.cpp\
134 ../InternalFront/InternalFront.h
135-InternalFront_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
136+InternalFront_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
137
138 InterpFromGridToMesh_la_SOURCES = ../InterpFromGridToMesh/InterpFromGridToMesh.cpp\
139 ../InterpFromGridToMesh/InterpFromGridToMesh.h
140-InterpFromGridToMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB)
141+InterpFromGridToMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB) $(GSLLIB)
142
143 InterpFromMeshToMesh2d_la_SOURCES = ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp\
144 ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h
145-InterpFromMeshToMesh2d_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB)
146+InterpFromMeshToMesh2d_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB) $(GSLLIB)
147
148 InterpFromMeshToMesh3d_la_SOURCES = ../InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp\
149 ../InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h
150-InterpFromMeshToMesh3d_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
151+InterpFromMeshToMesh3d_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
152
153 InterpFromMeshToGrid_la_SOURCES = ../InterpFromMeshToGrid/InterpFromMeshToGrid.cpp\
154 ../InterpFromMeshToGrid/InterpFromMeshToGrid.h
155-InterpFromMeshToGrid_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
156+InterpFromMeshToGrid_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
157
158 InterpFromMesh2d_la_SOURCES = ../InterpFromMesh2d/InterpFromMesh2d.cpp\
159 ../InterpFromMesh2d/InterpFromMesh2d.h
160-InterpFromMesh2d_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB)
161+InterpFromMesh2d_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB) $(GSLLIB)
162
163 KMLFileRead_la_SOURCES = ../KMLFileRead/KMLFileRead.cpp\
164 ../KMLFileRead/KMLFileRead.h
165-KMLFileRead_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
166+KMLFileRead_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
167
168 KMLMeshWrite_la_SOURCES = ../KMLMeshWrite/KMLMeshWrite.cpp\
169 ../KMLMeshWrite/KMLMeshWrite.h
170-KMLMeshWrite_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
171+KMLMeshWrite_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
172
173 KMLOverlay_la_SOURCES = ../KMLOverlay/KMLOverlay.cpp\
174 ../KMLOverlay/KMLOverlay.h
175-KMLOverlay_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
176+KMLOverlay_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
177
178 Xy2ll_la_SOURCES = ../Xy2ll/Xy2ll.cpp\
179 ../Xy2ll/Xy2ll.h
180-Xy2ll_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
181+Xy2ll_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
182
183 Ll2xy_la_SOURCES = ../Ll2xy/Ll2xy.cpp\
184 ../Ll2xy/Ll2xy.h
185-Ll2xy_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
186+Ll2xy_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
187
188 EdgeDetection_la_SOURCES = ../EdgeDetection/EdgeDetection.cpp\
189 ../EdgeDetection/EdgeDetection.h
190-EdgeDetection_la_LIBADD= ${deps} $(MPILIB) $(PETSCLIB)
191+EdgeDetection_la_LIBADD= ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
192
193 ExpSimplify_la_SOURCES = ../ExpSimplify/ExpSimplify.cpp\
194 ../ExpSimplify/ExpSimplify.h
195-ExpSimplify_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
196+ExpSimplify_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
197
198 Exp2Kml_la_SOURCES = ../Exp2Kml/Exp2Kml.cpp\
199 ../Exp2Kml/Exp2Kml.h
200-Exp2Kml_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
201+Exp2Kml_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
202
203 Kml2Exp_la_SOURCES = ../Kml2Exp/Kml2Exp.cpp\
204 ../Kml2Exp/Kml2Exp.h
205-Kml2Exp_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
206+Kml2Exp_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
207
208 Kriging_la_SOURCES = ../Kriging/Kriging.cpp\
209 ../Kriging/Kriging.h
210-Kriging_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(MULTITHREADINGLIB)
211+Kriging_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(MULTITHREADINGLIB) $(GSLLIB)
212
213 MeshPartition_la_SOURCES = ../MeshPartition/MeshPartition.cpp\
214 ../MeshPartition/MeshPartition.h
215-MeshPartition_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(METISLIB)
216+MeshPartition_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(METISLIB) $(GSLLIB)
217
218 MeshProfileIntersection_la_SOURCES = ../MeshProfileIntersection/MeshProfileIntersection.cpp\
219 ../MeshProfileIntersection/MeshProfileIntersection.h
220-MeshProfileIntersection_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
221+MeshProfileIntersection_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
222
223 NodeConnectivity_la_SOURCES = ../NodeConnectivity/NodeConnectivity.cpp\
224 ../NodeConnectivity/NodeConnectivity.h
225-NodeConnectivity_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
226+NodeConnectivity_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
227
228 PointCloudFindNeighbors_la_SOURCES = ../PointCloudFindNeighbors/PointCloudFindNeighbors.cpp\
229 ../PointCloudFindNeighbors/PointCloudFindNeighbors.h
230-PointCloudFindNeighbors_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB)
231+PointCloudFindNeighbors_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB) $(GSLLIB)
232
233 PropagateFlagsFromConnectivity_la_SOURCES = ../PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.cpp\
234 ../PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.h
235-PropagateFlagsFromConnectivity_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
236+PropagateFlagsFromConnectivity_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
237
238 Scotch_la_SOURCES = ../Scotch/Scotch.cpp\
239 ../Scotch/Scotch.h
240@@ -262,21 +262,21 @@
241
242 Shp2Exp_la_SOURCES = ../Shp2Exp/Shp2Exp.cpp\
243 ../Shp2Exp/Shp2Exp.h
244-Shp2Exp_la_LIBADD = ${deps} $(SHAPELIBLIB) $(MPILIB) $(PETSCLIB)
245+Shp2Exp_la_LIBADD = ${deps} $(SHAPELIBLIB) $(MPILIB) $(PETSCLIB) $(GSLLIB)
246
247 Shp2Kml_la_SOURCES = ../Shp2Kml/Shp2Kml.cpp\
248 ../Shp2Kml/Shp2Kml.h
249-Shp2Kml_la_LIBADD = ${deps} $(SHAPELIBLIB) $(MPILIB) $(PETSCLIB)
250+Shp2Kml_la_LIBADD = ${deps} $(SHAPELIBLIB) $(MPILIB) $(PETSCLIB) $(GSLLIB)
251
252 TriaSearch_la_SOURCES = ../TriaSearch/TriaSearch.cpp\
253 ../TriaSearch/TriaSearch.h
254-TriaSearch_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
255+TriaSearch_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
256
257 TriMesh_la_SOURCES = ../TriMesh/TriMesh.cpp\
258 ../TriMesh/TriMesh.h
259-TriMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(TRIANGLELIB)
260+TriMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(TRIANGLELIB) $(GSLLIB)
261
262 TriMeshProcessRifts_la_SOURCES = ../TriMeshProcessRifts/TriMeshProcessRifts.cpp\
263 ../TriMeshProcessRifts/TriMeshProcessRifts.h
264-TriMeshProcessRifts_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
265+TriMeshProcessRifts_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB)
266 #}}}
Note: See TracBrowser for help on using the repository browser.