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

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

Added 12678-13393

File size: 2.7 KB
  • u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am

     
    55#Library declaration {{{
    66lib_LIBRARIES = libISSMCore.a libISSMOverload.a
    77
    8 #if SHARED
    9 #lib_LTLIBRARIES = libISSMCore.la libISSMOverload.la libISSM.la
    10 #endif
     8if SHARED
     9lib_LTLIBRARIES = libISSMCore.la libISSMOverload.la libISSM.la
     10endif
    1111if PYTHON
    1212lib_LIBRARIES += libISSMPython.a
    1313endif
     
    10051005libISSMCore_a_SOURCES  = $(issm_sources)
    10061006libISSMCore_a_CXXFLAGS = $(ALLCXXFLAGS)
    10071007
    1008 #if SHARED
    1009 #libISSM_la_SOURCES = solutions/issm.cpp
    1010 #libISSM_la_LIBADD = libISSMCore.la libISSMOverload.la
    1011 #
    1012 #libISSMCore_la_SOURCES  = $(issm_sources)
    1013 #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)
    1014 #
    1015 #libISSMOverload_la_SOURCES = ./shared/String/stricmp.c
    1016 #endif
     1008if SHARED
     1009libISSM_la_SOURCES = solutions/issm.cpp
     1010libISSM_la_LIBADD = libISSMCore.la libISSMOverload.la
    10171011
     1012libISSMCore_la_SOURCES  = $(issm_sources)
     1013libISSMCore_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)
     1014
     1015libISSMOverload_la_SOURCES = ./shared/String/stricmp.c
     1016endif
     1017
    10181018if MODULES
    10191019libISSMModules_a_SOURCES = $(module_sources)
    10201020libISSMModules_a_SOURCES += $(bamg_sources)
  • u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configure.ac

     
    2121AM_SILENT_RULES([yes])           #Do not show compilation command by default
    2222AM_PROG_CC_C_O
    2323AM_PROG_AR
    24 AC_PROG_RANLIB
    2524
    2625# To produce shared libraries uncomment LT_INIT. In theory, Libtool can be initialized
    2726# even if all linking is static, since, if not shared libraries are to be produce, libtool
    2827# will act simply as a wrapper around AR and Ranlib.
    29 #
    30 #LT_INIT
     28LT_INIT
    3129
    3230#Run issm_options.m4
    3331ISSM_OPTIONS
Note: See TracBrowser for help on using the repository browser.