source: issm/oecreview/Archive/12678-13393/ISSM-12934-12935.diff@ 14312

Last change on this file since 14312 was 13394, checked in by Mathieu Morlighem, 13 years ago

Added 12678-13393
File size: 2.7 KB
RevLine 
[13394]1Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am
2===================================================================
3--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am (revision 12934)
4+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am (revision 12935)
5@@ -5,9 +5,9 @@
6 #Library declaration {{{
7 lib_LIBRARIES = libISSMCore.a libISSMOverload.a
8
9-#if SHARED
10-#lib_LTLIBRARIES = libISSMCore.la libISSMOverload.la libISSM.la
11-#endif
12+if SHARED
13+lib_LTLIBRARIES = libISSMCore.la libISSMOverload.la libISSM.la
14+endif
15 if PYTHON
16 lib_LIBRARIES += libISSMPython.a
17 endif
18@@ -1005,16 +1005,16 @@
19 libISSMCore_a_SOURCES = $(issm_sources)
20 libISSMCore_a_CXXFLAGS = $(ALLCXXFLAGS)
21
22-#if SHARED
23-#libISSM_la_SOURCES = solutions/issm.cpp
24-#libISSM_la_LIBADD = libISSMCore.la libISSMOverload.la
25-#
26-#libISSMCore_la_SOURCES = $(issm_sources)
27-#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)
28-#
29-#libISSMOverload_la_SOURCES = ./shared/String/stricmp.c
30-#endif
31+if SHARED
32+libISSM_la_SOURCES = solutions/issm.cpp
33+libISSM_la_LIBADD = libISSMCore.la libISSMOverload.la
34
35+libISSMCore_la_SOURCES = $(issm_sources)
36+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)
37+
38+libISSMOverload_la_SOURCES = ./shared/String/stricmp.c
39+endif
40+
41 if MODULES
42 libISSMModules_a_SOURCES = $(module_sources)
43 libISSMModules_a_SOURCES += $(bamg_sources)
44Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configure.ac
45===================================================================
46--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configure.ac (revision 12934)
47+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configure.ac (revision 12935)
48@@ -21,13 +21,11 @@
49 AM_SILENT_RULES([yes]) #Do not show compilation command by default
50 AM_PROG_CC_C_O
51 AM_PROG_AR
52-AC_PROG_RANLIB
53
54 # To produce shared libraries uncomment LT_INIT. In theory, Libtool can be initialized
55 # even if all linking is static, since, if not shared libraries are to be produce, libtool
56 # will act simply as a wrapper around AR and Ranlib.
57-#
58-#LT_INIT
59+LT_INIT
60
61 #Run issm_options.m4
62 ISSM_OPTIONS
Note: See TracBrowser for help on using the repository browser.