Changeset 12922

Timestamp:

08/07/12 07:26:17 (13 years ago)

Author:

Mathieu Morlighem

Message:

BUG: do not use libtool for now (crashing NR)

Location:

issm/trunk-jpl

Files:

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

issm/trunk-jpl/configure.ac

@@ -21 +21 @@
 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

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 
@@ -1002 +1002 @@
 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