distinguish between lib extension for module libs and LibraryLink lib

FlexibleSUSY · Jul 21, 2016 · 59ab0a3 · 59ab0a3
1 parent 3960481
commit 59ab0a3
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 37 deletions.
diff --git a/config/Makefile.customized-betas.in b/config/Makefile.customized-betas.in
@@ -8,7 +8,7 @@ ENABLE_FFLITE    := @ENABLE_FFLITE@
 ENABLE_LOOPTOOLS := @ENABLE_LOOPTOOLS@
 ENABLE_THREADS   := @ENABLE_THREADS@
 
-LIBEXT          := @LIBEXT@
+MODULE_LIBEXT   := @MODULE_LIBEXT@
 
 MODEL           := CMSSM
 
@@ -25,10 +25,10 @@ INCFLEXI        := -I$(FLEXIDIR)
 INCLEGACY       := -I$(LEGACYDIR)
 INCFFLITE       := -I$(FFLITEDIR)
 INCSLHAEA       := -I$(SLHAEADIR)
-LIBMODEL        := $(MODELDIR)/lib$(MODEL)$(LIBEXT)
-LIBFLEXI        := $(FLEXIDIR)/libflexisusy$(LIBEXT)
-LIBLEGACY       := $(LEGACYDIR)/liblegacy$(LIBEXT)
-LIBFFLITE       := $(FFLITEDIR)/libfflite$(LIBEXT)
+LIBMODEL        := $(MODELDIR)/lib$(MODEL)$(MODULE_LIBEXT)
+LIBFLEXI        := $(FLEXIDIR)/libflexisusy$(MODULE_LIBEXT)
+LIBLEGACY       := $(LEGACYDIR)/liblegacy$(MODULE_LIBEXT)
+LIBFFLITE       := $(FFLITEDIR)/libfflite$(MODULE_LIBEXT)
 
 # Variables for compilation
 CXX             := @CXX@
@@ -154,7 +154,6 @@ showbuild:
 	@echo "FFLAGS             = $(FFLAGS)"
 	@echo "FLIBS              = $(FLIBS)"
 	@echo "FOR_DEP_GEN        = $(FOR_DEP_GEN)"
-	@echo "LIBEXT             = $(LIBEXT)"
 	@echo "BLASLIBS           = $(BLASLIBS)"
 	@echo "BOOSTTESTLIBS      = $(BOOSTTESTLIBS)"
 	@echo "BOOSTTHREADLIBS    = $(BOOSTTHREADLIBS)"
@@ -165,6 +164,7 @@ showbuild:
 	@echo "LAPACKLIBS         = $(LAPACKLIBS)"
 	@echo "LOOPFUNCFLAGS      = $(LOOPFUNCFLAGS)"
 	@echo "LOOPFUNCLIBS       = $(LOOPFUNCLIBS)"
+	@echo "MODULE_LIBEXT      = $(MODULE_LIBEXT)"
 	@echo "SQLITELIBS         = $(SQLITELIBS)"
 	@echo "SQLITEFLAGS        = $(SQLITEFLAGS)"
 	@echo "THREADLIBS         = $(THREADLIBS)"

diff --git a/config/Makefile.in b/config/Makefile.in
@@ -54,9 +54,10 @@ FFLAGS             := @FFLAGS@
 FLIBS              := @FLIBS@
 MAKELIB            := @MAKELIB@
 MAKESHAREDLIB      := @MAKESHAREDLIB@
+MODULE_LIBEXT      := @MODULE_LIBEXT@
 LDFLAGS            := @LDFLAGS@
 LDLIBS             := @LDLIBS@
-LIBEXT             := @LIBEXT@
+LIBLNK_LIBEXT      := @LIBLNK_LIBEXT@
 BLASLIBS           := @BLASLIBS@
 BOOSTTESTLIBS      := @BOOSTTESTLIBS@
 BOOSTTHREADLIBS    := @BOOSTTHREADLIBS@
@@ -241,9 +242,9 @@ showbuild:
 	@echo "FFLAGS             = $(FFLAGS)"
 	@echo "FLIBS              = $(FLIBS)"
 	@echo "MAKELIB            = $(MAKELIB)"
+	@echo "MODULE_LIBEXT      = $(MODULE_LIBEXT)"
 	@echo "LDFLAGS            = $(LDFLAGS)"
 	@echo "LDLIBS             = $(LDLIBS)"
-	@echo "LIBEXT             = $(LIBEXT)"
 	@echo "BLASLIBS           = $(BLASLIBS)"
 	@echo "BOOSTTESTLIBS      = $(BOOSTTESTLIBS)"
 	@echo "BOOSTTHREADLIBS    = $(BOOSTTHREADLIBS)"

diff --git a/config/Makefile.standalone.in b/config/Makefile.standalone.in
@@ -8,7 +8,7 @@ ENABLE_FFLITE    := @ENABLE_FFLITE@
 ENABLE_LOOPTOOLS := @ENABLE_LOOPTOOLS@
 ENABLE_THREADS   := @ENABLE_THREADS@
 
-LIBEXT          := @LIBEXT@
+MODULE_LIBEXT   := @MODULE_LIBEXT@
 
 MODEL           := MSSM
 
@@ -23,10 +23,10 @@ INCCONFIG       := -I$(CONFIGDIR)
 INCFLEXI        := -I$(FLEXIDIR)
 INCLEGACY       := -I$(LEGACYDIR)
 INCFFLITE       := -I$(FFLITEDIR)
-LIBMODEL        := $(MODELDIR)/lib$(MODEL)$(LIBEXT)
-LIBFLEXI        := $(FLEXIDIR)/libflexisusy$(LIBEXT)
-LIBLEGACY       := $(LEGACYDIR)/liblegacy$(LIBEXT)
-LIBFFLITE       := $(FFLITEDIR)/libfflite$(LIBEXT)
+LIBMODEL        := $(MODELDIR)/lib$(MODEL)$(MODULE_LIBEXT)
+LIBFLEXI        := $(FLEXIDIR)/libflexisusy$(MODULE_LIBEXT)
+LIBLEGACY       := $(LEGACYDIR)/liblegacy$(MODULE_LIBEXT)
+LIBFFLITE       := $(FFLITEDIR)/libfflite$(MODULE_LIBEXT)
 
 # Variables for compilation
 CXX             := @CXX@
@@ -149,7 +149,6 @@ showbuild:
 	@echo "FFLAGS             = $(FFLAGS)"
 	@echo "FLIBS              = $(FLIBS)"
 	@echo "FOR_DEP_GEN        = $(FOR_DEP_GEN)"
-	@echo "LIBEXT             = $(LIBEXT)"
 	@echo "BLASLIBS           = $(BLASLIBS)"
 	@echo "BOOSTTESTLIBS      = $(BOOSTTESTLIBS)"
 	@echo "BOOSTTHREADLIBS    = $(BOOSTTHREADLIBS)"
@@ -160,6 +159,7 @@ showbuild:
 	@echo "LAPACKLIBS         = $(LAPACKLIBS)"
 	@echo "LOOPFUNCFLAGS      = $(LOOPFUNCFLAGS)"
 	@echo "LOOPFUNCLIBS       = $(LOOPFUNCLIBS)"
+	@echo "MODULE_LIBEXT      = $(MODULE_LIBEXT)"
 	@echo "SQLITELIBS         = $(SQLITELIBS)"
 	@echo "SQLITEFLAGS        = $(SQLITEFLAGS)"
 	@echo "THREADLIBS         = $(THREADLIBS)"

diff --git a/config/Makefile.tower.in b/config/Makefile.tower.in
@@ -8,7 +8,7 @@ ENABLE_FFLITE    := @ENABLE_FFLITE@
 ENABLE_LOOPTOOLS := @ENABLE_LOOPTOOLS@
 ENABLE_THREADS   := @ENABLE_THREADS@
 
-LIBEXT          := @LIBEXT@
+MODULE_LIBEXT   := @MODULE_LIBEXT@
 
 MODEL1          := MSSMD5O
 MODEL2          := MSSMRHN
@@ -28,11 +28,11 @@ INCFLEXI        := -I$(FLEXIDIR)
 INCLEGACY       := -I$(LEGACYDIR)
 INCFFLITE       := -I$(FFLITEDIR)
 INCSLHAEA       := -I$(SLHAEADIR)
-LIBMODEL1       := $(MODEL1DIR)/lib$(MODEL1)$(LIBEXT)
-LIBMODEL2       := $(MODEL2DIR)/lib$(MODEL2)$(LIBEXT)
-LIBFLEXI        := $(FLEXIDIR)/libflexisusy$(LIBEXT)
-LIBLEGACY       := $(LEGACYDIR)/liblegacy$(LIBEXT)
-LIBFFLITE       := $(FFLITEDIR)/libfflite$(LIBEXT)
+LIBMODEL1       := $(MODEL1DIR)/lib$(MODEL1)$(MODULE_LIBEXT)
+LIBMODEL2       := $(MODEL2DIR)/lib$(MODEL2)$(MODULE_LIBEXT)
+LIBFLEXI        := $(FLEXIDIR)/libflexisusy$(MODULE_LIBEXT)
+LIBLEGACY       := $(LEGACYDIR)/liblegacy$(MODULE_LIBEXT)
+LIBFFLITE       := $(FFLITEDIR)/libfflite$(MODULE_LIBEXT)
 
 # Variables for compilation
 CXX             := @CXX@
@@ -160,7 +160,6 @@ showbuild:
 	@echo "FFLAGS             = $(FFLAGS)"
 	@echo "FLIBS              = $(FLIBS)"
 	@echo "FOR_DEP_GEN        = $(FOR_DEP_GEN)"
-	@echo "LIBEXT             = $(LIBEXT)"
 	@echo "BLASLIBS           = $(BLASLIBS)"
 	@echo "BOOSTTESTLIBS      = $(BOOSTTESTLIBS)"
 	@echo "BOOSTTHREADLIBS    = $(BOOSTTHREADLIBS)"
@@ -171,6 +170,7 @@ showbuild:
 	@echo "LAPACKLIBS         = $(LAPACKLIBS)"
 	@echo "LOOPFUNCFLAGS      = $(LOOPFUNCFLAGS)"
 	@echo "LOOPFUNCLIBS       = $(LOOPFUNCLIBS)"
+	@echo "MODULE_LIBEXT      = $(MODULE_LIBEXT)"
 	@echo "SQLITELIBS         = $(SQLITELIBS)"
 	@echo "SQLITEFLAGS        = $(SQLITEFLAGS)"
 	@echo "THREADLIBS         = $(THREADLIBS)"

diff --git a/configure b/configure
@@ -163,7 +163,6 @@ BOOSTTHREADLIBS=""
 THREADLIBS=""
 LDFLAGS=""
 LDLIBS=""
-LIBEXT=".a"
 CXX="g++"
 CC="gcc"
 EIGENFLAGS=""
@@ -177,6 +176,10 @@ MAKESHAREDLIB="gcc -shared -o"
 MATH="math"
 OPTIONAL_MODULES=""
 pthread_lib_dir=""
+STATIC_LIB_EXT=".a"
+SHARED_LIB_EXT=".so"
+MODULE_LIBEXT="$STATIC_LIB_EXT"
+LIBLNK_LIBEXT="$SHARED_LIB_EXT"
 sqlite_lib_dir=""
 sqlite_inc_dir=""
 tsil_lib_dir=""
@@ -1574,6 +1577,18 @@ check_fortran_libs() {
     esac
 }
 
+#_____________________________________________________________________
+check_linking() {
+    if [ "x$enable_static_libs" = xyes ] ; then
+        MODULE_LIBEXT="$STATIC_LIB_EXT"
+    else
+        MODULE_LIBEXT="$SHARED_LIB_EXT"
+    fi
+
+    # LibaryLink lib must always be shared
+    LIBLNK_LIBEXT="$SHARED_LIB_EXT"
+}
+
 #_____________________________________________________________________
 check_blas_libs_using_options() {
     check_library "libblas" "$blas_lib_dir" \
@@ -2050,15 +2065,6 @@ enable_defines() {
         logmsg "   ${DEFINE_ENABLE_SILENT}"
     fi
 
-    if test "x$enable_static_libs" = "xno" ; then
-        # check the library extension
-        if test "x$LIBEXT" = "x.a" ; then
-            message "  Warning: library extension $LIBEXT is reserved for static libraries."
-            message "    Please consider using .so as library extension, or similar, e.g."
-            message "    --with-lib-ext=\".so\""
-        fi
-    fi
-
     if test "x$enable_verbose" = "xyes" ; then
         if test "x$enable_silent" = "xyes" ; then
             message "Warning: ignoring --enable-verbose because silent mode is enabled!"
@@ -2166,7 +2172,8 @@ replace_markers() {
 	-e "s|@MAKESHAREDLIB@|$MAKESHAREDLIB|"    \
 	-e "s|@ENABLE_STATIC_LIBS@|$enable_static_libs|" \
 	-e "s|@MATH@|$MATH|"               \
-	-e "s|@LIBEXT@|$LIBEXT|"
+	-e "s|@MODULE_LIBEXT@|$MODULE_LIBEXT|"  \
+	-e "s|@LIBLNK_LIBEXT@|$LIBLNK_LIBEXT|"
 }
 
 #_____________________________________________________________________
@@ -2225,7 +2232,6 @@ Package directories, compilation settings and model selection
   --with-lapack-libs=       LAPACK libraries to be linked
   --with-ldflags=           Linker flags (default: $LDFLAGS)
   --with-ldlibs=            Additional libraries to be linked (default: $LDLIBS)
-  --with-lib-ext=           Library extension (default: $LIBEXT)
   --with-looptools-libdir=  Path to search for LoopTools libraries
   --with-looptools-incdir=  Path to search for LoopTools headers
   --with-make-lib-cmd=      Command to make library (default: $MAKELIB)
@@ -2243,8 +2249,10 @@ cat <<EOF
   --with-optional-modules=  Load optional FlexibleSUSY modules
                             (for example the \`test' or \`examples' module)
   --with-pthread-libdir=    Path to search for pthread library
+  --with-shared-lib-ext=    File extension for shared library (default: $SHARED_LIB_EXT)
   --with-sqlite-libdir=     Path to search for SQLite library
   --with-sqlite-incdir=     Path to search for SQLite header
+  --with-static-lib-ext=    File extension for static library (default: $STATIC_LIB_EXT)
   --with-tsil-libdir=       Path to search for TSIL library
   --with-tsil-incdir=       Path to search for TSIL header
 EOF
@@ -2335,7 +2343,6 @@ if test $# -gt 0 ; then
             --with-lapack-libs=*)    LAPACKLIBS=$optarg ;;
             --with-ldflags=*)        LDFLAGS=$optarg ;;
             --with-ldlibs=*)         LDLIBS=$optarg ;;
-            --with-lib-ext=*)        LIBEXT=$optarg ;;
             --with-looptools-libdir=*) looptools_lib_dir=$optarg ;;
             --with-looptools-incdir=*) looptools_inc_dir=$optarg ;;
             --with-make-lib-cmd=*)   MAKELIB=$optarg ;;
@@ -2344,8 +2351,10 @@ if test $# -gt 0 ; then
             --with-models=*)         MODELS=$optarg ;;
             --with-optional-modules=*) OPTIONAL_MODULES="$(echo $optarg | tr ',' ' ')" ;;
             --with-pthread-libdir=*) pthread_lib_dir=$optarg ;;
+            --with-shared-lib-ext=*) SHARED_LIB_EXT=$optarg ;;
             --with-sqlite-libdir=*)  sqlite_lib_dir=$optarg ;;
             --with-sqlite-incdir=*)  sqlite_inc_dir=$optarg ;;
+            --with-static-lib-ext=*) STATIC_LIB_EXT=$optarg ;;
             --with-tsil-libdir=*)    tsil_lib_dir=$optarg ;;
             --with-tsil-incdir=*)    tsil_inc_dir=$optarg ;;
             --help|-h)               help; exit 0 ;;
@@ -2373,6 +2382,7 @@ if test "x${enable_compile}" = "xyes"; then
     check_cc
     check_fc
     check_fflags
+    check_linking
     check_boost
     check_boost_version
     check_boost_test_incl

diff --git a/templates/module.addon.mk.in b/templates/module.addon.mk.in
@@ -35,7 +35,7 @@ EXE@ADDON@_EXE := \
 		$(patsubst %.f, %.x, $(filter %.f, $(EXE@ADDON@_SRC)))
 
 LIB@ADDON@     := \
-		$(DIR)/lib$(MODNAME)$(LIBEXT)
+		$(DIR)/lib$(MODNAME)$(MODULE_LIBEXT)
 
 LIB@ADDON@_INSTALL_DIR := \
 		$(INSTALL_DIR)/$(DIR)

diff --git a/templates/module.mk.in b/templates/module.mk.in
@@ -144,9 +144,9 @@ ML@CLASSNAME@_DEP  := \
 		$(patsubst %.cpp, %.d, $(filter %.cpp, $(ML@CLASSNAME@_SRC)))
 
 ML@CLASSNAME@_OBJ  := $(ML@CLASSNAME@_SRC:.cpp=.o)
-ML@CLASSNAME@_LIB  := $(ML@CLASSNAME@_SRC:.cpp=.so)
+ML@CLASSNAME@_LIB  := $(ML@CLASSNAME@_SRC:.cpp=$(LIBLNK_LIBEXT))
 
-LIB@CLASSNAME@     := $(DIR)/lib$(MODNAME)$(LIBEXT)
+LIB@CLASSNAME@     := $(DIR)/lib$(MODNAME)$(MODULE_LIBEXT)
 
 METACODE_STAMP_@CLASSNAME@ := $(DIR)/00_DELETE_ME_TO_RERUN_METACODE