Changeset 12935

Timestamp:

08/07/12 14:27:02 (13 years ago)

Author:

Mathieu Morlighem

Message:

NEW: enabling libtool

Location:

issm/trunk-jpl

Files:

• configure.ac (modified) (1 diff)
• src/c/Makefile.am (modified) (2 diffs)

issm/trunk-jpl/configure.ac

@@ -22 +22 @@
 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/trunk-jpl/src/c/Makefile.am

@@ -6 +6 @@
 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 
@@ -1006 +1006 @@
 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