Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am (revision 12934) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am (revision 12935) @@ -5,9 +5,9 @@ #Library declaration {{{ lib_LIBRARIES = libISSMCore.a libISSMOverload.a -#if SHARED -#lib_LTLIBRARIES = libISSMCore.la libISSMOverload.la libISSM.la -#endif +if SHARED +lib_LTLIBRARIES = libISSMCore.la libISSMOverload.la libISSM.la +endif if PYTHON lib_LIBRARIES += libISSMPython.a endif @@ -1005,16 +1005,16 @@ libISSMCore_a_SOURCES = $(issm_sources) libISSMCore_a_CXXFLAGS = $(ALLCXXFLAGS) -#if SHARED -#libISSM_la_SOURCES = solutions/issm.cpp -#libISSM_la_LIBADD = libISSMCore.la libISSMOverload.la -# -#libISSMCore_la_SOURCES = $(issm_sources) -#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) -# -#libISSMOverload_la_SOURCES = ./shared/String/stricmp.c -#endif +if SHARED +libISSM_la_SOURCES = solutions/issm.cpp +libISSM_la_LIBADD = libISSMCore.la libISSMOverload.la +libISSMCore_la_SOURCES = $(issm_sources) +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) + +libISSMOverload_la_SOURCES = ./shared/String/stricmp.c +endif + if MODULES libISSMModules_a_SOURCES = $(module_sources) libISSMModules_a_SOURCES += $(bamg_sources) Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configure.ac =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configure.ac (revision 12934) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configure.ac (revision 12935) @@ -21,13 +21,11 @@ AM_SILENT_RULES([yes]) #Do not show compilation command by default AM_PROG_CC_C_O AM_PROG_AR -AC_PROG_RANLIB # To produce shared libraries uncomment LT_INIT. In theory, Libtool can be initialized # even if all linking is static, since, if not shared libraries are to be produce, libtool # will act simply as a wrapper around AR and Ranlib. -# -#LT_INIT +LT_INIT #Run issm_options.m4 ISSM_OPTIONS