Skip to content

Commit 3fc67bb

Browse files
TidbitSoftwareTidbitSoftware
committed
CHG: Merging Inwoo's fix for MATLAB + Python APIs with minor changes
1 parent c8d98c1 commit 3fc67bb

File tree

3 files changed

+214
-210
lines changed

3 files changed

+214
-210
lines changed

‎src/wrappers/javascript/Makefile.am‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ libISSMJavascript_la_SOURCES = $(io_sources)
3535
libISSMJavascript_la_CXXFLAGS= $(ALLCXXFLAGS)
3636
#}}}
3737
# API I/O{{{
38-
lib_LTLIBRARIES += libISSMApi.la
38+
lib_LTLIBRARIES += libISSMApi_JavaScript.la
3939

4040
api_sources= ./io/ApiPrintf.cpp
4141

42-
libISSMApi_la_SOURCES = $(api_sources)
43-
libISSMApi_la_CXXFLAGS= $(ALLCXXFLAGS)
42+
libISSMApi_JavaScript_la_SOURCES = $(api_sources)
43+
libISSMApi_JavaScript_la_CXXFLAGS= $(ALLCXXFLAGS)
4444
#}}}
4545
# Wrappers {{{
4646
bin_PROGRAMS = IssmModule
@@ -52,7 +52,11 @@ bin_PROGRAMS = IssmModule
5252
AM_CXXFLAGS = -DTRILIBRARY -DANSI_DECLARATORS -DNO_TIMER -D_WRAPPERS_
5353
AM_CXXFLAGS += -D_HAVE_JAVASCRIPT_MODULES_ -fPIC
5454

55-
deps = ./libISSMJavascript.la ../../c/libISSMModules.la ../../c/libISSMCore.la ./libISSMApi.la
55+
deps = ./libISSMJavascript.la ../../c/libISSMModules.la ../../c/libISSMCore.la
56+
57+
if !MSYS2
58+
deps += ./libISSMApi_JavaScript.la
59+
endif
5660

5761
# Optimization flags
5862
AM_CXXFLAGS += $(CXXFLAGS)
@@ -62,21 +66,21 @@ libISSMJavascript_la_LIBADD = ./../../c/libISSMCore.la ./../../c/libISSMModules.
6266

6367
if VERSION
6468
libISSMJavascript_la_LDFLAGS =
65-
libISSMApi_la_LDFLAGS =
69+
libISSMApi_JavaScript_la_LDFLAGS =
6670
else
6771
libISSMJavascript_la_LDFLAGS = -avoid-version
68-
libISSMApi_la_LDFLAGS = -avoid-version
72+
libISSMApi_JavaScript_la_LDFLAGS = -avoid-version
6973
endif
7074

7175
if STANDALONE_LIBRARIES
7276
if !MSYS2
7377
libISSMJavascript_la_LDFLAGS += -static
74-
libISSMApi_la_LDFLAGS += -static
78+
libISSMApi_JavaScript_la_LDFLAGS += -static
7579
endif
7680
deps += $(DAKOTALIB) $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(HDF5LIB) $(TAOLIB) $(M1QN3LIB) $(SEMICLIB) $(PLAPACKLIB) $(SUPERLULIB) $(SPOOLESLIB) $(TRIANGLELIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(SCOTCHLIB) $(MKLLIB) $(MPILIB) $(NEOPZLIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(ADOLCLIB) $(AMPILIB) $(METEOIOLIB) $(SNOWPACKLIB) $(PROJLIB) $(OSLIBS)
7781
endif
7882

79-
libISSMApi_la_LIBADD = $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(HDF5LIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB) $(MATHLIB)
83+
libISSMApi_JavaScript_la_LIBADD = $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(HDF5LIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB) $(MATHLIB)
8084

8185
IssmModule_SOURCES = \
8286
../BamgMesher/BamgMesher.cpp \

‎src/wrappers/matlab/Makefile.am‎

Lines changed: 120 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -27,53 +27,53 @@ libISSMMatlab_la_SOURCES = $(io_sources)
2727
libISSMMatlab_la_CXXFLAGS = ${ALL_CXXFLAGS}
2828
#}}}
2929
#api io{{{
30-
lib_LTLIBRARIES += libISSMApi.la
30+
lib_LTLIBRARIES += libISSMApi_Matlab.la
3131

3232
if !MSYS2
3333
api_sources= ./io/ApiPrintf.cpp
3434

35-
libISSMApi_la_SOURCES = $(api_sources)
36-
libISSMApi_la_CXXFLAGS = ${ALL_CXXFLAGS}
35+
libISSMApi_Matlab_la_SOURCES = $(api_sources)
36+
libISSMApi_Matlab_la_CXXFLAGS = ${ALL_CXXFLAGS}
3737
endif
3838
#}}}
3939
#Wrappers {{{
4040
lib_LTLIBRARIES += \
41-
BamgConvertMesh_matlab.la \
42-
BamgMesher_matlab.la \
43-
BamgTriangulate_matlab.la \
44-
ContourToMesh_matlab.la \
45-
ContourToNodes_matlab.la \
46-
DistanceToMaskBoundary_matlab.la \
47-
ElementConnectivity_matlab.la \
48-
ExpSimplify_matlab.la \
49-
ExpToLevelSet_matlab.la \
50-
InterpFromGridToMesh_matlab.la \
51-
InterpFromMesh2d_matlab.la \
52-
InterpFromMeshToGrid_matlab.la \
53-
InterpFromMeshToMesh2d_matlab.la \
54-
InterpFromMeshToMesh3d_matlab.la \
55-
IssmConfig_matlab.la \
56-
M1qn3_matlab.la \
57-
MeshPartition_matlab.la \
58-
MeshProfileIntersection_matlab.la \
59-
NodeConnectivity_matlab.la \
60-
PointCloudFindNeighbors_matlab.la \
61-
ProcessRifts_matlab.la \
62-
PropagateFlagsFromConnectivity_matlab.la \
63-
Scotch_matlab.la \
64-
Triangle_matlab.la
41+
BamgConvertMesh_Matlab.la \
42+
BamgMesher_Matlab.la \
43+
BamgTriangulate_Matlab.la \
44+
ContourToMesh_Matlab.la \
45+
ContourToNodes_Matlab.la \
46+
DistanceToMaskBoundary_Matlab.la \
47+
ElementConnectivity_Matlab.la \
48+
ExpSimplify_Matlab.la \
49+
ExpToLevelSet_Matlab.la \
50+
InterpFromGridToMesh_Matlab.la \
51+
InterpFromMesh2d_Matlab.la \
52+
InterpFromMeshToGrid_Matlab.la \
53+
InterpFromMeshToMesh2d_Matlab.la \
54+
InterpFromMeshToMesh3d_Matlab.la \
55+
IssmConfig_Matlab.la \
56+
M1qn3_Matlab.la \
57+
MeshPartition_Matlab.la \
58+
MeshProfileIntersection_Matlab.la \
59+
NodeConnectivity_Matlab.la \
60+
PointCloudFindNeighbors_Matlab.la \
61+
ProcessRifts_Matlab.la \
62+
PropagateFlagsFromConnectivity_Matlab.la \
63+
Scotch_Matlab.la \
64+
Triangle_Matlab.la
6565

6666
if CHACO
67-
lib_LTLIBRARIES += Chaco_matlab.la
67+
lib_LTLIBRARIES += Chaco_Matlab.la
6868
endif
6969
if KRIGING
70-
lib_LTLIBRARIES += Kriging_matlab.la
70+
lib_LTLIBRARIES += Kriging_Matlab.la
7171
endif
7272
if PROJ
73-
lib_LTLIBRARIES += CoordTransform_matlab.la
73+
lib_LTLIBRARIES += CoordTransform_Matlab.la
7474
endif
7575
if SHP
76-
lib_LTLIBRARIES += ShpRead_matlab.la
76+
lib_LTLIBRARIES += ShpRead_Matlab.la
7777
endif
7878
#}}}
7979

@@ -135,7 +135,7 @@ AM_CXXFLAGS += -fPIC -D_WRAPPERS_
135135
deps += ./libISSMMatlab.la ../../c/libISSMCore.la ../../c/libISSMModules.la
136136

137137
if !MSYS2
138-
deps += ./libISSMApi.la
138+
deps += ./libISSMApi_Matlab.la
139139
endif
140140

141141
if ADOLC
@@ -156,135 +156,135 @@ libISSMMatlab_la_LIBADD = ./../../c/libISSMCore.la ./../../c/libISSMModules.la $
156156

157157
if VERSION
158158
libISSMMatlab_la_LDFLAGS =
159-
libISSMApi_la_LDFLAGS =
159+
libISSMApi_Matlab_la_LDFLAGS =
160160
else
161161
libISSMMatlab_la_LDFLAGS = -avoid-version
162-
libISSMApi_la_LDFLAGS = -avoid-version
162+
libISSMApi_Matlab_la_LDFLAGS = -avoid-version
163163
endif
164164

165165
if STANDALONE_LIBRARIES
166166
if !MSYS2
167167
libISSMMatlab_la_LDFLAGS += -static
168-
libISSMApi_la_LDFLAGS += -static
168+
libISSMApi_Matlab_la_LDFLAGS += -static
169169
endif
170170
deps += $(DAKOTALIB) $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(HDF5LIB) $(TAOLIB) $(M1QN3LIB) $(SEMICLIB) $(PLAPACKLIB) $(SUPERLULIB) $(SPOOLESLIB) $(TRIANGLELIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(SCOTCHLIB) $(MKLLIB) $(MPILIB) $(NEOPZLIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(ADOLCLIB) $(AMPILIB) $(METEOIOLIB) $(SNOWPACKLIB) $(OSLIBS) ${LIBADD_FOR_MEX}
171171
endif
172172

173-
libISSMApi_la_LIBADD = $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(HDF5LIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(MATHLIB) $(MEXLIB)
173+
libISSMApi_Matlab_la_LIBADD = $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(HDF5LIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(MATHLIB) $(MEXLIB)
174174

175-
BamgConvertMesh_matlab_la_SOURCES = ../BamgConvertMesh/BamgConvertMesh.cpp
176-
BamgConvertMesh_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
177-
BamgConvertMesh_matlab_la_LIBADD = ${deps}
175+
BamgConvertMesh_Matlab_la_SOURCES = ../BamgConvertMesh/BamgConvertMesh.cpp
176+
BamgConvertMesh_Matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
177+
BamgConvertMesh_Matlab_la_LIBADD = ${deps}
178178

179-
BamgMesher_matlab_la_SOURCES = ../BamgMesher/BamgMesher.cpp
180-
BamgMesher_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
181-
BamgMesher_matlab_la_LIBADD = ${deps}
179+
BamgMesher_Matlab_la_SOURCES = ../BamgMesher/BamgMesher.cpp
180+
BamgMesher_Matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
181+
BamgMesher_Matlab_la_LIBADD = ${deps}
182182

183-
BamgTriangulate_matlab_la_SOURCES = ../BamgTriangulate/BamgTriangulate.cpp
184-
BamgTriangulate_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
185-
BamgTriangulate_matlab_la_LIBADD = ${deps}
183+
BamgTriangulate_Matlab_la_SOURCES = ../BamgTriangulate/BamgTriangulate.cpp
184+
BamgTriangulate_Matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
185+
BamgTriangulate_Matlab_la_LIBADD = ${deps}
186186

187187
if CHACO
188-
Chaco_matlab_la_SOURCES = ../Chaco/Chaco.cpp
189-
Chaco_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
190-
Chaco_matlab_la_LIBADD = ${deps} $(CHACOLIB)
188+
Chaco_Matlab_la_SOURCES = ../Chaco/Chaco.cpp
189+
Chaco_Matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
190+
Chaco_Matlab_la_LIBADD = ${deps} $(CHACOLIB)
191191
endif
192192

193-
ContourToMesh_matlab_la_SOURCES = ../ContourToMesh/ContourToMesh.cpp
194-
ContourToMesh_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
195-
ContourToMesh_matlab_la_LIBADD = ${deps}
193+
ContourToMesh_Matlab_la_SOURCES = ../ContourToMesh/ContourToMesh.cpp
194+
ContourToMesh_Matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
195+
ContourToMesh_Matlab_la_LIBADD = ${deps}
196196

197-
ContourToNodes_matlab_la_SOURCES = ../ContourToNodes/ContourToNodes.cpp
198-
ContourToNodes_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
199-
ContourToNodes_matlab_la_LIBADD = ${deps}
197+
ContourToNodes_Matlab_la_SOURCES = ../ContourToNodes/ContourToNodes.cpp
198+
ContourToNodes_Matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
199+
ContourToNodes_Matlab_la_LIBADD = ${deps}
200200

201201
if PROJ
202-
CoordTransform_matlab_la_SOURCES = ../CoordTransform/CoordTransform.cpp
203-
CoordTransform_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
204-
CoordTransform_matlab_la_LIBADD = ${deps} $(PROJLIB)
202+
CoordTransform_Matlab_la_SOURCES = ../CoordTransform/CoordTransform.cpp
203+
CoordTransform_Matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
204+
CoordTransform_Matlab_la_LIBADD = ${deps} $(PROJLIB)
205205
endif
206206

207-
DistanceToMaskBoundary_matlab_la_SOURCES = ../DistanceToMaskBoundary/DistanceToMaskBoundary.cpp
208-
DistanceToMaskBoundary_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
209-
DistanceToMaskBoundary_matlab_la_LIBADD = ${deps}
207+
DistanceToMaskBoundary_Matlab_la_SOURCES = ../DistanceToMaskBoundary/DistanceToMaskBoundary.cpp
208+
DistanceToMaskBoundary_Matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
209+
DistanceToMaskBoundary_Matlab_la_LIBADD = ${deps}
210210

211-
ElementConnectivity_matlab_la_SOURCES = ../ElementConnectivity/ElementConnectivity.cpp
212-
ElementConnectivity_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
213-
ElementConnectivity_matlab_la_LIBADD = ${deps}
211+
ElementConnectivity_Matlab_la_SOURCES = ../ElementConnectivity/ElementConnectivity.cpp
212+
ElementConnectivity_Matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
213+
ElementConnectivity_Matlab_la_LIBADD = ${deps}
214214

215-
ExpToLevelSet_matlab_la_SOURCES = ../ExpToLevelSet/ExpToLevelSet.cpp
216-
ExpToLevelSet_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
217-
ExpToLevelSet_matlab_la_LIBADD = ${deps}
215+
ExpToLevelSet_Matlab_la_SOURCES = ../ExpToLevelSet/ExpToLevelSet.cpp
216+
ExpToLevelSet_Matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
217+
ExpToLevelSet_Matlab_la_LIBADD = ${deps}
218218

219-
ExpSimplify_matlab_la_SOURCES = ../ExpSimplify/ExpSimplify.cpp
220-
ExpSimplify_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
221-
ExpSimplify_matlab_la_LIBADD = ${deps}
219+
ExpSimplify_Matlab_la_SOURCES = ../ExpSimplify/ExpSimplify.cpp
220+
ExpSimplify_Matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
221+
ExpSimplify_Matlab_la_LIBADD = ${deps}
222222

223-
InterpFromGridToMesh_matlab_la_SOURCES = ../InterpFromGridToMesh/InterpFromGridToMesh.cpp
224-
InterpFromGridToMesh_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
225-
InterpFromGridToMesh_matlab_la_LIBADD = ${deps}
223+
InterpFromGridToMesh_Matlab_la_SOURCES = ../InterpFromGridToMesh/InterpFromGridToMesh.cpp
224+
InterpFromGridToMesh_Matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
225+
InterpFromGridToMesh_Matlab_la_LIBADD = ${deps}
226226

227-
InterpFromMesh2d_matlab_la_SOURCES = ../InterpFromMesh2d/InterpFromMesh2d.cpp
228-
InterpFromMesh2d_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
229-
InterpFromMesh2d_matlab_la_LIBADD = ${deps}
227+
InterpFromMesh2d_Matlab_la_SOURCES = ../InterpFromMesh2d/InterpFromMesh2d.cpp
228+
InterpFromMesh2d_Matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
229+
InterpFromMesh2d_Matlab_la_LIBADD = ${deps}
230230

231-
InterpFromMeshToGrid_matlab_la_SOURCES = ../InterpFromMeshToGrid/InterpFromMeshToGrid.cpp
232-
InterpFromMeshToGrid_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
233-
InterpFromMeshToGrid_matlab_la_LIBADD = ${deps}
231+
InterpFromMeshToGrid_Matlab_la_SOURCES = ../InterpFromMeshToGrid/InterpFromMeshToGrid.cpp
232+
InterpFromMeshToGrid_Matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
233+
InterpFromMeshToGrid_Matlab_la_LIBADD = ${deps}
234234

235-
InterpFromMeshToMesh2d_matlab_la_SOURCES = ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp
236-
InterpFromMeshToMesh2d_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
237-
InterpFromMeshToMesh2d_matlab_la_LIBADD = ${deps}
235+
InterpFromMeshToMesh2d_Matlab_la_SOURCES = ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp
236+
InterpFromMeshToMesh2d_Matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
237+
InterpFromMeshToMesh2d_Matlab_la_LIBADD = ${deps}
238238

239-
InterpFromMeshToMesh3d_matlab_la_SOURCES = ../InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp
240-
InterpFromMeshToMesh3d_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
241-
InterpFromMeshToMesh3d_matlab_la_LIBADD = ${deps}
239+
InterpFromMeshToMesh3d_Matlab_la_SOURCES = ../InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp
240+
InterpFromMeshToMesh3d_Matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
241+
InterpFromMeshToMesh3d_Matlab_la_LIBADD = ${deps}
242242

243-
IssmConfig_matlab_la_SOURCES = ../IssmConfig/IssmConfig.cpp
244-
IssmConfig_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
245-
IssmConfig_matlab_la_LIBADD = ${deps}
243+
IssmConfig_Matlab_la_SOURCES = ../IssmConfig/IssmConfig.cpp
244+
IssmConfig_Matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
245+
IssmConfig_Matlab_la_LIBADD = ${deps}
246246

247-
Kriging_matlab_la_SOURCES = ../Kriging/Kriging.cpp
248-
Kriging_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
249-
Kriging_matlab_la_LIBADD = ${deps}
247+
Kriging_Matlab_la_SOURCES = ../Kriging/Kriging.cpp
248+
Kriging_Matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
249+
Kriging_Matlab_la_LIBADD = ${deps}
250250

251-
M1qn3_matlab_la_SOURCES = ../M1qn3/M1qn3.cpp
252-
M1qn3_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
253-
M1qn3_matlab_la_LIBADD = ${deps}
251+
M1qn3_Matlab_la_SOURCES = ../M1qn3/M1qn3.cpp
252+
M1qn3_Matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
253+
M1qn3_Matlab_la_LIBADD = ${deps}
254254

255-
MeshPartition_matlab_la_SOURCES = ../MeshPartition/MeshPartition.cpp
256-
MeshPartition_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
257-
MeshPartition_matlab_la_LIBADD = ${deps}
255+
MeshPartition_Matlab_la_SOURCES = ../MeshPartition/MeshPartition.cpp
256+
MeshPartition_Matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
257+
MeshPartition_Matlab_la_LIBADD = ${deps}
258258

259-
MeshProfileIntersection_matlab_la_SOURCES = ../MeshProfileIntersection/MeshProfileIntersection.cpp
260-
MeshProfileIntersection_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
261-
MeshProfileIntersection_matlab_la_LIBADD = ${deps}
259+
MeshProfileIntersection_Matlab_la_SOURCES = ../MeshProfileIntersection/MeshProfileIntersection.cpp
260+
MeshProfileIntersection_Matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
261+
MeshProfileIntersection_Matlab_la_LIBADD = ${deps}
262262

263-
NodeConnectivity_matlab_la_SOURCES = ../NodeConnectivity/NodeConnectivity.cpp
264-
NodeConnectivity_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
265-
NodeConnectivity_matlab_la_LIBADD = ${deps}
263+
NodeConnectivity_Matlab_la_SOURCES = ../NodeConnectivity/NodeConnectivity.cpp
264+
NodeConnectivity_Matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
265+
NodeConnectivity_Matlab_la_LIBADD = ${deps}
266266

267-
PointCloudFindNeighbors_matlab_la_SOURCES = ../PointCloudFindNeighbors/PointCloudFindNeighbors.cpp
268-
PointCloudFindNeighbors_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
269-
PointCloudFindNeighbors_matlab_la_LIBADD = ${deps}
267+
PointCloudFindNeighbors_Matlab_la_SOURCES = ../PointCloudFindNeighbors/PointCloudFindNeighbors.cpp
268+
PointCloudFindNeighbors_Matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
269+
PointCloudFindNeighbors_Matlab_la_LIBADD = ${deps}
270270

271-
PropagateFlagsFromConnectivity_matlab_la_SOURCES = ../PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.cpp
272-
PropagateFlagsFromConnectivity_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
273-
PropagateFlagsFromConnectivity_matlab_la_LIBADD = ${deps}
271+
PropagateFlagsFromConnectivity_Matlab_la_SOURCES = ../PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.cpp
272+
PropagateFlagsFromConnectivity_Matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
273+
PropagateFlagsFromConnectivity_Matlab_la_LIBADD = ${deps}
274274

275-
Scotch_matlab_la_SOURCES = ../Scotch/Scotch.cpp
276-
Scotch_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
277-
Scotch_matlab_la_LIBADD = ${deps}
275+
Scotch_Matlab_la_SOURCES = ../Scotch/Scotch.cpp
276+
Scotch_Matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
277+
Scotch_Matlab_la_LIBADD = ${deps}
278278

279-
ShpRead_matlab_la_SOURCES = ../ShpRead/ShpRead.cpp
280-
ShpRead_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
281-
ShpRead_matlab_la_LIBADD = ${deps} $(SHAPELIBLIB)
279+
ShpRead_Matlab_la_SOURCES = ../ShpRead/ShpRead.cpp
280+
ShpRead_Matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
281+
ShpRead_Matlab_la_LIBADD = ${deps} $(SHAPELIBLIB)
282282

283-
Triangle_matlab_la_SOURCES = ../Triangle/Triangle.cpp
284-
Triangle_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
285-
Triangle_matlab_la_LIBADD = ${deps} $(TRIANGLELIB)
283+
Triangle_Matlab_la_SOURCES = ../Triangle/Triangle.cpp
284+
Triangle_Matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
285+
Triangle_Matlab_la_LIBADD = ${deps} $(TRIANGLELIB)
286286

287-
ProcessRifts_matlab_la_SOURCES = ../ProcessRifts/ProcessRifts.cpp
288-
ProcessRifts_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
289-
ProcessRifts_matlab_la_LIBADD = ${deps}
287+
ProcessRifts_Matlab_la_SOURCES = ../ProcessRifts/ProcessRifts.cpp
288+
ProcessRifts_Matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
289+
ProcessRifts_Matlab_la_LIBADD = ${deps}
290290
#}}}

0 commit comments

Comments
 (0)