Changeset 12920

Timestamp:

08/06/12 18:45:21 (13 years ago)

Author:

glperez

Message:

CHG: Revisions the shared option of issm_options.m4, configure.ac, and src/c/Makefile.am

Location:

issm/trunk-jpl

Files:

• configs/config-arm-linux.sh (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• m4/issm_options.m4 (modified) (1 diff)
• src/c/Makefile.am (modified) (2 diffs)

issm/trunk-jpl/configs/config-arm-linux.sh

@@ -9 +9 @@
         --without-modules \
         --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
-        --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install 
+        --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
+    --disable-static

issm/trunk-jpl/configure.ac

@@ -23 +23 @@
 
 AM_PROG_AR
-AC_PROG_RANLIB
 
 # To produce shared libraries uncomment LT_INIT. In theory, Libtool can be initialized
@@ -33 +32 @@
 #Run issm_options.m4
 ISSM_OPTIONS
-
-#AM_PROG_AR must be placed after ISSM_OPTIONS
 
 #List all Makefiles

issm/trunk-jpl/m4/issm_options.m4

@@ -501 +501 @@
                 HAVE_GSL=yes
                 GSLINCL="-I$GSL_ROOT/include"
-                GSLLIB="-dy -L$GSL_ROOT/lib/ -lgsl -lgslcblas -lm"
+                GSLLIB="-dy -L$GSL_ROOT/lib -lgsl -lgslcblas -lm"
 
                 AC_DEFINE([_HAVE_GSL_],[1],[with gsl in ISSM src])

issm/trunk-jpl/src/c/Makefile.am

@@ -6 +6 @@
 lib_LIBRARIES = libISSMCore.a libISSMOverload.a
 
-#if SHARED
-#lib_LTLIBRARIES = libISSM.la libISSMCore.la libISSMOverload.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_LDFLAGS = -prefer-pic
-#
-#libISSMCore_la_SOURCES  = $(issm_sources)
-#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