Changeset 12922


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/configure.ac

    r12920 r12922  
    2121AM_SILENT_RULES([yes])           #Do not show compilation command by default
    2222AM_PROG_CC_C_O
    23 
    2423AM_PROG_AR
     24AC_PROG_RANLIB
    2525
    2626# To produce shared libraries uncomment LT_INIT. In theory, Libtool can be initialized
  • issm/trunk-jpl/src/c/Makefile.am

    r12920 r12922  
    66lib_LIBRARIES = libISSMCore.a libISSMOverload.a
    77
    8 if SHARED
    9 lib_LTLIBRARIES = libISSMCore.la libISSMOverload.la libISSM.la
    10 endif
     8#if SHARED
     9#lib_LTLIBRARIES = libISSMCore.la libISSMOverload.la libISSM.la
     10#endif
    1111if PYTHON
    1212lib_LIBRARIES += libISSMPython.a
     
    10021002libISSMCore_a_CXXFLAGS = $(ALLCXXFLAGS)
    10031003
    1004 if SHARED
    1005 libISSM_la_SOURCES = solutions/issm.cpp
    1006 libISSM_la_LIBADD = libISSMCore.la libISSMOverload.la
    1007 
    1008 libISSMCore_la_SOURCES  = $(issm_sources)
    1009 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)
    1010 
    1011 libISSMOverload_la_SOURCES = ./shared/String/stricmp.c
    1012 endif
     1004#if SHARED
     1005#libISSM_la_SOURCES = solutions/issm.cpp
     1006#libISSM_la_LIBADD = libISSMCore.la libISSMOverload.la
     1007#
     1008#libISSMCore_la_SOURCES  = $(issm_sources)
     1009#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)
     1010#
     1011#libISSMOverload_la_SOURCES = ./shared/String/stricmp.c
     1012#endif
    10131013
    10141014if MODULES
Note: See TracChangeset for help on using the changeset viewer.