adapt hard-coded model makefile modules to buildsystem changes

FlexibleSUSY · Aug 20, 2016 · 54a9e8e · 54a9e8e
1 parent 892dc0a
commit 54a9e8e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/models/SoftsusyMSSM/module.mk b/models/SoftsusyMSSM/module.mk
@@ -24,7 +24,7 @@ LIBSoftsusyMSSM_OBJ  := \
 LIBSoftsusyMSSM_DEP  := \
 		$(LIBSoftsusyMSSM_OBJ:.o=.d)
 
-LIBSoftsusyMSSM      := $(DIR)/lib$(MODNAME)$(LIBEXT)
+LIBSoftsusyMSSM      := $(DIR)/lib$(MODNAME)$(MODULE_LIBEXT)
 
 EXESoftsusyMSSM_SRC := \
 		$(DIR)/run_SoftsusyMSSM.cpp
@@ -64,7 +64,7 @@ distclean::     distclean-$(MODNAME)
 $(LIBSoftsusyMSSM_DEP) $(EXESoftsusyMSSM_DEP) $(LIBSoftsusyMSSM_OBJ) $(EXESoftsusyMSSM_OBJ): CPPFLAGS += $(EIGENFLAGS)
 
 $(LIBSoftsusyMSSM): $(LIBSoftsusyMSSM_OBJ)
-		$(MAKELIB) $@ $^
+		$(MODULE_MAKE_LIB_CMD) $@ $^
 
 $(RUN_SoftsusyMSSM_EXE): $(EXESoftsusyMSSM_OBJ) $(LIBSoftsusyMSSM) $(LIBFLEXI) $(LIBLEGACY) $(filter-out -%,$(LOOPFUNCLIBS))
 		$(CXX) -o $@ $(call abspathx,$^) $(filter -%,$(LOOPFUNCLIBS)) $(FLIBS)

diff --git a/models/SoftsusyNMSSM/module.mk b/models/SoftsusyNMSSM/module.mk
@@ -27,7 +27,7 @@ LIBSoftsusyNMSSM_OBJ  := \
 LIBSoftsusyNMSSM_DEP  := \
 		$(LIBSoftsusyNMSSM_OBJ:.o=.d)
 
-LIBSoftsusyNMSSM      := $(DIR)/lib$(MODNAME)$(LIBEXT)
+LIBSoftsusyNMSSM      := $(DIR)/lib$(MODNAME)$(MODULE_LIBEXT)
 
 EXESoftsusyNMSSM_SRC  :=
 
@@ -71,7 +71,7 @@ distclean::     distclean-$(MODNAME)
 $(LIBSoftsusyNMSSM_DEP) $(EXESoftsusyNMSSM_DEP) $(LIBSoftsusyNMSSM_OBJ) $(EXESoftsusyNMSSM_OBJ): CPPFLAGS += $(EIGENFLAGS)
 
 $(LIBSoftsusyNMSSM): $(LIBSoftsusyNMSSM_OBJ)
-		$(MAKELIB) $@ $^
+		$(MODULE_MAKE_LIB_CMD) $@ $^
 
 $(RUN_SOFTPOINT_EXE): $(DIR)/run_softpoint.o $(LIBSoftsusyNMSSM) $(LIBSoftsusyMSSM) $(LIBFLEXI) $(LIBLEGACY) $(filter-out -%,$(LOOPFUNCLIBS))
 		$(CXX) -o $@ $(call abspathx,$^) $(filter -%,$(LOOPFUNCLIBS)) $(FLIBS)

diff --git a/models/sm/module.mk b/models/sm/module.mk
@@ -17,7 +17,7 @@ LIBsm_OBJ    := \
 LIBsm_DEP    := \
 		$(LIBsm_OBJ:.o=.d)
 
-LIBsm        := $(DIR)/$(MODNAME)$(LIBEXT)
+LIBsm        := $(DIR)/$(MODNAME)$(MODULE_LIBEXT)
 
 .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
 
@@ -35,7 +35,7 @@ clean::         clean-$(MODNAME)
 distclean::     distclean-$(MODNAME)
 
 $(LIBsm): $(LIBsm_OBJ)
-		$(MAKELIB) $@ $^
+		$(MODULE_MAKE_LIB_CMD) $@ $^
 
 ALLDEP += $(LIBsm_DEP)
 ALLLIB += $(LIBsm)
diff --git a/models/smcw/module.mk b/models/smcw/module.mk
@@ -17,7 +17,7 @@ LIBsmcw_OBJ  := \
 LIBsmcw_DEP  := \
 		$(LIBsmcw_OBJ:.o=.d)
 
-LIBsmcw      := $(DIR)/$(MODNAME)$(LIBEXT)
+LIBsmcw      := $(DIR)/$(MODNAME)$(MODULE_LIBEXT)
 
 .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
 
@@ -35,7 +35,7 @@ clean::         clean-$(MODNAME)
 distclean::     distclean-$(MODNAME)
 
 $(LIBsmcw): $(LIBsmcw_OBJ)
-		$(MAKELIB) $@ $^
+		$(MODULE_MAKE_LIB_CMD) $@ $^
 
 ALLDEP += $(LIBsmcw_DEP)
 ALLLIB += $(LIBsmcw)