Changeset 13057

Timestamp:

08/15/12 19:17:54 (13 years ago)

Author:

glperez

Message:

BUG: Mismatched 'if' corrected.

File:

• issm/trunk-jpl/src/c/Makefile.am (modified) (3 diffs)

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

@@ -6 +6 @@
 lib_LIBRARIES = libISSMCore.a libISSMOverload.a
 
-if SHAREDLIBS
-lib_LTLIBRARIES = libISSMCore.la libISSMOverload.la libISSM.la
-endif
+#if SHAREDLIBS
+#lib_LTLIBRARIES = libISSMCore.la libISSMOverload.la libISSM.la
+#endif
 if PYTHON
 lib_LIBRARIES += libISSMPython.a 
 endif
 if MATLAB
-if SHAREDLIBS
-lib_LTLIBRARIES += libISSMMatlab.la
-endif
+#if SHAREDLIBS
+#lib_LTLIBRARIES += libISSMMatlab.la
+#endif
 lib_LIBRARIES += libISSMMatlab.a 
 endif
 if MODULES
-if SHAREDLIBS
-lib_LTLIBRARIES += libISSMModules.la
-endif
+#if SHAREDLIBS
+#lib_LTLIBRARIES += libISSMModules.la
+#endif
 lib_LIBRARIES += libISSMModules.a 
 endif
@@ -1011 +1011 @@
 libISSMCore_a_CXXFLAGS = $(ALLCXXFLAGS)
 
-if SHAREDLIBS
-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 SHAREDLIBS
+#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
-if SHAREDLIBS
-libISSMModules_la_SOURCES = $(module_sources)
-libISSMModules_la_SOURCES += $(bamg_sources)
-libISSMModules_la_SOURCES += $(kriging_sources)
-libISSMModules_la_SOURCES += $(kml_sources)
-endif
+#if SHAREDLIBS
+#libISSMModules_la_SOURCES = $(module_sources)
+#libISSMModules_la_SOURCES += $(bamg_sources)
+#libISSMModules_la_SOURCES += $(kriging_sources)
+#libISSMModules_la_SOURCES += $(kml_sources)
+#endif
 libISSMModules_a_SOURCES = $(module_sources)
 libISSMModules_a_SOURCES += $(bamg_sources)
@@ -1042 +1042 @@
 
 if MATLAB
-if SHAREDLIBS
-libISSMMatlab_la_SOURCES = $(matlab_sources)
-endif
+#if SHAREDLIBS
+#libISSMMatlab_la_SOURCES = $(matlab_sources)
+#endif
 libISSMMatlab_a_SOURCES = $(matlab_sources)
 libISSMMatlab_a_CXXFLAGS= $(ALLCXXFLAGS)