Changeset 27914


Ignore:
Timestamp:
09/20/23 13:10:17 (18 months ago)
Author:
jdquinn
Message:

CHG: Cleanup; fix for empty FORTRANDIR on macOS

File:
1 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/c/Makefile.am

    r27902 r27914  
    77
    88# Library declaration {{{
    9 if !WINDOWS
    109lib_LTLIBRARIES = libISSMCore.la
    1110if !MSYS2
     
    1413if WRAPPERS
    1514lib_LTLIBRARIES += libISSMModules.la
    16 endif
    17 else
    18 noinst_LTLIBRARIES = libISSMCore.la libISSMOverload.la
    19 if WRAPPERS
    20 noinst_LTLIBRARIES += libISSMModules.la
    21 endif
    2215endif
    2316#}}}
     
    723716libISSMCore_la_FFLAGS = $(AM_FFLAGS)
    724717
    725 if !WINDOWS
    726718if !STANDALONE_LIBRARIES
    727 libISSMCore_la_LIBADD = $(CHACOLIB) $(DAKOTALIB) $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(HDF5LIB) $(TAOLIB) $(M1QN3LIB) $(SEMICLIB) $(PLAPACKLIB) $(MPLAPACKLIB) $(SUPERLULIB) $(SPOOLESLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(SCOTCHLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(ADOLCLIB) $(AMPILIB) $(ADJOINTMPILIB) $(METEOIOLIB) $(SNOWPACKLIB) $(PROJLIB) $(OSLIBS)
     719libISSMCore_la_LIBADD = $(CHACOLIB) $(DAKOTALIB) $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(HDF5LIB) $(TAOLIB) $(M1QN3LIB) $(SEMICLIB) $(PLAPACKLIB) $(MPLAPACKLIB) $(SUPERLULIB) $(SPOOLESLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(SCOTCHLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(ADOLCLIB) $(AMPILIB) $(ADJOINTMPILIB) $(METEOIOLIB) $(SNOWPACKLIB) $(PROJLIB)
    728720if FORTRAN
    729721libISSMCore_la_LIBADD += $(FLIBS) $(FORTRANLIB)
    730722endif
    731 endif
     723libISSMCore_la_LIBADD += $(OSLIBS)
    732724endif
    733725
     
    747739
    748740libISSMModules_la_CXXFLAGS = $(ALL_CXXFLAGS)
    749 if !WINDOWS
    750741if STANDALONE_LIBRARIES
    751742libISSMModules_la_LIBADD = ./libISSMCore.la
    752743else
    753744libISSMModules_la_LIBADD = ./libISSMCore.la $(TRIANGLELIB) $(CHACOLIB) $(BLASLAPACKLIB) $(OSLIBS)
    754 endif
    755745endif
    756746endif
     
    768758#       will be linked to, whether we like it or not, if no static version is
    769759#       available.
    770 # - On macOC, static linking of binaries is not supported.
     760# - On macOS, static linking of binaries is not supported.
    771761#
    772762if STANDALONE_EXECUTABLES
     
    774764AM_LDFLAGS += -Wl,-rpath,'@loader_path/../lib'
    775765else
    776 AM_LDFLAGS += -static -Wl,--disable-new-dtags -Wl,-rpath,'$$ORIGIN/../lib'
     766AM_LDFLAGS += -Wl,-rpath,'$$ORIGIN/../lib'
     767if !MSYS2
     768AM_LDFLAGS += -static -Wl,--disable-new-dtags
     769endif
    777770endif
    778771else
    779772if MAC
     773if $(FORTRANDIR) != ""
    780774AM_LDFLAGS += -Wl,-rpath,$(FORTRANDIR)
     775endif
    781776endif
    782777endif
     
    845840
    846841# External packages
    847 LDADD += $(DAKOTALIB) $(SEMICLIB) $(M1QN3LIB) $(CHACOLIB) $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(NEOPZLIB) $(TAOLIB) $(PLAPACKLIB) $(MPLAPACKLIB) $(SUPERLULIB) $(SPOOLESLIB) $(BLACSLIB) $(HDF5LIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(SCOTCHLIB) $(MKLLIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(AMPILIB) $(ADJOINTMPILIB) $(ADOLCLIB) $(MPILIB) $(METEOIOLIB) $(SNOWPACKLIB) $(PROJLIB) $(ESMFLIB) $(OSLIBS)
     842LDADD += $(DAKOTALIB) $(SEMICLIB) $(M1QN3LIB) $(CHACOLIB) $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(NEOPZLIB) $(TAOLIB) $(PLAPACKLIB) $(MPLAPACKLIB) $(SUPERLULIB) $(SPOOLESLIB) $(BLACSLIB) $(HDF5LIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(SCOTCHLIB) $(MKLLIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(AMPILIB) $(ADJOINTMPILIB) $(ADOLCLIB) $(MPILIB) $(METEOIOLIB) $(SNOWPACKLIB) $(PROJLIB) $(ESMFLIB)
    848843
    849844if FORTRAN
    850845LDADD += $(FLIBS) $(FORTRANLIB)
    851846endif
     847LDADD += $(OSLIBS)
    852848
    853849issm_SOURCES = main/issm.cpp
Note: See TracChangeset for help on using the changeset viewer.