Index: /issm/trunk-jpl/m4/issm_options.m4 =================================================================== --- /issm/trunk-jpl/m4/issm_options.m4 (revision 18312) +++ /issm/trunk-jpl/m4/issm_options.m4 (revision 18313) @@ -45,12 +45,28 @@ AC_MSG_RESULT($enable_development) dnl }}} - dnl Shared build {{{ - AC_ARG_ENABLE([sharedlibs], dnl feature - AS_HELP_STRING([--enable-sharedlibs], [produce libISSM.so.0]), dnl help string - [enable_sharedlibs=$enableval], dnl action if given - [enable_sharedlibs=no]) dnl action if not given - AC_MSG_CHECKING(for shared library build) - AM_CONDITIONAL([SHAREDLIBS], [test x$enable_sharedlibs = xyes]) - AC_MSG_RESULT($enable_sharedlibs) + dnl Standalone Options {{{ + AC_ARG_ENABLE([standalone-modules], dnl feature + AS_HELP_STRING([--enable-standalone-modules], [produce standalone modules]), dnl help string + [enable_standalone_modules=$enableval], dnl action if given + [enable_standalone_modules=no]) dnl action if not given + AC_MSG_CHECKING(for standalone modules build) + AM_CONDITIONAL([STANDALONE_MODULES], [test x$enable_standalone_modules = xyes]) + AC_MSG_RESULT($enable_standalone_modules) + + AC_ARG_ENABLE([standalone-executables], dnl feature + AS_HELP_STRING([--enable-standalone-executables], [produce standalone executables]), dnl help string + [enable_standalone_executables=$enableval], dnl action if given + [enable_standalone_executables=no]) dnl action if not given + AC_MSG_CHECKING(for standalone executables build) + AM_CONDITIONAL([STANDALONE_EXECUTABLES], [test x$enable_standalone_executables = xyes]) + AC_MSG_RESULT($enable_standalone_executables) + + AC_ARG_ENABLE([standalone-libraries], dnl feature + AS_HELP_STRING([--enable-standalone-libraries], [produce standalone libraries]), dnl help string + [enable_standalone_libraries=$enableval], dnl action if given + [enable_standalone_libraries=no]) dnl action if not given + AC_MSG_CHECKING(for standalone libraries build) + AM_CONDITIONAL([STANDALONE_LIBRARIES], [test x$enable_standalone_libraries = xyes]) + AC_MSG_RESULT($enable_standalone_libraries) dnl }}} dnl Version{{{ @@ -182,8 +198,7 @@ ;; *) - MEXLINK=$($MATLAB_ROOT/bin/mex -v 2>&1 < /dev/null | grep LDFLAGS | sed -e "s/ LDFLAGS = //g") - MEXLIB=$( $MATLAB_ROOT/bin/mex -v 2>&1 < /dev/null | grep CXXLIBS | sed -e "s/ CXXLIBS = //g") - MEXEXT=$( $MATLAB_ROOT/bin/mex -v 2>&1 < /dev/null | grep LDEXTENSION | sed -e "s/ LDEXTENSION = //g") - + MEXLINK=$(mex -v 2>&1 < /dev/null | grep LDFLAGS | sed -e "s/ LDFLAGS = // g" | sed -e "s/-[[^ ]]*mexFunction\\.map//g") + MEXLIB=$( $MATLAB_ROOT/bin/mex -v 2>&1 < /dev/null | grep CXXLIBS | sed -e "s/ CXXLIBS = //g") + MEXEXT=$( $MATLAB_ROOT/bin/mex -v 2>&1 < /dev/null | grep LDEXTENSION | sed -e "s/ LDEXTENSION = //g") dnl version 2014 and up if test "x$MEXEXT" = "x" ; then @@ -319,5 +334,5 @@ DAKOTALIB="-L$DAKOTA_ROOT/lib -ldakota -lteuchos -lpecos -lfftw3 -llhs -levidence -lsurfpack -lconmin -lddace -lfsudace -ljega -lcport -lopt -lpsuade -lnewmat -lncsuopt -lgsl -lquadrature -lcoliny -lcolin -lpebbl -lutilib -l3po -lnappspack -lappspack -lconveyor -lshared -lcdd -lamplsolver" else if test x$DAKOTA_VERSION = x5.1 || test x$DAKOTA_VERSION = x5.2; then - DAKOTALIB="-L$DAKOTA_ROOT/lib -ldakota -lteuchos -lpecos -llhs -lsparsegrid -lsurfpack -lconmin -lddace -lfsudace -ljega -lcport -loptpp -lpsuade -lncsuopt -lcolin -linterfaces -lmomh -lscolib -lpebbl -ltinyxml -lutilib -l3po -lhopspack -lnidr -lamplsolver -lboost_signals -lboost_regex -lboost_filesystem" + DAKOTALIB="-L$DAKOTA_ROOT/lib -L$BOOST_ROOT/lib -ldakota -lteuchos -lpecos -llhs -lsparsegrid -lsurfpack -lconmin -lddace -lfsudace -ljega -lcport -loptpp -lpsuade -lncsuopt -lcolin -linterfaces -lmomh -lscolib -lpebbl -ltinyxml -lutilib -l3po -lhopspack -lnidr -lamplsolver -lboost_signals -lboost_regex -lboost_filesystem" else AC_MSG_ERROR([Dakota version not found or version ($DAKOTA_VERSION) not supported!]); @@ -329,8 +344,8 @@ DAKOTALIB="-L$DAKOTA_ROOT/lib -ldakota -lteuchos -lpecos -lfftw3 -llhs -levidence -lsurfpack -lconmin -lddace -lfsudace -ljega -lcport -lopt -lpsuade -lnewmat -lncsuopt -lgsl -lquadrature -lcoliny -lcolin -lpebbl -lutilib -l3po -lnappspack -lappspack -lconveyor -lshared -lcdd -lamplsolver" else if test x$DAKOTA_VERSION = x5.1 || test x$DAKOTA_VERSION = x5.2; then - DAKOTALIB="-L$DAKOTA_ROOT/lib -ldakota -lteuchos -lpecos -llhs -lsparsegrid -lsurfpack -lconmin -lddace -lfsudace -ljega -lcport -loptpp -lpsuade -lncsuopt -lcolin -linterfaces -lmomh -lscolib -lpebbl -ltinyxml -lutilib -l3po -lhopspack -lnidr -lamplsolver -lboost_signals -lboost_regex -lboost_filesystem -lboost_system -ldl" +- DAKOTALIB="-L$DAKOTA_ROOT/lib -ldakota -lteuchos -lpecos -llhs -lsparsegrid -lsurfpack -lconmin -lddace -lfsudace -ljega -lcport -loptpp -lpsuade -lncsuopt -lcolin -linterfaces -lmomh -lscolib -lpebbl -ltinyxml -lutilib -l3po -lhopspack -lnidr -lamplsolver -lboost_signals -lboost_regex -lboost_filesystem -lboost_system -ldl" else if test x$DAKOTA_VERSION = x5.3 || test x$DAKOTA_VERSION = x5.3.1; then DAKOTAFLAGS="-DDISABLE_DAKOTA_CONFIG_H -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DDAKOTA_PLUGIN -DBOOST_DISABLE_ASSERTS -DDAKOTA_HAVE_BOOST_FS -DHAVE_UNISTD_H -DHAVE_SYSTEM -DHAVE_WORKING_FORK -DHAVE_WORKING_VFORK -DHAVE_SYS_WAIT_H -DHAVE_USLEEP -DDAKOTA_F90 -DDAKOTA_HAVE_MPI -DHAVE_PECOS -DHAVE_SURFPACK -DDAKOTA_COLINY -DDAKOTA_UTILIB -DHAVE_ADAPTIVE_SAMPLING -DHAVE_CONMIN -DDAKOTA_DDACE -DHAVE_FSUDACE -DDAKOTA_HOPS -DHAVE_JEGA -DHAVE_NCSU -DHAVE_NL2SOL -DHAVE_OPTPP -DDAKOTA_OPTPP -DHAVE_PSUADE -DHAVE_AMPL" - DAKOTALIB="-L$DAKOTA_ROOT/lib -ldakota_src -ldakota_src_fortran -lnidr -lteuchos -lpecos -lpecos_src -llhs -lmods -lmod -ldfftpack -lsparsegrid -lsurfpack -lsurfpack_fortran -lutilib -lcolin -linterfaces -lscolib -l3po -lpebbl -ltinyxml -lconmin -ldace -lanalyzer -lrandom -lsampling -lbose -lfsudace -lhopspack -ljega -ljega_fe -lmoga -lsoga -leutils -lutilities -lncsuopt -lcport -loptpp -lpsuade -lamplsolver -L$BOOST_ROOT/lib -lboost_signals -lboost_regex -lboost_filesystem -lboost_system " + DAKOTALIB="-L$DAKOTA_ROOT/lib -L$BOOST_ROOT/lib -ldakota_src -lpecos_src -lscolib -ljega_fe -llhs -lpebbl -lcolin -linterfaces -lmods -lmoga -loptpp -lsampling -lsoga -lsurfpack -lutilib -lconmin -ldakota_src_fortran -lmod -lncsuopt -lsurfpack_fortran -lteuchos -l3po -lamplsolver -lanalyzer -lbose -lcport -ldace -ldfftpack -leutils -lfsudace -lhopspack -ljega -lnidr -lpecos -lpsuade -lrandom -ltinyxml -lutilities -lsparsegrid -lboost_signals -lboost_regex -lboost_filesystem -lboost_system" else AC_MSG_ERROR([Dakota version not found or version ($DAKOTA_VERSION) not supported!]); @@ -348,5 +363,5 @@ else if test x$DAKOTA_VERSION = x5.3 || test x$DAKOTA_VERSION = x5.3.1; then DAKOTAFLAGS="-DDISABLE_DAKOTA_CONFIG_H -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DDAKOTA_PLUGIN -DBOOST_DISABLE_ASSERTS -DDAKOTA_HAVE_BOOST_FS -DHAVE_UNISTD_H -DHAVE_SYSTEM -DHAVE_WORKING_FORK -DHAVE_WORKING_VFORK -DHAVE_SYS_WAIT_H -DHAVE_USLEEP -DDAKOTA_F90 -DDAKOTA_HAVE_MPI -DHAVE_PECOS -DHAVE_SURFPACK -DDAKOTA_COLINY -DDAKOTA_UTILIB -DHAVE_ADAPTIVE_SAMPLING -DHAVE_CONMIN -DDAKOTA_DDACE -DHAVE_FSUDACE -DDAKOTA_HOPS -DHAVE_JEGA -DHAVE_NCSU -DHAVE_NL2SOL -DHAVE_OPTPP -DDAKOTA_OPTPP -DHAVE_PSUADE -DHAVE_AMPL" - DAKOTALIB="-L$DAKOTA_ROOT/lib -ldakota_src -ldakota_src_fortran -lnidr -lteuchos -lpecos -lpecos_src -llhs -lmods -lmod -ldfftpack -lsparsegrid -lsurfpack -lsurfpack_fortran -lutilib -lcolin -linterfaces -lscolib -l3po -lpebbl -ltinyxml -lconmin -ldace -lanalyzer -lrandom -lsampling -lbose -lfsudace -lhopspack -ljega -ljega_fe -lmoga -lsoga -leutils -lutilities -lncsuopt -lcport -loptpp -lpsuade -lamplsolver -L$BOOST_ROOT/lib -lboost_signals -lboost_regex -lboost_filesystem -lboost_system " + DAKOTALIB="-L$DAKOTA_ROOT/lib -L$BOOST_ROOT/lib -ldakota_src -lpecos_src -lscolib -ljega_fe -llhs -lpebbl -lcolin -linterfaces -lmods -lmoga -loptpp -lsampling -lsoga -lsurfpack -lutilib -lconmin -ldakota_src_fortran -lmod -lncsuopt -lsurfpack_fortran -lteuchos -l3po -lamplsolver -lanalyzer -lbose -lcport -ldace -ldfftpack -leutils -lfsudace -lhopspack -ljega -lnidr -lpecos -lpsuade -lrandom -ltinyxml -lutilities -lsparsegrid -lboost_signals -lboost_regex -lboost_filesystem -lboost_system" else AC_MSG_ERROR([Dakota version not found or version ($DAKOTA_VERSION) not supported!]); @@ -1194,8 +1209,8 @@ MUMPSINCL=-I"$MUMPS_ROOT/include" if test "$PETSC_MAJOR" = "2" ; then - MUMPSLIB=-L"$MUMPS_ROOT/lib -ldmumps -lcmumps -lpord " + MUMPSLIB=-L"$MUMPS_ROOT/lib " else - dnl MUMPSLIB=-L"$MUMPS_ROOT/lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis -lzmumps" - MUMPSLIB=-L"$MUMPS_ROOT/lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis" + MUMPSLIB=-L"$MUMPS_ROOT/lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis -lzmumps -lmetis" + dnl MUMPSLIB=-L"$MUMPS_ROOT/lib " fi AC_DEFINE([_HAVE_MUMPS_],[1],[with Mumps in ISSM src]) Index: /issm/trunk-jpl/src/c/Makefile.am =================================================================== --- /issm/trunk-jpl/src/c/Makefile.am (revision 18312) +++ /issm/trunk-jpl/src/c/Makefile.am (revision 18313) @@ -1,3 +1,4 @@ AM_CPPFLAGS = @DAKOTAINCL@ @SHAPELIBINCL@ @PETSCINCL@ @SLEPCINCL@ @AMPIINCL@ @MPIINCL@ @METISINCL@ @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@ @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@ @TRIANGLEINCL@ @SPAIINCL@ @HYPREINCL@ @PROMETHEUSINCL@ @SUPERLUINCL@ @SPOOLESINCL@ @PASTIXINCL@ @MLINCL@ @TAOINCL@ @ADIC2INCL@ @ADOLCINCL@ @GSLINCL@ @BOOSTINCL@ @ANDROID_NDKINCL@ @METEOIOINCL@ @SNOWPACKINCL@ + AUTOMAKE_OPTIONS = subdir-objects @@ -5,14 +6,8 @@ #Library declaration {{{ -lib_LIBRARIES = libISSMCore.a libISSMOverload.a - -if SHAREDLIBS -lib_LTLIBRARIES = libISSMCore.la libISSMOverload.la libISSM.la -endif + +lib_LTLIBRARIES = libISSMCore.la libISSMOverload.la if WRAPPERS -if SHAREDLIBS lib_LTLIBRARIES += libISSMModules.la -endif -lib_LIBRARIES += libISSMModules.a endif #}}} @@ -721,5 +716,5 @@ ./modules/Krigingx/Krigingx.h issm_sources +=$(kriging_sources) -issm_sources +=./modules/Krigingx/pKrigingx.cpp +#issm_sources +=./modules/Krigingx/pKrigingx.cpp endif #}}} @@ -854,31 +849,21 @@ ALLCXXFLAGS= -fPIC -D_GNU_SOURCE -fno-omit-frame-pointer -pthread -D_CPP_ $(CXXFLAGS) $(CXXOPTFLAGS) -libISSMCore_a_SOURCES = $(issm_sources) -libISSMCore_a_CXXFLAGS = $(ALLCXXFLAGS) $(DAKOTAFLAGS) -libISSMCore_a_FFLAGS = $(AM_FFLAGS) - -if SHAREDLIBS -libISSM_la_SOURCES = main/issm.cpp -libISSM_la_LIBADD = libISSMCore.la libISSMOverload.la - libISSMCore_la_SOURCES = $(issm_sources) -libISSMCore_la_LIBADD = $(PETSCLIB) $(TAOLIB) $(M1QN3LIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB) $(ADOLCLIB) $(AMPILIB) $(METEOIOLIB) $(SNOWPACKLIB) +libISSMCore_la_CXXFLAGS = $(ALLCXXFLAGS) $(DAKOTAFLAGS) libISSMCore_la_FFLAGS = $(AM_FFLAGS) -endif + +libISSMCore_la_LIBADD = $(PETSCLIB) $(TAOLIB) $(M1QN3LIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB) $(ADOLCLIB) $(AMPILIB) $(METEOIOLIB) $(SNOWPACKLIB) if WRAPPERS -libISSMModules_a_SOURCES = $(modules_sources) -libISSMModules_a_SOURCES += $(bamg_sources) +libISSMModules_la_SOURCES = $(modules_sources) +libISSMModules_la_SOURCES += $(bamg_sources) if KRIGING -libISSMModules_a_SOURCES += $(kriging_sources) +libISSMModules_la_SOURCES += $(kriging_sources) endif if KML -libISSMModules_a_SOURCES += $(kml_sources) -endif -libISSMModules_a_CXXFLAGS = $(ALLCXXFLAGS) -libISSMModules_a_LIBADD = ./libISSMCore.a -if SHAREDLIBS -libISSMModules_la_SOURCES = $(libISSMModules_a_SOURCES) -endif +libISSMModules_la_SOURCES += $(kml_sources) +endif +libISSMModules_la_CXXFLAGS = $(ALLCXXFLAGS) +libISSMModules_la_LIBADD = ./libISSMCore.la endif @@ -888,9 +873,22 @@ AM_LDFLAGS = -avoid-version endif + +if STANDALONE_EXECUTABLES +issm_LDFLAGS = -static +endif + +if STANDALONE_LIBRARIES +libISSMCore_la_LDFLAGS = -static +libISSMOverload_la_LDFLAGS = -static +if WRAPPERS +libISSMModules_la_LDFLAGS = -static +endif +endif + #}}} #Overload library, to overload any non-standard symbols. {{{ -libISSMOverload_a_SOURCES = ./shared/String/ApiPrintf.cpp - -libISSMOverload_a_CFLAGS = -fPIC -D_C_ $(COPTFLAGS) $(CFLAGS) +libISSMOverload_la_SOURCES = ./shared/String/ApiPrintf.cpp + +libISSMOverload_la_CFLAGS = -fPIC -D_C_ $(COPTFLAGS) $(CFLAGS) #}}} @@ -907,5 +905,5 @@ #Standard libraries -LDADD = ./libISSMCore.a ./libISSMOverload.a +LDADD = ./libISSMCore.la ./libISSMOverload.la ./libISSMModules.la $(TRIANGLELIB) #External packages @@ -917,5 +915,5 @@ issm_SOURCES = main/issm.h main/globals.h main/issm.cpp -issm_CXXFLAGS= -fPIC $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) +issm_CXXFLAGS= -fPIC if KRIGING @@ -927,16 +925,16 @@ #Automatic differentiation (must be done at the end) {{{ if ADIC2 -lib_LIBRARIES += libAD.a libISSMRose.a +lib_LTLIBRARIES += libAD.la libISSMRose.la #ADIC2 library, for automatic differentiation #libAD_a_SOURCES = ./mini1.ad.c -libAD_a_SOURCES = -libAD_a_CFLAGS = -fPIC -D_C_ $(COPTFLAGS) +libAD_la_SOURCES = +libAD_la_CFLAGS = -fPIC -D_C_ $(COPTFLAGS) #test rose preprocessing %.r2cpp.cpp : %.cpp testTranslator -rose:o $@ -rose:skipfinalCompileStep -DHAVE_CONFIG_H -D_C_ -I. -I../.. $(INCLUDES) $< -libISSMRose_a_SOURCES = $(libISSMCore_a_SOURCES:.cpp=.r2cpp.cpp) -libISSMRose_a_CXXFLAGS= -fPIC -D_C_ $(CXXOPTFLAGS) +libISSMRose_la_SOURCES = $(libISSMCore_a_SOURCES:.cpp=.r2cpp.cpp) +libISSMRose_la_CXXFLAGS= -fPIC -D_C_ $(CXXOPTFLAGS) #Automatic differentiation rules: @@ -950,4 +948,3 @@ issmRose_exe_CXXFLAGS= -fPIC $(CXXOPTFLAGS) $(COPTFLAGS) LDADD += $(ADIC2LIB) - endif #}}} Index: /issm/trunk-jpl/src/wrappers/matlab/Makefile.am =================================================================== --- /issm/trunk-jpl/src/wrappers/matlab/Makefile.am (revision 18312) +++ /issm/trunk-jpl/src/wrappers/matlab/Makefile.am (revision 18313) @@ -8,10 +8,5 @@ #matlab io{{{ -lib_LIBRARIES = libISSMMatlab.a -if SHAREDLIBS lib_LTLIBRARIES = libISSMMatlab.la -else -lib_LTLIBRARIES = -endif io_sources= ./include/matlabincludes.h\ @@ -23,25 +18,14 @@ ALLCXXFLAGS= -fPIC -D_GNU_SOURCE -fno-omit-frame-pointer -pthread -D_CPP_ -D_WRAPPERS_ $(CXXFLAGS) $(CXXOPTFLAGS) -libISSMMatlab_a_SOURCES = $(io_sources) -libISSMMatlab_a_CXXFLAGS= $(ALLCXXFLAGS) -if SHAREDLIBS libISSMMatlab_la_SOURCES = $(io_sources) -endif +libISSMMatlab_la_CXXFLAGS= $(ALLCXXFLAGS) #}}} #api io{{{ -lib_LIBRARIES += libISSMApi.a -if SHAREDLIBS lib_LTLIBRARIES += libISSMApi.la -else -lib_LTLIBRARIES += -endif api_sources= ./io/ApiPrintf.cpp -libISSMApi_a_SOURCES = $(api_sources) -libISSMApi_a_CXXFLAGS= $(ALLCXXFLAGS) -if SHAREDLIBS libISSMApi_la_SOURCES = $(api_sources) -endif +libISSMApi_la_CXXFLAGS= $(ALLCXXFLAGS) #}}} #Wrappers {{{ @@ -95,5 +79,5 @@ #Matlab part -AM_LDFLAGS = -module $(MEXLINK) -shrext ${EXEEXT} -L/usr/lib +AM_LDFLAGS = -module $(MEXLINK) -shrext ${EXEEXT} --export-dynamic -rdynamic if VERSION AM_LDFLAGS += @@ -102,15 +86,15 @@ endif -AM_CXXFLAGS += -D_HAVE_MATLAB_MODULES_ -D_GNU_SOURCE -fPIC -fno-omit-frame-pointer -pthread - -if SHAREDLIBS +if STANDALONE_MODULES +AM_LDFLAGS += -Wl,-static +endif + +AM_CXXFLAGS += -D_HAVE_MATLAB_MODULES_ -D_GNU_SOURCE -fPIC -fno-omit-frame-pointer -pthread + deps += ./libISSMMatlab.la ../../c/libISSMModules.la ../../c/libISSMCore.la ./libISSMApi.la -else -deps += ./libISSMMatlab.a ../../c/libISSMModules.a ../../c/libISSMCore.a ./libISSMApi.a if ADOLC deps += $(ADOLCLIB) endif -endif #MEXLIB needs to be the last (undefined references on larsen) @@ -122,8 +106,14 @@ # Module sources and dependencies {{{ libISSMMatlab_la_LIBADD = ./../../c/libISSMCore.la ./../../c/libISSMModules.la $(MPILIB) $(PETSCLIB) $(GSLLIB) $(MATHLIB) $(MEXLIB) -libISSMMatlab_la_LDFLAGS = -module -export-dynamic + +if STANDALONE_LIBRARIES +libISSMMatlab_la_LDFLAGS = -static +endif libISSMApi_la_LIBADD = $(MPILIB) $(PETSCLIB) $(GSLLIB) $(MATHLIB) $(MEXLIB) -libISSMApi_la_LDFLAGS = -module -export-dynamic + +if STANDALONE_LIBRARIES +libISSMApi_la_LDFLAGS = -static +endif BamgMesher_la_SOURCES = ../BamgMesher/BamgMesher.cpp\ Index: /issm/trunk-jpl/src/wrappers/python/Makefile.am =================================================================== --- /issm/trunk-jpl/src/wrappers/python/Makefile.am (revision 18312) +++ /issm/trunk-jpl/src/wrappers/python/Makefile.am (revision 18313) @@ -8,10 +8,5 @@ #python io{{{ -lib_LIBRARIES = libISSMPython.a -if SHAREDLIBS lib_LTLIBRARIES = libISSMPython.la -else -lib_LTLIBRARIES = -endif io_sources= ./include/pythonincludes.h\ @@ -22,51 +17,36 @@ ALLCXXFLAGS= -fPIC -D_GNU_SOURCE -fno-omit-frame-pointer -pthread -D_CPP_ -D_WRAPPERS_ $(CXXFLAGS) $(CXXOPTFLAGS) -libISSMPython_a_SOURCES = $(io_sources) -libISSMPython_a_CXXFLAGS= $(ALLCXXFLAGS) -if SHAREDLIBS libISSMPython_la_SOURCES = $(io_sources) -endif +libISSMPython_la_CXXFLAGS= $(ALLCXXFLAGS) #}}} #api io{{{ -lib_LIBRARIES += libISSMApi.a -if SHAREDLIBS lib_LTLIBRARIES += libISSMApi.la -else -lib_LTLIBRARIES += -endif api_sources= ./io/ApiPrintf.cpp -libISSMApi_a_SOURCES = $(api_sources) -libISSMApi_a_CXXFLAGS= $(ALLCXXFLAGS) -if SHAREDLIBS libISSMApi_la_SOURCES = $(api_sources) -endif +libISSMApi_la_CXXFLAGS= $(ALLCXXFLAGS) #}}} #Wrappers {{{ +if WRAPPERS lib_LTLIBRARIES += BamgConvertMesh.la\ - BamgMesher.la\ - ContourToMesh.la\ - ContourToNodes.la\ - ElementConnectivity.la\ - EnumToString.la\ - InterpFromMeshToMesh2d.la\ - InterpFromMeshToMesh3d.la\ - InterpFromGridToMesh.la\ - InterpFromMeshToGrid.la\ - IssmConfig.la\ - MeshProfileIntersection.la\ - NodeConnectivity.la\ - StringToEnum.la\ - TriMesh.la\ - TriMeshProcessRifts.la + BamgMesher.la\ + ContourToMesh.la\ + ContourToNodes.la\ + ElementConnectivity.la\ + EnumToString.la\ + InterpFromMeshToMesh2d.la\ + InterpFromMeshToMesh3d.la\ + InterpFromGridToMesh.la\ + InterpFromMeshToGrid.la\ + IssmConfig.la\ + MeshProfileIntersection.la\ + NodeConnectivity.la\ + StringToEnum.la\ + TriMesh.la\ + TriMeshProcessRifts.la +endif #}}} #Flags and libraries {{{ -#if SHAREDLIBS -#deps = ../../c/libISSMCore.la ../../c/libISSMModules.la -#else -#deps = ../../c/libISSMCore.a ../../c/libISSMModules.a -#endif -#deps += $(MATHLIB) ${PYTHONLIB} deps = $(MATHLIB) ${PYTHONLIB} @@ -81,10 +61,11 @@ AM_LDFLAGS += -avoid-version endif -if SHAREDLIBS + +if STANDALONE_MODULES +AM_LDFLAGS += -Wl,-static +endif + deps += ./libISSMPython.la -else -deps += ./libISSMPython.a AM_LDFLAGS += --no-warnings -endif AM_CXXFLAGS += -D_HAVE_PYTHON_MODULES_ -fPIC @@ -93,21 +74,17 @@ endif -if SHAREDLIBS -deps += -else -deps += ../../c/libISSMModules.a ../../c/libISSMCore.a +deps += ../../c/libISSMModules.la ../../c/libISSMCore.la if ADOLC deps += $(ADOLCLIB) endif -if SHAREDLIBS deps += ./libISSMApi.la -else -deps += ./libISSMApi.a + +if STANDALONE_LIBRARIES +libISSMPython_la_LDFLAGS = -static endif - - - -endif +if STANDALONE_LIBRARIES +libISSMApi_la_LDFLAGS = -static +endif #Optimization flags: