diff --git a/addons/GM2Calc/module.mk b/addons/GM2Calc/module.mk
index 0b4a0cce2..3c9d82ad4 100644
--- a/addons/GM2Calc/module.mk
+++ b/addons/GM2Calc/module.mk
@@ -64,7 +64,7 @@ EXEGM2Calc_EXE := \
 		$(patsubst %.cpp, %.x, $(filter %.cpp, $(EXEGM2Calc_SRC)))
 
 LIBGM2Calc     := \
-		$(DIR)/lib$(MODNAME)$(LIBEXT)
+		$(DIR)/lib$(MODNAME)$(MODULE_LIBEXT)
 
 LIBGM2Calc_INSTALL_DIR := $(INSTALL_DIR)/$(DIR)
 
@@ -108,7 +108,7 @@ endif
 $(LIBGM2Calc_DEP) $(EXEGM2Calc_DEP) $(LIBGM2Calc_OBJ) $(EXEGM2Calc_OBJ): CPPFLAGS += $(EIGENFLAGS) $(BOOSTFLAGS)
 
 $(LIBGM2Calc): $(LIBGM2Calc_OBJ)
-		$(MAKELIB) $@ $^
+		$(MODULE_MAKE_LIB_CMD) $@ $^
 
 $(DIR)/%.x: $(DIR)/%.o $(LIBGM2Calc) $(LIBFLEXI) $(LIBLEGACY)
 		$(CXX) -o $@ $(call abspathx,$^)
diff --git a/addons/test_call_tsil/module.mk b/addons/test_call_tsil/module.mk
index e094254d8..16a8145e4 100644
--- a/addons/test_call_tsil/module.mk
+++ b/addons/test_call_tsil/module.mk
@@ -38,7 +38,7 @@ EXEtest_call_tsil_EXE := \
 		$(patsubst %.f, %.x, $(filter %.f, $(EXEtest_call_tsil_SRC)))
 
 LIBtest_call_tsil     := \
-		$(DIR)/lib$(MODNAME)$(LIBEXT)
+		$(DIR)/lib$(MODNAME)$(MODULE_LIBEXT)
 
 LIBtest_call_tsil_INSTALL_DIR := \
 		$(INSTALL_DIR)/$(DIR)
@@ -100,7 +100,7 @@ $(LIBtest_call_tsil_DEP) $(EXEtest_call_tsil_DEP) $(LIBtest_call_tsil_OBJ) $(EXE
 endif
 
 $(LIBtest_call_tsil): $(LIBtest_call_tsil_OBJ)
-		$(MAKELIB) $@ $^
+		$(MODULE_MAKE_LIB_CMD) $@ $^
 
 $(EXEtest_call_tsil_EXE): $(EXEtest_call_tsil_OBJ) $(LIBtest_call_tsil) $(LIBFLEXI) $(LIBLEGACY) $(filter-out -%,$(LOOPFUNCLIBS))
 		$(CXX) -o $@ $(call abspathx,$^) $(filter -%,$(LOOPFUNCLIBS)) $(GSLLIBS) $(BOOSTTHREADLIBS) $(THREADLIBS) $(LAPACKLIBS) $(BLASLIBS) $(TSILLIBS) $(FLIBS)
diff --git a/config/Makefile.in b/config/Makefile.in
index 3cdcb4a44..5bae7e6ec 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -52,12 +52,12 @@ CFLAGS             := @CFLAGS@ $(patsubst %,-I%,$(MODULES)) -I.
 FC                 := @FC@
 FFLAGS             := @FFLAGS@
 FLIBS              := @FLIBS@
-MAKELIB            := @MAKELIB@
-MAKESHAREDLIB      := @MAKESHAREDLIB@
 MODULE_LIBEXT      := @MODULE_LIBEXT@
+MODULE_MAKE_LIB_CMD:= @MODULE_MAKE_LIB_CMD@
 LDFLAGS            := @LDFLAGS@
 LDLIBS             := @LDLIBS@
 LIBLNK_LIBEXT      := @LIBLNK_LIBEXT@
+LIBLNK_MAKE_LIB_CMD:= @LIBLNK_MAKE_LIB_CMD@
 BLASLIBS           := @BLASLIBS@
 BOOSTTESTLIBS      := @BOOSTTESTLIBS@
 BOOSTTHREADLIBS    := @BOOSTTHREADLIBS@
@@ -241,8 +241,6 @@ showbuild:
 	@echo "FC                 = $(FC)"
 	@echo "FFLAGS             = $(FFLAGS)"
 	@echo "FLIBS              = $(FLIBS)"
-	@echo "MAKELIB            = $(MAKELIB)"
-	@echo "MODULE_LIBEXT      = $(MODULE_LIBEXT)"
 	@echo "LDFLAGS            = $(LDFLAGS)"
 	@echo "LDLIBS             = $(LDLIBS)"
 	@echo "BLASLIBS           = $(BLASLIBS)"
@@ -253,8 +251,12 @@ showbuild:
 	@echo "GSLLIBS            = $(GSLLIBS)"
 	@echo "GSLFLAGS           = $(GSLFLAGS)"
 	@echo "LAPACKLIBS         = $(LAPACKLIBS)"
+	@echo "LIBLNK_MAKE_LIB_CMD= $(LIBLNK_MAKE_LIB_CMD)"
+	@echo "LIBLNK_LIBEXT      = $(LIBLNK_LIBEXT)"
 	@echo "LOOPFUNCFLAGS      = $(LOOPFUNCFLAGS)"
 	@echo "LOOPFUNCLIBS       = $(LOOPFUNCLIBS)"
+	@echo "MODULE_MAKE_LIB_CMD= $(MODULE_MAKE_LIB_CMD)"
+	@echo "MODULE_LIBEXT      = $(MODULE_LIBEXT)"
 	@echo "SQLITELIBS         = $(SQLITELIBS)"
 	@echo "SQLITEFLAGS        = $(SQLITEFLAGS)"
 	@echo "THREADLIBS         = $(THREADLIBS)"
diff --git a/config/flexiblesusy-config.in b/config/flexiblesusy-config.in
index c838b931b..225b4cd04 100644
--- a/config/flexiblesusy-config.in
+++ b/config/flexiblesusy-config.in
@@ -18,9 +18,10 @@ loopfuncflags="@LOOPFUNCFLAGS@"
 cxx="@CXX@"
 fc="@FC@"
 flibs="@FLIBS@"
-makelib="@MAKELIB@"
 math="@MATH@"
 packagename="@PKGNAME@"
+shared_lib_cmd="@SHARED_LIB_CMD@"
+static_lib_cmd="@STATIC_LIB_CMD@"
 threadlibs="@THREADLIBS@"
 
 usage="\
@@ -68,9 +69,10 @@ Options:
   --ldflags             Print LDFLAGS
   --ldlibs              Print LDLIBS
   --loopfuncflags       Print compiler flags for loop function library
-  --make-lib-cmd        Print make library command
   --math-cmd            Print Mathematica kernel command
   --threadlibs          Print thread library
+  --shared-lib-cmd      Print command to build shared library
+  --static-lib-cmd      Print command to build static library
   --with-<addon>        Test if <addon> is compiled in
   --with-<model>        Test if <model> is compiled in
   --version             Print the $packagename version
@@ -102,8 +104,9 @@ while test $# -gt 0; do
         --ldflags)       out="$out $ldflags"  ;;
         --ldlibs)        out="$out $ldlibs"   ;;
         --loopfuncflags) out="$out $loopfuncflags" ;;
-        --make-lib-cmd)  out="$out $makelib"  ;;
         --math-cmd)      out="$out $math"     ;;
+        --shared-lib-cmd) out="$out $shared_lib_cmd" ;;
+        --static-lib-cmd) out="$out $static_lib_cmd" ;;
         --threadlibs)    out="$out $threadlibs" ;;
         --with-*)
       ### Check for model
diff --git a/configure b/configure
index 37de37496..82ed44990 100755
--- a/configure
+++ b/configure
@@ -171,15 +171,17 @@ GSLLIBS=""
 INSTALL_DIR=""
 BLASLIBS=""
 LAPACKLIBS=""
-MAKELIB="ar cru"
-MAKESHAREDLIB="gcc -shared -o"
 MATH="math"
 OPTIONAL_MODULES=""
 pthread_lib_dir=""
 STATIC_LIB_EXT=".a"
+STATIC_LIB_CMD="ar cru"
 SHARED_LIB_EXT=".so"
+SHARED_LIB_CMD="$CC -shared -o"
 MODULE_LIBEXT="$STATIC_LIB_EXT"
+MODULE_MAKE_LIB_CMD="$STATIC_LIB_CMD"
 LIBLNK_LIBEXT="$SHARED_LIB_EXT"
+LIBLNK_MAKE_LIB_CMD="$SHARED_LIB_CMD"
 sqlite_lib_dir=""
 sqlite_inc_dir=""
 tsil_lib_dir=""
@@ -1581,12 +1583,15 @@ check_fortran_libs() {
 check_linking() {
     if [ "x$enable_static_libs" = xyes ] ; then
         MODULE_LIBEXT="$STATIC_LIB_EXT"
+        MODULE_MAKE_LIB_CMD="$STATIC_LIB_CMD"
     else
         MODULE_LIBEXT="$SHARED_LIB_EXT"
+        MODULE_MAKE_LIB_CMD="$SHARED_LIB_CMD"
     fi
 
     # LibaryLink lib must always be shared
     LIBLNK_LIBEXT="$SHARED_LIB_EXT"
+    LIBLNK_MAKE_LIB_CMD="$SHARED_LIB_CMD"
 }
 
 #_____________________________________________________________________
@@ -1823,26 +1828,16 @@ check_lapack_libs() {
 }
 
 #_____________________________________________________________________
-check_makelib() {
-    checking_msg "build library command $MAKELIB"
+check_static_lib_cmd() {
+    checking_msg "build static library command $STATIC_LIB_CMD"
     # strip arguments from the actual command
-    makelib_cmd=$(echo "$MAKELIB" | awk '{ print $1; }')
-
-    # check if $makelib_cmd can create shared libraries
-    if test "x$enable_static_libs" = "xno" ; then
-        if test "x$makelib_cmd" = "xar" ; then
-            message ""
-            message "   Error: $makelib_cmd cannot be used to create shared libraries!"
-            message "   Please use --with-make-lib-cmd=\"gcc -shared -o\" or something similar."
-            exit 1
-        fi
-    fi
+    makelib_cmd=$(echo "$STATIC_LIB_CMD" | awk '{ print $1; }')
 
     exists_in_path "$makelib_cmd"
     if [ -z "$cmd" ] ; then
         result "not found"
-        message "Error: A program which builds libraries must be installed!"
-        message "   Use --with-make-lib-cmd= to specify the library creator program to be used."
+        message "Error: A program which builds static libraries must be installed!"
+        message "   Use --with-static-lib-cmd= to specify the program to be used."
         exit 1
     else
         result "found $cmd"
@@ -1850,16 +1845,16 @@ check_makelib() {
 }
 
 #_____________________________________________________________________
-check_make_shared_lib() {
-    checking_msg "build shared library command $MAKESHAREDLIB"
+check_shared_lib_cmd() {
+    checking_msg "build shared library command $SHARED_LIB_CMD"
     # strip arguments from the actual command
-    makelib_cmd=$(echo "$MAKESHAREDLIB" | awk '{ print $1; }')
+    makelib_cmd=$(echo "$SHARED_LIB_CMD" | awk '{ print $1; }')
 
     exists_in_path "$makelib_cmd"
     if [ -z "$cmd" ] ; then
         result "not found"
         message "Error: A program which builds shared libraries must be installed!"
-        message "   Use --with-make-shared-lib-cmd= to specify the program to be used."
+        message "   Use --with-shared-lib-cmd= to specify the program to be used."
         exit 1
     else
         result "found $cmd"
@@ -2168,12 +2163,12 @@ replace_markers() {
 	-e "s|@TSILLIBS@|$TSILLIBS|"              \
 	-e "s|@TSILFLAGS@|$TSILFLAGS|"            \
 	-e "s|@MODELS@|$MODELS|"           \
-	-e "s|@MAKELIB@|$MAKELIB|"         \
-	-e "s|@MAKESHAREDLIB@|$MAKESHAREDLIB|"    \
 	-e "s|@ENABLE_STATIC_LIBS@|$enable_static_libs|" \
 	-e "s|@MATH@|$MATH|"               \
 	-e "s|@MODULE_LIBEXT@|$MODULE_LIBEXT|"  \
-	-e "s|@LIBLNK_LIBEXT@|$LIBLNK_LIBEXT|"
+	-e "s|@MODULE_MAKE_LIB_CMD@|$MODULE_MAKE_LIB_CMD|" \
+	-e "s|@LIBLNK_LIBEXT@|$LIBLNK_LIBEXT|"  \
+	-e "s|@LIBLNK_MAKE_LIB_CMD@|$LIBLNK_MAKE_LIB_CMD|"
 }
 
 #_____________________________________________________________________
@@ -2234,8 +2229,6 @@ Package directories, compilation settings and model selection
   --with-ldlibs=            Additional libraries to be linked (default: $LDLIBS)
   --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)
-  --with-make-shared-lib-cmd= Command to make shared library (default: $MAKESHAREDLIB)
 EOF
 # BEGIN: NOT EXPORTED ##########################################
 cat <<EOF
@@ -2249,9 +2242,11 @@ 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-cmd=    Command to make shared library (default: $SHARED_LIB_CMD)
   --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-cmd=    Command to make static library (default: $STATIC_LIB_CMD)
   --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
@@ -2345,15 +2340,15 @@ if test $# -gt 0 ; then
             --with-ldlibs=*)         LDLIBS=$optarg ;;
             --with-looptools-libdir=*) looptools_lib_dir=$optarg ;;
             --with-looptools-incdir=*) looptools_inc_dir=$optarg ;;
-            --with-make-lib-cmd=*)   MAKELIB=$optarg ;;
-            --with-make-shared-lib-cmd=*) MAKESHAREDLIB=$optarg ;;
             --with-math-cmd=*)       MATH=$optarg ;;
             --with-models=*)         MODELS=$optarg ;;
             --with-optional-modules=*) OPTIONAL_MODULES="$(echo $optarg | tr ',' ' ')" ;;
             --with-pthread-libdir=*) pthread_lib_dir=$optarg ;;
+            --with-shared-lib-cmd=*) SHARED_LIB_CMD=$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-cmd=*) STATIC_LIB_CMD=$optarg ;;
             --with-static-lib-ext=*) STATIC_LIB_EXT=$optarg ;;
             --with-tsil-libdir=*)    tsil_lib_dir=$optarg ;;
             --with-tsil-incdir=*)    tsil_inc_dir=$optarg ;;
@@ -2403,7 +2398,8 @@ if test "x${enable_compile}" = "xyes"; then
     fi
     check_sqlite
     check_tsil
-    check_makelib
+    check_static_lib_cmd
+    check_shared_lib_cmd
     check_random_number_generator
     check_std_threads
     check_thread_libs
@@ -2418,10 +2414,6 @@ if test "x${enable_meta}" = "xyes"; then
     esac
 fi
 
-if test "x${enable_compile}" = "xyes" -a "x${enable_meta}" = "xyes"; then
-    check_make_shared_lib
-fi
-
 check_models
 check_addons
 
@@ -2465,15 +2457,16 @@ sed -e "s|@FLEXIBLESUSY_VERSION@|$FLEXIBLESUSY_VERSION|" \
     -e "s|@GSLLIBS@|$GSLLIBS|"         \
     -e "s|@LDFLAGS@|$LDFLAGS|"         \
     -e "s|@LDLIBS@|$LDLIBS|"           \
+    -e "s|@LIBLNK_MAKE_LIB_CMD@|$LIBLNK_MAKE_LIB_CMD|" \
     -e "s|@LOOPFUNCFLAGS@|$LOOPTOOLSFLAGS|" \
     -e "s|@SQLITELIBS@|$SQLITELIBS|"   \
     -e "s|@SQLITEFLAGS@|$SQLITEFLAGS|" \
     -e "s|@TSILLIBS@|$TSILLIBS|"       \
     -e "s|@TSILFLAGS@|$TSILFLAGS|"     \
-    -e "s|@MAKELIB@|$MAKELIB|"         \
-    -e "s|@MAKESHAREDLIB@|$MAKESHAREDLIB|"  \
     -e "s|@MATH@|$MATH|"               \
     -e "s|@MODELS@|$MODELS|"           \
+    -e "s|@SHARED_LIB_CMD@|$SHARED_LIB_CMD|" \
+    -e "s|@STATIC_LIB_CMD@|$STATIC_LIB_CMD|" \
     -e "s|@THREADLIBS@|$THREADLIBS|"   \
     < $FSCONFIG_TMPL > $FSCONFIG
 
diff --git a/fflite/module.mk b/fflite/module.mk
index ac3a1c8ab..ba9433400 100644
--- a/fflite/module.mk
+++ b/fflite/module.mk
@@ -38,7 +38,7 @@ LIBFFLITE_OBJ := \
 LIBFFLITE_DEP := \
 		$(LIBFFLITE_OBJ:.o=.d)
 
-LIBFFLITE     := $(DIR)/lib$(MODNAME)$(LIBEXT)
+LIBFFLITE     := $(DIR)/lib$(MODNAME)$(MODULE_LIBEXT)
 
 LIBFFLITE_INSTALL_DIR := $(INSTALL_DIR)/$(DIR)
 
@@ -77,7 +77,7 @@ clean::         clean-$(MODNAME)
 distclean::     distclean-$(MODNAME)
 
 $(LIBFFLITE): $(LIBFFLITE_OBJ)
-		$(MAKELIB) $@ $^
+		$(MODULE_MAKE_LIB_CMD) $@ $^
 
 ifeq ($(ENABLE_FFLITE),yes)
 ALLDEP += $(LIBFFLITE_DEP)
diff --git a/legacy/module.mk b/legacy/module.mk
index 02e3935d0..a1ad5893f 100644
--- a/legacy/module.mk
+++ b/legacy/module.mk
@@ -21,7 +21,7 @@ LIBLEGACY_OBJ := \
 LIBLEGACY_DEP := \
 		$(LIBLEGACY_OBJ:.o=.d)
 
-LIBLEGACY     := $(DIR)/lib$(MODNAME)$(LIBEXT)
+LIBLEGACY     := $(DIR)/lib$(MODNAME)$(MODULE_LIBEXT)
 
 LIBLEGACY_INSTALL_DIR := $(INSTALL_DIR)/$(DIR)
 
@@ -60,7 +60,7 @@ clean::         clean-$(MODNAME)
 distclean::     distclean-$(MODNAME)
 
 $(LIBLEGACY): $(LIBLEGACY_OBJ)
-		$(MAKELIB) $@ $^
+		$(MODULE_MAKE_LIB_CMD) $@ $^
 
 # add boost and eigen flags for the test object files and dependencies
 $(LIBLEGACY_OBJ) $(LIBLEGACY_DEP): CPPFLAGS += $(BOOSTFLAGS) $(EIGENFLAGS)
diff --git a/src/module.mk b/src/module.mk
index bb68fe545..29bc711f9 100644
--- a/src/module.mk
+++ b/src/module.mk
@@ -138,7 +138,7 @@ LIBFLEXI_OBJ := \
 LIBFLEXI_DEP := \
 		$(LIBFLEXI_OBJ:.o=.d)
 
-LIBFLEXI     := $(DIR)/lib$(MODNAME)$(LIBEXT)
+LIBFLEXI     := $(DIR)/lib$(MODNAME)$(MODULE_LIBEXT)
 
 LIBFLEXI_INSTALL_DIR := $(INSTALL_DIR)/$(DIR)
 
@@ -184,10 +184,10 @@ endif
 
 ifeq ($(ENABLE_STATIC_LIBS),yes)
 $(LIBFLEXI): $(LIBFLEXI_OBJ)
-		$(MAKELIB) $@ $^
+		$(MODULE_MAKE_LIB_CMD) $@ $^
 else
 $(LIBFLEXI): $(LIBFLEXI_OBJ)
-		$(MAKELIB) $@ $^ $(BOOSTTHREADLIBS) $(THREADLIBS) $(GSLLIBS) $(LAPACKLIBS) $(BLASLIBS) $(FLIBS) $(SQLITELIBS) $(TSILLIBS)
+		$(MODULE_MAKE_LIB_CMD) $@ $^ $(BOOSTTHREADLIBS) $(THREADLIBS) $(GSLLIBS) $(LAPACKLIBS) $(BLASLIBS) $(FLIBS) $(SQLITELIBS) $(TSILLIBS)
 endif
 
 ALLDEP += $(LIBFLEXI_DEP)
diff --git a/templates/module.addon.mk.in b/templates/module.addon.mk.in
index aca9fc6e5..5f781e40c 100644
--- a/templates/module.addon.mk.in
+++ b/templates/module.addon.mk.in
@@ -97,7 +97,7 @@ $(LIB@ADDON@_DEP) $(EXE@ADDON@_DEP) $(LIB@ADDON@_OBJ) $(EXE@ADDON@_OBJ): CPPFLAG
 endif
 
 $(LIB@ADDON@): $(LIB@ADDON@_OBJ)
-		$(MAKELIB) $@ $^
+		$(MODULE_MAKE_LIB_CMD) $@ $^
 
 $(EXE@ADDON@_EXE): $(EXE@ADDON@_OBJ) $(LIB@ADDON@) $(LIBFLEXI) $(LIBLEGACY) $(filter-out -%,$(LOOPFUNCLIBS))
 		$(CXX) -o $@ $(call abspathx,$^) $(filter -%,$(LOOPFUNCLIBS)) $(GSLLIBS) $(BOOSTTHREADLIBS) $(THREADLIBS) $(LAPACKLIBS) $(BLASLIBS) $(TSILLIBS) $(FLIBS)
diff --git a/templates/module.mk.in b/templates/module.mk.in
index a4856458a..34955ad12 100644
--- a/templates/module.mk.in
+++ b/templates/module.mk.in
@@ -256,13 +256,13 @@ $(ML@CLASSNAME@_OBJ) $(ML@CLASSNAME@_LIB): \
 	CPPFLAGS += $(shell $(MATH_INC_PATHS) --math-cmd="$(MATH)" -I --librarylink --mathlink)
 
 $(LIB@CLASSNAME@): $(LIB@CLASSNAME@_OBJ)
-		$(MAKELIB) $@ $^
+		$(MODULE_MAKE_LIB_CMD) $@ $^
 
 $(DIR)/%.x: $(DIR)/%.o $(LIB@CLASSNAME@) $(LIBFLEXI) $(LIBLEGACY) $(filter-out -%,$(LOOPFUNCLIBS))
 		$(CXX) $(LDFLAGS) -o $@ $(call abspathx,$^ $(ADDONLIBS)) $(filter -%,$(LOOPFUNCLIBS)) $(GSLLIBS) $(BOOSTTHREADLIBS) $(THREADLIBS) $(LAPACKLIBS) $(BLASLIBS) $(FLIBS) $(SQLITELIBS) $(TSILLIBS) $(LDLIBS)
 
 $(ML@CLASSNAME@_LIB): $(ML@CLASSNAME@_OBJ) $(LIB@CLASSNAME@) $(LIBFLEXI) $(LIBLEGACY) $(filter-out -%,$(LOOPFUNCLIBS))
-		$(MAKESHAREDLIB) $@ $(CPPFLAGS) $(CFLAGS) $(call abspathx,$^) $(ADDONLIBS) $(filter -%,$(LOOPFUNCLIBS)) $(GSLLIBS) $(BOOSTTHREADLIBS) $(THREADLIBS) $(LAPACKLIBS) $(BLASLIBS) $(FLIBS) $(SQLITELIBS) $(TSILLIBS) $(LDLIBS)
+		$(LIBLNK_MAKE_LIB_CMD) $@ $(CPPFLAGS) $(CFLAGS) $(call abspathx,$^) $(ADDONLIBS) $(filter -%,$(LOOPFUNCLIBS)) $(GSLLIBS) $(BOOSTTHREADLIBS) $(THREADLIBS) $(LAPACKLIBS) $(BLASLIBS) $(FLIBS) $(SQLITELIBS) $(TSILLIBS) $(LDLIBS)
 
 ALLDEP += $(LIB@CLASSNAME@_DEP) $(EXE@CLASSNAME@_DEP)
 ALLSRC += $(LIB@CLASSNAME@_SRC) $(EXE@CLASSNAME@_SRC)
diff --git a/test/module.mk b/test/module.mk
index 6018c9ea6..4686cbe91 100644
--- a/test/module.mk
+++ b/test/module.mk
@@ -12,7 +12,7 @@ LIBTEST_OBJ := \
 LIBTEST_DEP := \
 		$(LIBTEST_OBJ:.o=.d)
 
-LIBTEST     := $(DIR)/lib$(MODNAME)$(LIBEXT)
+LIBTEST     := $(DIR)/lib$(MODNAME)$(MODULE_LIBEXT)
 
 TEST_SRC := \
 		$(DIR)/test_ckm.cpp \
@@ -660,10 +660,10 @@ $(TEST_OBJ) $(TEST_DEP): CPPFLAGS += $(BOOSTFLAGS) $(EIGENFLAGS)
 
 ifeq ($(ENABLE_STATIC_LIBS),yes)
 $(LIBTEST): $(LIBTEST_OBJ)
-		$(MAKELIB) $@ $^
+		$(MODULE_MAKE_LIB_CMD) $@ $^
 else
 $(LIBTEST): $(LIBTEST_OBJ)
-		$(MAKELIB) $@ $^ $(BOOSTTHREADLIBS) $(THREADLIBS) $(GSLLIBS) $(LAPACKLIBS) $(BLASLIBS) $(FLIBS)
+		$(MODULE_MAKE_LIB_CMD) $@ $^ $(BOOSTTHREADLIBS) $(THREADLIBS) $(GSLLIBS) $(LAPACKLIBS) $(BLASLIBS) $(FLIBS)
 endif
 
 ALLDEP += $(LIBTEST_DEP) $(TEST_DEP)