Changeset 26140


Ignore:
Timestamp:
03/23/21 15:22:08 (4 years ago)
Author:
jdquinn
Message:

CHG: Correcting warning about autom4ke variable names; clean up

File:
1 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/wrappers/matlab/Makefile.am

    r26046 r26140  
    9191
    9292#Triangle library
    93 TRI_CXXFLAGS = -DTRILIBRARY -DANSI_DECLARATORS -DNO_TIMER
     93CXXFLAGS_FOR_TRI = -DTRILIBRARY -DANSI_DECLARATORS -DNO_TIMER
    9494
    9595#Matlab part
    96 MEX_CXXFLAGS = -D_HAVE_MATLAB_MODULES_ $(MEXOPTFLAGS) $(MEXCXXFLAGS)
    97 MEX_CPPFLAGS = $(MATLABINCL)
    98 MEX_LDFLAGS = -module -shrext $(MEXEXT) -no-undefined
    99 MEX_LIBADD = $(MEXLINKFLAGS) $(MEXLIB)
    100 
    101 AM_CPPFLAGS += ${MEX_CPPFLAGS}
    102 AM_CXXFLAGS = ${TRI_CXXFLAGS} ${MEX_CXXFLAGS}
    103 AM_LDFLAGS = ${MEX_LDFLAGS}
    104 AM_LIBADD = ${MEX_LIBADD}
     96CXXFLAGS_FOR_MEX = -D_HAVE_MATLAB_MODULES_ $(MEXOPTFLAGS) $(MEXCXXFLAGS)
     97CPPFLAGS_FOR_MEX = $(MATLABINCL)
     98LDFLAGS_FOR_MEX = -module -shrext $(MEXEXT) -no-undefined
     99LIBADD_FOR_MEX = $(MEXLINKFLAGS) $(MEXLIB)
     100
     101AM_CPPFLAGS += ${CXXFLAGS_FOR_MEX}
     102AM_CXXFLAGS = ${CXXFLAGS_FOR_TRI} ${CPPFLAGS_FOR_MEX}
     103AM_LDFLAGS = ${LDFLAGS_FOR_MEX}
    105104
    106105if !MSYS2
    … …  
    147146endif
    148147
    149 # #MEXLIB needs to be the last (undefined references on larsen)
    150 # deps += ${MEXLIB}
     148deps += ${LIBADD_FOR_MEX}
    151149
    152150#Optimization flags:
    … …  
    169167libISSMMatlab_la_LDFLAGS += -static
    170168libISSMApi_la_LDFLAGS += -static
    171 deps += $(DAKOTALIB) $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(HDF5LIB) $(TAOLIB) $(M1QN3LIB) $(SEMICLIB) $(PLAPACKLIB) $(SUPERLULIB) $(SPOOLESLIB) $(TRIANGLELIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(CHACOLIB) $(SCOTCHLIB) $(MKLLIB) $(MPILIB) $(NEOPZLIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(ADOLCLIB) $(AMPILIB) $(METEOIOLIB) $(SNOWPACKLIB) $(PROJLIB) $(OSLIBS)
     169deps += $(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) ${LIBADD_FOR_MEX}
    172170endif
    173171
    … …  
    177175
    178176BamgConvertMesh_matlab_la_SOURCES = ../BamgConvertMesh/BamgConvertMesh.cpp
    179 BamgConvertMesh_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    180 BamgConvertMesh_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(HDF5LIB) $(BLASLAPACKLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB)
     177BamgConvertMesh_matlab_la_LIBADD = ${deps}
    181178
    182179BamgMesher_matlab_la_SOURCES = ../BamgMesher/BamgMesher.cpp
    183 BamgMesher_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    184 BamgMesher_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(HDF5LIB) $(BLASLAPACKLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB)
     180BamgMesher_matlab_la_LIBADD = ${deps}
    185181
    186182BamgTriangulate_matlab_la_SOURCES = ../BamgTriangulate/BamgTriangulate.cpp
    187 BamgTriangulate_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    188 BamgTriangulate_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(HDF5LIB) $(BLASLAPACKLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB)
     183BamgTriangulate_matlab_la_LIBADD = ${deps}
    189184
    190185if CHACO
    191186Chaco_matlab_la_SOURCES = ../Chaco/Chaco.cpp
    192 Chaco_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    193 Chaco_matlab_la_LIBADD = ${deps} $(CHACOLIB) $(PETSCLIB) $(HDF5LIB) $(BLASLAPACKLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB)
     187Chaco_matlab_la_LIBADD = ${deps} $(CHACOLIB)
    194188endif
    195189
    196190ContourToMesh_matlab_la_SOURCES = ../ContourToMesh/ContourToMesh.cpp
    197 ContourToMesh_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    198 ContourToMesh_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(HDF5LIB) $(BLASLAPACKLIB) $(MPILIB) $(MULTITHREADINGLIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB)
     191ContourToMesh_matlab_la_LIBADD = ${deps}
    199192
    200193ContourToNodes_matlab_la_SOURCES = ../ContourToNodes/ContourToNodes.cpp
    201 ContourToNodes_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    202 ContourToNodes_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(HDF5LIB) $(BLASLAPACKLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB)
     194ContourToNodes_matlab_la_LIBADD = ${deps}
    203195
    204196CoordTransform_matlab_la_SOURCES = ../CoordTransform/CoordTransform.cpp
    205 CoordTransform_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    206 CoordTransform_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(HDF5LIB) $(BLASLAPACKLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB)
     197CoordTransform_matlab_la_LIBADD = ${deps}
    207198
    208199DistanceToMaskBoundary_matlab_la_SOURCES = ../DistanceToMaskBoundary/DistanceToMaskBoundary.cpp
    209 DistanceToMaskBoundary_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    210 DistanceToMaskBoundary_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(HDF5LIB) $(BLASLAPACKLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB)
     200DistanceToMaskBoundary_matlab_la_LIBADD = ${deps}
    211201
    212202ElementConnectivity_matlab_la_SOURCES = ../ElementConnectivity/ElementConnectivity.cpp
    213 ElementConnectivity_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    214 ElementConnectivity_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(HDF5LIB) $(BLASLAPACKLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB)
     203ElementConnectivity_matlab_la_LIBADD = ${deps}
    215204
    216205ExpToLevelSet_matlab_la_SOURCES = ../ExpToLevelSet/ExpToLevelSet.cpp
    217 ExpToLevelSet_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    218 ExpToLevelSet_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(HDF5LIB) $(BLASLAPACKLIB) $(MPILIB) $(MULTITHREADINGLIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB)
     206ExpToLevelSet_matlab_la_LIBADD = ${deps}
    219207
    220208ExpSimplify_matlab_la_SOURCES = ../ExpSimplify/ExpSimplify.cpp
    221 ExpSimplify_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    222 ExpSimplify_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(HDF5LIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB) $(NEOPZLIB)
     209ExpSimplify_matlab_la_LIBADD = ${deps}
    223210
    224211InterpFromGridToMesh_matlab_la_SOURCES = ../InterpFromGridToMesh/InterpFromGridToMesh.cpp
    225 InterpFromGridToMesh_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    226 InterpFromGridToMesh_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(HDF5LIB) $(BLASLAPACKLIB) $(MPILIB) $(MULTITHREADINGLIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB)
     212InterpFromGridToMesh_matlab_la_LIBADD = ${deps}
    227213
    228214InterpFromMesh2d_matlab_la_SOURCES = ../InterpFromMesh2d/InterpFromMesh2d.cpp
    229 InterpFromMesh2d_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    230 InterpFromMesh2d_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(HDF5LIB) $(BLASLAPACKLIB) $(MPILIB) $(MULTITHREADINGLIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB)
     215InterpFromMesh2d_matlab_la_LIBADD = ${deps}
    231216
    232217InterpFromMeshToGrid_matlab_la_SOURCES = ../InterpFromMeshToGrid/InterpFromMeshToGrid.cpp
    233 InterpFromMeshToGrid_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    234 InterpFromMeshToGrid_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(HDF5LIB) $(BLASLAPACKLIB) $(MPILIB) $(MULTITHREADINGLIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB)
     218InterpFromMeshToGrid_matlab_la_LIBADD = ${deps}
    235219
    236220InterpFromMeshToMesh2d_matlab_la_SOURCES = ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp
    237 InterpFromMeshToMesh2d_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    238 InterpFromMeshToMesh2d_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(HDF5LIB) $(BLASLAPACKLIB) $(MPILIB) $(MULTITHREADINGLIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB)
     221InterpFromMeshToMesh2d_matlab_la_LIBADD = ${deps}
    239222
    240223InterpFromMeshToMesh3d_matlab_la_SOURCES = ../InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp
    241 InterpFromMeshToMesh3d_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    242 InterpFromMeshToMesh3d_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(HDF5LIB) $(BLASLAPACKLIB) $(MPILIB) $(MULTITHREADINGLIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB)
     224InterpFromMeshToMesh3d_matlab_la_LIBADD = ${deps}
    243225
    244226IssmConfig_matlab_la_SOURCES = ../IssmConfig/IssmConfig.cpp
    245 IssmConfig_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    246 IssmConfig_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(HDF5LIB) $(MPILIB) $(NEOPZLIB)
     227IssmConfig_matlab_la_LIBADD = ${deps}
    247228
    248229Kriging_matlab_la_SOURCES = ../Kriging/Kriging.cpp
    249 Kriging_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    250 Kriging_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(HDF5LIB) $(BLASLAPACKLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(PROJLIB)
     230Kriging_matlab_la_LIBADD = ${deps}
    251231
    252232M1qn3_matlab_la_SOURCES = ../M1qn3/M1qn3.cpp
    253 M1qn3_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    254 M1qn3_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(HDF5LIB) $(BLASLAPACKLIB) $(MPILIB) $(METISLIB) $(M1QN3LIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB)
     233M1qn3_matlab_la_LIBADD = ${deps}
    255234
    256235MeshPartition_matlab_la_SOURCES = ../MeshPartition/MeshPartition.cpp
    257 MeshPartition_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    258 MeshPartition_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(HDF5LIB) $(BLASLAPACKLIB) $(MPILIB) $(METISLIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB)
     236MeshPartition_matlab_la_LIBADD = ${deps}
    259237
    260238MeshProfileIntersection_matlab_la_SOURCES = ../MeshProfileIntersection/MeshProfileIntersection.cpp
    261 MeshProfileIntersection_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    262 MeshProfileIntersection_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(HDF5LIB) $(BLASLAPACKLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB)
     239MeshProfileIntersection_matlab_la_LIBADD = ${deps}
    263240
    264241NodeConnectivity_matlab_la_SOURCES = ../NodeConnectivity/NodeConnectivity.cpp
    265 NodeConnectivity_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    266 NodeConnectivity_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(HDF5LIB) $(BLASLAPACKLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB)
     242NodeConnectivity_matlab_la_LIBADD = ${deps}
    267243
    268244PointCloudFindNeighbors_matlab_la_SOURCES = ../PointCloudFindNeighbors/PointCloudFindNeighbors.cpp
    269 PointCloudFindNeighbors_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    270 PointCloudFindNeighbors_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(HDF5LIB) $(BLASLAPACKLIB) $(MPILIB) $(MULTITHREADINGLIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB)
     245PointCloudFindNeighbors_matlab_la_LIBADD = ${deps}
    271246
    272247PropagateFlagsFromConnectivity_matlab_la_SOURCES = ../PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.cpp
    273 PropagateFlagsFromConnectivity_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    274 PropagateFlagsFromConnectivity_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(HDF5LIB) $(BLASLAPACKLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB)
     248PropagateFlagsFromConnectivity_matlab_la_LIBADD = ${deps}
    275249
    276250Scotch_matlab_la_SOURCES = ../Scotch/Scotch.cpp
    277 Scotch_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    278 Scotch_matlab_la_LIBADD = ${deps}  $(PETSCLIB) $(HDF5LIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MPILIB) $(NEOPZLIB) $(BLASLAPACKLIB)
     251Scotch_matlab_la_LIBADD = ${deps}
    279252
    280253ShpRead_matlab_la_SOURCES = ../ShpRead/ShpRead.cpp
    281 ShpRead_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    282 ShpRead_matlab_la_LIBADD = ${deps} $(SHAPELIBLIB) $(PETSCLIB) $(HDF5LIB) $(BLASLAPACKLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB)
     254ShpRead_matlab_la_LIBADD = ${deps} $(SHAPELIBLIB)
    283255
    284256Triangle_matlab_la_SOURCES = ../Triangle/Triangle.cpp
    285 Triangle_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    286 Triangle_matlab_la_LIBADD = ${deps} $(TRIANGLELIB) $(PETSCLIB) $(HDF5LIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB)
     257Triangle_matlab_la_LIBADD = ${deps} $(TRIANGLELIB)
    287258
    288259ProcessRifts_matlab_la_SOURCES = ../ProcessRifts/ProcessRifts.cpp
    289 ProcessRifts_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    290 ProcessRifts_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(HDF5LIB) $(BLASLAPACKLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB)
    291 #}}}
     260ProcessRifts_matlab_la_LIBADD = ${deps}
     261#}}}
Note: See TracChangeset for help on using the changeset viewer.