source: issm/oecreview/Archive/12678-13393/ISSM-13071-13072.diff@ 13394

Last change on this file since 13394 was 13394, checked in by Mathieu Morlighem, 13 years ago

Added 12678-13393
File size: 17.8 KB
RevLine 
[13394]1Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am
2===================================================================
3--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am (revision 13071)
4+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am (revision 13072)
5@@ -5,22 +5,22 @@
6 #Library declaration {{{
7 lib_LIBRARIES = libISSMCore.a libISSMOverload.a
8
9-#if SHAREDLIBS
10-#lib_LTLIBRARIES = libISSMCore.la libISSMOverload.la libISSM.la
11-#endif
12+if SHAREDLIBS
13+lib_LTLIBRARIES = libISSMCore.la libISSMOverload.la libISSM.la
14+endif
15 if PYTHON
16 lib_LIBRARIES += libISSMPython.a
17 endif
18 if MATLAB
19-#if SHAREDLIBS
20-#lib_LTLIBRARIES += libISSMMatlab.la
21-#endif
22+if SHAREDLIBS
23+lib_LTLIBRARIES += libISSMMatlab.la
24+endif
25 lib_LIBRARIES += libISSMMatlab.a
26 endif
27 if MODULES
28-#if SHAREDLIBS
29-#lib_LTLIBRARIES += libISSMModules.la
30-#endif
31+if SHAREDLIBS
32+lib_LTLIBRARIES += libISSMModules.la
33+endif
34 lib_LIBRARIES += libISSMModules.a
35 endif
36 #}}}
37@@ -1010,23 +1010,23 @@
38 libISSMCore_a_SOURCES = $(issm_sources)
39 libISSMCore_a_CXXFLAGS = $(ALLCXXFLAGS)
40
41-#if SHAREDLIBS
42-#libISSM_la_SOURCES = solutions/issm.cpp
43-#libISSM_la_LIBADD = libISSMCore.la libISSMOverload.la
44+if SHAREDLIBS
45+libISSM_la_SOURCES = solutions/issm.cpp
46+libISSM_la_LIBADD = libISSMCore.la libISSMOverload.la
47
48-#libISSMCore_la_SOURCES = $(issm_sources)
49-#libISSMCore_la_LIBADD = $(PETSCLIB) $(TAOLIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB) $(ADOLCLIB)
50+libISSMCore_la_SOURCES = $(issm_sources)
51+libISSMCore_la_LIBADD = $(PETSCLIB) $(TAOLIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB) $(ADOLCLIB)
52
53-#libISSMOverload_la_SOURCES = ./shared/String/stricmp.c
54-#endif
55+libISSMOverload_la_SOURCES = ./shared/String/stricmp.c
56+endif
57
58 if MODULES
59-#if SHAREDLIBS
60-#libISSMModules_la_SOURCES = $(module_sources)
61-#libISSMModules_la_SOURCES += $(bamg_sources)
62-#libISSMModules_la_SOURCES += $(kriging_sources)
63-#libISSMModules_la_SOURCES += $(kml_sources)
64-#endif
65+if SHAREDLIBS
66+libISSMModules_la_SOURCES = $(module_sources)
67+libISSMModules_la_SOURCES += $(bamg_sources)
68+libISSMModules_la_SOURCES += $(kriging_sources)
69+libISSMModules_la_SOURCES += $(kml_sources)
70+endif
71 libISSMModules_a_SOURCES = $(module_sources)
72 libISSMModules_a_SOURCES += $(bamg_sources)
73 libISSMModules_a_SOURCES += $(kriging_sources)
74@@ -1041,9 +1041,9 @@
75 endif
76
77 if MATLAB
78-#if SHAREDLIBS
79-#libISSMMatlab_la_SOURCES = $(matlab_sources)
80-#endif
81+if SHAREDLIBS
82+libISSMMatlab_la_SOURCES = $(matlab_sources)
83+endif
84 libISSMMatlab_a_SOURCES = $(matlab_sources)
85 libISSMMatlab_a_CXXFLAGS= $(ALLCXXFLAGS)
86 endif
87Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/matlab/Makefile.am
88===================================================================
89--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/matlab/Makefile.am (revision 13071)
90+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/matlab/Makefile.am (revision 13072)
91@@ -1,166 +1,232 @@
92 AM_CPPFLAGS = @DAKOTAINCL@ @MATLABINCL@ @PETSCINCL@ @MPIINCL@ @SPOOLESINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ @SHAPELIBINCL@ @BOOSTINCL@ @PYTHONINCL@ @PYTHON_NUMPYINCL@
93+
94 EXEEXT=$(MATLABWRAPPEREXT)
95-#Bin programs {{{1
96+
97+#Modules {{{1
98 if MODULES
99-bin_PROGRAMS = AverageFilter\
100- BamgMesher\
101- BamgConvertMesh\
102- BamgTriangulate\
103- Chaco\
104- ContourToMesh \
105- ContourToNodes \
106- ElementConnectivity\
107- EnumToString\
108- Exp2Kml \
109- HoleFiller \
110- InternalFront\
111- InterpFromGridToMesh \
112- InterpFromMeshToMesh2d \
113- InterpFromMeshToMesh3d \
114- InterpFromMeshToGrid \
115- InterpFromMesh2d \
116- KMLFileRead \
117- KMLMeshWrite \
118- KMLOverlay \
119- Kml2Exp \
120- Kriging \
121- Ll2xy \
122- NodeConnectivity \
123- MeshPartition\
124- MeshProfileIntersection\
125- PointCloudFindNeighbors\
126- PropagateFlagsFromConnectivity\
127- Scotch\
128- Shp2Kml\
129- StringToEnum\
130- TriaSearch\
131- TriMesh\
132- TriMeshProcessRifts\
133- Xy2ll
134+lib_LTLIBRARIES = AverageFilter.la\
135+ BamgMesher.la\
136+ BamgConvertMesh.la\
137+ BamgTriangulate.la\
138+ ContourToMesh.la\
139+ ContourToNodes.la\
140+ ElementConnectivity.la\
141+ EnumToString.la\
142+ Exp2Kml.la\
143+ HoleFiller.la\
144+ InternalFront.la\
145+ InterpFromGridToMesh.la\
146+ InterpFromMeshToMesh2d.la\
147+ InterpFromMeshToMesh3d.la\
148+ InterpFromMeshToGrid.la\
149+ InterpFromMesh2d.la\
150+ KMLFileRead.la\
151+ KMLMeshWrite.la\
152+ KMLOverlay.la\
153+ Kml2Exp.la\
154+ Kriging.la\
155+ Ll2xy.la\
156+ NodeConnectivity.la\
157+ MeshPartition.la\
158+ MeshProfileIntersection.la\
159+ PointCloudFindNeighbors.la\
160+ PropagateFlagsFromConnectivity.la\
161+ Shp2Kml.la\
162+ StringToEnum.la\
163+ TriaSearch.la\
164+ TriMesh.la\
165+ TriMeshProcessRifts.la\
166+ Scotch.la\
167+ Xy2ll.la\
168+ Chaco.la
169 endif
170 #}}}
171 #Flags and libraries {{{1
172-LDADD = ../../c/libISSMCore.a ../../c/libISSMModules.a $(TRIANGLELIB) $(PETSCLIB) $(FLIBS) $(PLAPACKLIB) $(SPOOLESLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(SHAPELIBLIB) $(GSLLIB)
173+if SHAREDLIBS
174+deps = ../../c/libISSMCore.la ../../c/libISSMModules.la
175+else
176+deps = ../../c/libISSMCore.a ../../c/libISSMModules.a
177+endif
178
179+deps += $(MATHLIB) ${MEXLIB}
180+
181+#$(TRIANGLELIB) $(PETSCLIB) $(FLIBS) $(PLAPACKLIB) $(SPOOLESLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MPILIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(SHAPELIBLIB) $(GSLLIB)
182+
183 #Triangle library
184 AM_CXXFLAGS = -DTRILIBRARY -DANSI_DECLARATORS -DNO_TIMER
185
186 #Matlab part
187-AM_LDFLAGS = $(MEXLINK)
188+AM_LDFLAGS = $(MEXLINK) -shrext ${EXEEXT} -module
189+if VERSION
190+AM_LDFLAGS +=
191+else
192+AM_LDFLAGS += -avoid-version
193+endif
194+if SHAREDLIBS
195+deps += ../../c/libISSMMatlab.la
196+else
197+deps += ../../c/libISSMMatlab.a
198+AM_LDFLAGS += --no-warnings
199+endif
200+
201 AM_CXXFLAGS += -D_HAVE_MATLAB_MODULES_ -D_GNU_SOURCE -fPIC -fno-omit-frame-pointer -pthread
202-LDADD += $(MEXLIB) ../../c/libISSMMatlab.a
203-LDADD += ../../c/libISSMCore.a
204-if CIRCULAR_DEPENDENCIES
205-LDADD += $(TRIANGLELIB) $(PETSCLIB) $(FLIBS) $(PLAPACKLIB) $(SPOOLESLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(SHAPELIBLIB) $(GSLLIB)
206+
207+######################################################################################
208+# Circular dependencies may not be necessary here.
209+#deps += ../../c/libISSMCore.a
210+#if CIRCULAR_DEPENDENCIES
211+#deps += $(TRIANGLELIB) $(PETSCLIB) $(FLIBS) $(PLAPACKLIB) $(SPOOLESLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(SHAPELIBLIB) $(GSLLIB)
212+#endif
213+######################################################################################
214+
215+if SHAREDLIBS
216+deps +=
217+else
218+deps += ../../c/libISSMModules.a ../../c/libISSMCore.a
219 endif
220-LDADD += ../../c/libISSMModules.a
221
222 #Optimization flags:
223 AM_CXXFLAGS += $(CXXOPTFLAGS)
224 #}}}
225+
226 #Bin sources {{{1
227-AverageFilter_SOURCES = ../AverageFilter/AverageFilter.cpp\
228+AverageFilter_la_SOURCES = ../AverageFilter/AverageFilter.cpp\
229 ../AverageFilter/AverageFilter.h
230+AverageFilter_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
231
232-BamgMesher_SOURCES = ../BamgMesher/BamgMesher.cpp\
233+BamgMesher_la_SOURCES = ../BamgMesher/BamgMesher.cpp\
234 ../BamgMesher/BamgMesher.h
235+BamgMesher_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
236
237-BamgConvertMesh_SOURCES = ../BamgConvertMesh/BamgConvertMesh.cpp\
238+BamgConvertMesh_la_SOURCES = ../BamgConvertMesh/BamgConvertMesh.cpp\
239 ../BamgConvertMesh/BamgConvertMesh.h
240+BamgConvertMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
241
242-BamgTriangulate_SOURCES = ../BamgTriangulate/BamgTriangulate.cpp\
243+BamgTriangulate_la_SOURCES = ../BamgTriangulate/BamgTriangulate.cpp\
244 ../BamgTriangulate/BamgTriangulate.h
245+BamgTriangulate_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
246
247-Chaco_SOURCES = ../Chaco/Chaco.cpp\
248+Chaco_la_SOURCES = ../Chaco/Chaco.cpp\
249 ../Chaco/Chaco.h
250+Chaco_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(CHACOLIB)
251
252-ContourToMesh_SOURCES = ../ContourToMesh/ContourToMesh.cpp\
253- ../ContourToMesh/ContourToMesh.h
254+ContourToMesh_la_SOURCES = ../ContourToMesh/ContourToMesh.cpp\
255+ ../ContourToMesh/ContourToMesh.h
256+ContourToMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB)
257
258-ContourToNodes_SOURCES = ../ContourToNodes/ContourToNodes.cpp\
259+ContourToNodes_la_SOURCES = ../ContourToNodes/ContourToNodes.cpp\
260 ../ContourToNodes/ContourToNodes.h
261+ContourToNodes_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
262
263-ElementConnectivity_SOURCES = ../ElementConnectivity/ElementConnectivity.cpp\
264+ElementConnectivity_la_SOURCES = ../ElementConnectivity/ElementConnectivity.cpp\
265 ../ElementConnectivity/ElementConnectivity.h
266+ElementConnectivity_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
267
268-EnumToString_SOURCES = ../EnumToString/EnumToString.cpp\
269+EnumToString_la_SOURCES = ../EnumToString/EnumToString.cpp\
270 ../EnumToString/EnumToString.h
271+EnumToString_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
272
273-StringToEnum_SOURCES = ../StringToEnum/StringToEnum.cpp\
274+StringToEnum_la_SOURCES = ../StringToEnum/StringToEnum.cpp\
275 ../StringToEnum/StringToEnum.h
276+StringToEnum_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
277
278-HoleFiller_SOURCES = ../HoleFiller/HoleFiller.cpp\
279+HoleFiller_la_SOURCES = ../HoleFiller/HoleFiller.cpp\
280 ../HoleFiller/HoleFiller.h
281+HoleFiller_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
282
283-InternalFront_SOURCES = ../InternalFront/InternalFront.cpp\
284+InternalFront_la_SOURCES = ../InternalFront/InternalFront.cpp\
285 ../InternalFront/InternalFront.h
286+InternalFront_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
287
288-InterpFromGridToMesh_SOURCES = ../InterpFromGridToMesh/InterpFromGridToMesh.cpp\
289+InterpFromGridToMesh_la_SOURCES = ../InterpFromGridToMesh/InterpFromGridToMesh.cpp\
290 ../InterpFromGridToMesh/InterpFromGridToMesh.h
291+InterpFromGridToMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB)
292
293-InterpFromMeshToMesh2d_SOURCES = ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp\
294+InterpFromMeshToMesh2d_la_SOURCES = ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp\
295 ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h
296+InterpFromMeshToMesh2d_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB)
297
298-InterpFromMeshToMesh3d_SOURCES = ../InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp\
299+InterpFromMeshToMesh3d_la_SOURCES = ../InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp\
300 ../InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h
301+InterpFromMeshToMesh3d_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
302
303-InterpFromMeshToGrid_SOURCES = ../InterpFromMeshToGrid/InterpFromMeshToGrid.cpp\
304+InterpFromMeshToGrid_la_SOURCES = ../InterpFromMeshToGrid/InterpFromMeshToGrid.cpp\
305 ../InterpFromMeshToGrid/InterpFromMeshToGrid.h
306+InterpFromMeshToGrid_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
307
308-InterpFromMesh2d_SOURCES = ../InterpFromMesh2d/InterpFromMesh2d.cpp\
309+InterpFromMesh2d_la_SOURCES = ../InterpFromMesh2d/InterpFromMesh2d.cpp\
310 ../InterpFromMesh2d/InterpFromMesh2d.h
311+InterpFromMesh2d_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB)
312
313-KMLFileRead_SOURCES = ../KMLFileRead/KMLFileRead.cpp\
314+KMLFileRead_la_SOURCES = ../KMLFileRead/KMLFileRead.cpp\
315 ../KMLFileRead/KMLFileRead.h
316+KMLFileRead_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
317
318-KMLMeshWrite_SOURCES = ../KMLMeshWrite/KMLMeshWrite.cpp\
319+KMLMeshWrite_la_SOURCES = ../KMLMeshWrite/KMLMeshWrite.cpp\
320 ../KMLMeshWrite/KMLMeshWrite.h
321+KMLMeshWrite_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
322
323-KMLOverlay_SOURCES = ../KMLOverlay/KMLOverlay.cpp\
324+KMLOverlay_la_SOURCES = ../KMLOverlay/KMLOverlay.cpp\
325 ../KMLOverlay/KMLOverlay.h
326+KMLOverlay_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
327
328-Xy2ll_SOURCES = ../Xy2ll/Xy2ll.cpp\
329+Xy2ll_la_SOURCES = ../Xy2ll/Xy2ll.cpp\
330 ../Xy2ll/Xy2ll.h
331+Xy2ll_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
332
333-Ll2xy_SOURCES = ../Ll2xy/Ll2xy.cpp\
334+Ll2xy_la_SOURCES = ../Ll2xy/Ll2xy.cpp\
335 ../Ll2xy/Ll2xy.h
336+Ll2xy_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
337
338-Exp2Kml_SOURCES = ../Exp2Kml/Exp2Kml.cpp\
339+Exp2Kml_la_SOURCES = ../Exp2Kml/Exp2Kml.cpp\
340 ../Exp2Kml/Exp2Kml.h
341+Exp2Kml_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
342
343-Kml2Exp_SOURCES = ../Kml2Exp/Kml2Exp.cpp\
344+Kml2Exp_la_SOURCES = ../Kml2Exp/Kml2Exp.cpp\
345 ../Kml2Exp/Kml2Exp.h
346+Kml2Exp_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
347
348-Kriging_SOURCES = ../Kriging/Kriging.cpp\
349+Kriging_la_SOURCES = ../Kriging/Kriging.cpp\
350 ../Kriging/Kriging.h
351+Kriging_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB)
352
353-MeshPartition_SOURCES = ../MeshPartition/MeshPartition.cpp\
354+MeshPartition_la_SOURCES = ../MeshPartition/MeshPartition.cpp\
355 ../MeshPartition/MeshPartition.h
356+MeshPartition_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
357
358-MeshProfileIntersection_SOURCES = ../MeshProfileIntersection/MeshProfileIntersection.cpp\
359+MeshProfileIntersection_la_SOURCES = ../MeshProfileIntersection/MeshProfileIntersection.cpp\
360 ../MeshProfileIntersection/MeshProfileIntersection.h
361+MeshProfileIntersection_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
362
363-NodeConnectivity_SOURCES = ../NodeConnectivity/NodeConnectivity.cpp\
364+NodeConnectivity_la_SOURCES = ../NodeConnectivity/NodeConnectivity.cpp\
365 ../NodeConnectivity/NodeConnectivity.h
366+NodeConnectivity_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
367
368-PointCloudFindNeighbors_SOURCES = ../PointCloudFindNeighbors/PointCloudFindNeighbors.cpp\
369+PointCloudFindNeighbors_la_SOURCES = ../PointCloudFindNeighbors/PointCloudFindNeighbors.cpp\
370 ../PointCloudFindNeighbors/PointCloudFindNeighbors.h
371+PointCloudFindNeighbors_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB)
372
373-PropagateFlagsFromConnectivity_SOURCES = ../PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.cpp\
374+PropagateFlagsFromConnectivity_la_SOURCES = ../PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.cpp\
375 ../PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.h
376+PropagateFlagsFromConnectivity_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
377
378-Scotch_SOURCES = ../Scotch/Scotch.cpp\
379- ../Scotch/Scotch.h
380+Scotch_la_SOURCES = ../Scotch/Scotch.cpp\
381+ ../Scotch/Scotch.h
382+Scotch_la_LIBADD = ${deps} $(SCOTCHLIB)
383
384-Shp2Kml_SOURCES = ../Shp2Kml/Shp2Kml.cpp\
385- ../Shp2Kml/Shp2Kml.h
386+Shp2Kml_la_SOURCES = ../Shp2Kml/Shp2Kml.cpp\
387+ ../Shp2Kml/Shp2Kml.h
388+Shp2Kml_la_LIBADD = ${deps}
389
390-TriaSearch_SOURCES = ../TriaSearch/TriaSearch.cpp\
391+TriaSearch_la_SOURCES = ../TriaSearch/TriaSearch.cpp\
392 ../TriaSearch/TriaSearch.h
393+TriaSearch_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
394
395-TriMesh_SOURCES = ../TriMesh/TriMesh.cpp\
396- ../TriMesh/TriMesh.h
397+TriMesh_la_SOURCES = ../TriMesh/TriMesh.cpp\
398+ ../TriMesh/TriMesh.h
399+TriMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(TRIANGLELIB)
400
401-TriMeshProcessRifts_SOURCES = ../TriMeshProcessRifts/TriMeshProcessRifts.cpp\
402+TriMeshProcessRifts_la_SOURCES = ../TriMeshProcessRifts/TriMeshProcessRifts.cpp\
403 ../TriMeshProcessRifts/TriMeshProcessRifts.h
404+TriMeshProcessRifts_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
405 #}}}
406Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configure.ac
407===================================================================
408--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configure.ac (revision 13071)
409+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configure.ac (revision 13072)
410@@ -5,11 +5,13 @@
411 AC_CONFIG_AUX_DIR([./aux-config]) #Put config files in aux-config
412 AC_CONFIG_MACRO_DIR([m4]) #m4 macros are located in m4
413 AC_CANONICAL_TARGET #Determine the system type
414+
415 #Compilers
416 AC_PROG_CC([cccl cl icl gcc])
417 AC_PROG_CPP
418 AC_PROG_CXX([cccl cl icl g++])
419 AC_PROG_F77([ifort g77 gfortran])
420+
421 #Libraries and linking
422 AC_F77_LIBRARY_LDFLAGS
423 AC_PATH_XTRA #figure out X library and include paths
424@@ -21,10 +23,9 @@
425 AM_SILENT_RULES([yes]) #Do not show compilation command by default
426 AM_PROG_CC_C_O
427 AM_PROG_AR
428-AC_PROG_RANLIB
429
430 #Libtool
431-#LT_INIT
432+LT_INIT
433
434 #Run issm_options.m4
435 ISSM_OPTIONS
436@@ -36,8 +37,7 @@
437 src/modules/Makefile
438 src/modules/python/Makefile
439 src/modules/matlab/Makefile
440- src/m/Makefile
441- bin/Makefile])
442+ src/m/Makefile])
443
444 #End of configure.ac
445 AC_OUTPUT
446Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/Makefile.am
447===================================================================
448--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/Makefile.am (revision 13071)
449+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/Makefile.am (revision 13072)
450@@ -1,3 +1,3 @@
451 EXTRA_DIST = reconf scripts test m4 examples cron etc doc packages contributors.txt
452-SUBDIRS = src bin
453+SUBDIRS = src
454 bin_SCRIPTS=config.h startup.m README.rtf
Note: See TracBrowser for help on using the repository browser.