diff --git a/README b/README
index 73a65b60c..680d01155 100644
--- a/README
+++ b/README
@@ -377,6 +377,8 @@ remove model-specific files:
 
    $ make clean-<model>-dep # deletes .d files
 
+   $ make clean-<model>-lib # deletes library
+
    $ make clean-<model>-obj # deletes .o files
 
    $ make clean-<model>-src # deletes generated files
diff --git a/addons/GM2Calc/module.mk b/addons/GM2Calc/module.mk
index 9c05f6aa7..0b4a0cce2 100644
--- a/addons/GM2Calc/module.mk
+++ b/addons/GM2Calc/module.mk
@@ -68,23 +68,30 @@ LIBGM2Calc     := \
 
 LIBGM2Calc_INSTALL_DIR := $(INSTALL_DIR)/$(DIR)
 
-.PHONY:         clean-$(MODNAME) clean-$(MODNAME)-dep clean-$(MODNAME)-obj \
-		distclean-$(MODNAME)
+.PHONY:         all-$(MODNAME) clean-$(MODNAME) clean-$(MODNAME)-dep \
+		clean-$(MODNAME)-lib clean-$(MODNAME)-obj distclean-$(MODNAME)
+
+all-$(MODNAME): $(LIBGM2Calc) $(EXEGM2Calc_EXE)
+		@true
 
 clean-$(MODNAME)-dep:
 		-rm -f $(LIBGM2Calc_DEP)
 		-rm -f $(EXEGM2Calc_DEP)
 
+clean-$(MODNAME)-lib:
+		-rm -f $(LIBGM2Calc)
+
 clean-$(MODNAME)-obj:
 		-rm -f $(LIBGM2Calc_OBJ)
 		-rm -f $(EXEGM2Calc_OBJ)
 
-clean-$(MODNAME): clean-$(MODNAME)-dep clean-$(MODNAME)-obj
-		-rm -f $(LIBGM2Calc)
+clean-$(MODNAME): clean-$(MODNAME)-dep clean-$(MODNAME)-lib clean-$(MODNAME)-obj
 		-rm -f $(EXEGM2Calc_EXE)
 
 distclean-$(MODNAME): clean-$(MODNAME)
 
+clean-obj::     clean-$(MODNAME)-obj
+
 clean::         clean-$(MODNAME)
 
 distclean::     distclean-$(MODNAME)
diff --git a/addons/test_call_tsil/module.mk b/addons/test_call_tsil/module.mk
index 3dcb493e5..e094254d8 100644
--- a/addons/test_call_tsil/module.mk
+++ b/addons/test_call_tsil/module.mk
@@ -43,13 +43,20 @@ LIBtest_call_tsil     := \
 LIBtest_call_tsil_INSTALL_DIR := \
 		$(INSTALL_DIR)/$(DIR)
 
-.PHONY:         clean-$(MODNAME) clean-$(MODNAME)-dep clean-$(MODNAME)-obj \
-		 clean-$(MODNAME)-src distclean-$(MODNAME)
+.PHONY:         all-$(MODNAME) clean-$(MODNAME) clean-$(MODNAME)-dep \
+		clean-$(MODNAME)-lib clean-$(MODNAME)-obj clean-$(MODNAME)-src \
+		distclean-$(MODNAME)
+
+all-$(MODNAME): $(LIBtest_call_tsil) $(EXEtest_call_tsil_EXE)
+		@true
 
 clean-$(MODNAME)-dep:
 		-rm -f $(LIBtest_call_tsil_DEP)
 		-rm -f $(EXEtest_call_tsil_DEP)
 
+clean-$(MODNAME)-lib:
+		-rm -f $(LIBtest_call_tsil)
+
 clean-$(MODNAME)-obj:
 		-rm -f $(LIBtest_call_tsil_OBJ)
 		-rm -f $(EXEtest_call_tsil_OBJ)
@@ -62,8 +69,7 @@ clean-$(MODNAME)-src:
 clean-$(MODNAME): clean-$(MODNAME)-src
 # END:   NOT EXPORTED ##########################################
 
-clean-$(MODNAME): clean-$(MODNAME)-dep clean-$(MODNAME)-obj
-		-rm -f $(LIBtest_call_tsil)
+clean-$(MODNAME): clean-$(MODNAME)-dep clean-$(MODNAME)-lib clean-$(MODNAME)-obj
 		-rm -f $(EXEtest_call_tsil_EXE)
 
 distclean-$(MODNAME): clean-$(MODNAME)
diff --git a/config/module.mk b/config/module.mk
index ba902449a..c633f3f97 100644
--- a/config/module.mk
+++ b/config/module.mk
@@ -36,9 +36,11 @@ FLEXIBLESUSY_GIT_COMMIT_FILE := \
 REMOVE_EXPORT_MARKERS := \
 		$(DIR)/remove_export_markers.sh
 
-.PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
+.PHONY:         all-$(MODNAME) clean-$(MODNAME) clean-$(MODNAME)-dep \
+		clean-$(MODNAME)-lib clean-$(MODNAME)-obj distclean-$(MODNAME)
 
 all-$(MODNAME):
+		@true
 
 ifneq ($(INSTALL_DIR),)
 install-src::
@@ -55,10 +57,13 @@ endif
 clean-$(MODNAME)-dep:
 		@true
 
+clean-$(MODNAME)-lib:
+		@true
+
 clean-$(MODNAME)-obj:
 		-rm -f $(DEPGEN_OBJ)
 
-clean-$(MODNAME): clean-$(MODNAME)-dep clean-$(MODNAME)-obj
+clean-$(MODNAME): clean-$(MODNAME)-dep clean-$(MODNAME)-lib clean-$(MODNAME)-obj
 		-rm -f $(DEPGEN_EXE)
 
 distclean-$(MODNAME): clean-$(MODNAME)
diff --git a/doc/building.dox b/doc/building.dox
index 19a37c510..5a4e0ea65 100644
--- a/doc/building.dox
+++ b/doc/building.dox
@@ -240,6 +240,8 @@ remove model-specific files:
 
      make clean-<model>-dep # deletes .d files
 
+     make clean-<model>-lib # deletes library
+
      make clean-<model>-obj # deletes .o files
 
      make clean-<model>-src # deletes generated files
diff --git a/doc/module.mk b/doc/module.mk
index ef3b57590..a38321aec 100644
--- a/doc/module.mk
+++ b/doc/module.mk
@@ -65,6 +65,7 @@ doc-html: $(INDEX_PAGE)
 doc-man: $(MAN_PAGE)
 
 all-$(MODNAME): doc-html doc-man doc-pdf
+		@true
 
 ifneq ($(INSTALL_DIR),)
 install-src::
diff --git a/examples/module.mk b/examples/module.mk
index 65f7c2d0e..358944bc1 100644
--- a/examples/module.mk
+++ b/examples/module.mk
@@ -17,7 +17,8 @@ STANDALONE_DIR := \
 		$(DIR)/standalone-rge \
 		$(DIR)/tower
 
-.PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
+.PHONY:         all-$(MODNAME) clean-$(MODNAME) clean-$(MODNAME)-dep \
+		clean-$(MODNAME)-lib clean-$(MODNAME)-obj distclean-$(MODNAME)
 
 all-$(MODNAME): $(EXAMPLES_EXE)
 		@true
@@ -25,10 +26,13 @@ all-$(MODNAME): $(EXAMPLES_EXE)
 clean-$(MODNAME)-dep:
 		-rm -f $(EXAMPLES_DEP)
 
+clean-$(MODNAME)-lib:
+		@true
+
 clean-$(MODNAME)-obj:
 		-rm -f $(EXAMPLES_OBJ)
 
-clean-$(MODNAME): clean-$(MODNAME)-dep clean-$(MODNAME)-obj
+clean-$(MODNAME): clean-$(MODNAME)-dep clean-$(MODNAME)-lib clean-$(MODNAME)-obj
 		-rm -f $(EXAMPLES_EXE)
 
 distclean-$(MODNAME): clean-$(MODNAME)
diff --git a/fflite/module.mk b/fflite/module.mk
index daf7afc95..ac3a1c8ab 100644
--- a/fflite/module.mk
+++ b/fflite/module.mk
@@ -42,9 +42,11 @@ LIBFFLITE     := $(DIR)/lib$(MODNAME)$(LIBEXT)
 
 LIBFFLITE_INSTALL_DIR := $(INSTALL_DIR)/$(DIR)
 
-.PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
+.PHONY:         all-$(MODNAME) clean-$(MODNAME) clean-$(MODNAME)-dep \
+		clean-$(MODNAME)-lib clean-$(MODNAME)-obj distclean-$(MODNAME)
 
 all-$(MODNAME): $(LIBFFLITE)
+		@true
 
 ifneq ($(INSTALL_DIR),)
 install-src::
@@ -57,11 +59,14 @@ endif
 clean-$(MODNAME)-dep:
 		-rm -f $(LIBFFLITE_DEP)
 
+clean-$(MODNAME)-lib:
+		-rm -f $(LIBFFLITE)
+
 clean-$(MODNAME)-obj:
 		-rm -f $(LIBFFLITE_OBJ)
 
-clean-$(MODNAME): clean-$(MODNAME)-dep clean-$(MODNAME)-obj
-		-rm -f $(LIBFFLITE)
+clean-$(MODNAME): clean-$(MODNAME)-dep clean-$(MODNAME)-lib clean-$(MODNAME)-obj
+		@true
 
 distclean-$(MODNAME): clean-$(MODNAME)
 
diff --git a/legacy/module.mk b/legacy/module.mk
index 705b87664..02e3935d0 100644
--- a/legacy/module.mk
+++ b/legacy/module.mk
@@ -25,9 +25,11 @@ LIBLEGACY     := $(DIR)/lib$(MODNAME)$(LIBEXT)
 
 LIBLEGACY_INSTALL_DIR := $(INSTALL_DIR)/$(DIR)
 
-.PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
+.PHONY:         all-$(MODNAME) clean-$(MODNAME) clean-$(MODNAME)-dep \
+		clean-$(MODNAME)-lib clean-$(MODNAME)-obj distclean-$(MODNAME)
 
 all-$(MODNAME): $(LIBLEGACY)
+		@true
 
 ifneq ($(INSTALL_DIR),)
 install-src::
@@ -40,11 +42,14 @@ endif
 clean-$(MODNAME)-dep:
 		-rm -f $(LIBLEGACY_DEP)
 
+clean-$(MODNAME)-lib:
+		-rm -f $(LIBLEGACY)
+
 clean-$(MODNAME)-obj:
 		-rm -f $(LIBLEGACY_OBJ)
 
-clean-$(MODNAME): clean-$(MODNAME)-dep clean-$(MODNAME)-obj
-		-rm -f $(LIBLEGACY)
+clean-$(MODNAME): clean-$(MODNAME)-dep clean-$(MODNAME)-lib clean-$(MODNAME)-obj
+		@true
 
 distclean-$(MODNAME): clean-$(MODNAME)
 
diff --git a/slhaea/module.mk b/slhaea/module.mk
index 7b0667690..a0f8c2842 100644
--- a/slhaea/module.mk
+++ b/slhaea/module.mk
@@ -12,6 +12,7 @@ SLHAEA_INSTALL_DIR := $(INSTALL_DIR)/$(DIR)
 .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
 
 all-$(MODNAME):
+		@true
 
 ifneq ($(INSTALL_DIR),)
 install-src::
diff --git a/src/module.mk b/src/module.mk
index 8eb5a3c7f..c7dfd69e9 100644
--- a/src/module.mk
+++ b/src/module.mk
@@ -141,9 +141,11 @@ LIBFLEXI     := $(DIR)/lib$(MODNAME)$(LIBEXT)
 
 LIBFLEXI_INSTALL_DIR := $(INSTALL_DIR)/$(DIR)
 
-.PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
+.PHONY:         all-$(MODNAME) clean-$(MODNAME) clean-$(MODNAME)-dep \
+		clean-$(MODNAME)-lib clean-$(MODNAME)-obj distclean-$(MODNAME)
 
 all-$(MODNAME): $(LIBFLEXI)
+		@true
 
 ifneq ($(INSTALL_DIR),)
 install-src::
@@ -156,11 +158,14 @@ endif
 clean-$(MODNAME)-dep:
 		-rm -f $(LIBFLEXI_DEP)
 
+clean-$(MODNAME)-lib:
+		-rm -f $(LIBFLEXI)
+
 clean-$(MODNAME)-obj:
 		-rm -f $(LIBFLEXI_OBJ)
 
-clean-$(MODNAME): clean-$(MODNAME)-dep clean-$(MODNAME)-obj
-		-rm -f $(LIBFLEXI)
+clean-$(MODNAME): clean-$(MODNAME)-dep clean-$(MODNAME)-lib clean-$(MODNAME)-obj
+		@true
 
 distclean-$(MODNAME): clean-$(MODNAME)
 
diff --git a/templates/module.addon.mk.in b/templates/module.addon.mk.in
index 54f1486dd..f1f1715f7 100644
--- a/templates/module.addon.mk.in
+++ b/templates/module.addon.mk.in
@@ -40,13 +40,20 @@ LIB@ADDON@     := \
 LIB@ADDON@_INSTALL_DIR := \
 		$(INSTALL_DIR)/$(DIR)
 
-.PHONY:         clean-$(MODNAME) clean-$(MODNAME)-dep clean-$(MODNAME)-obj \
-		 clean-$(MODNAME)-src distclean-$(MODNAME)
+.PHONY:         all-$(MODNAME) clean-$(MODNAME) clean-$(MODNAME)-dep \
+		clean-$(MODNAME)-lib clean-$(MODNAME)-obj clean-$(MODNAME)-src \
+		distclean-$(MODNAME)
+
+all-$(MODNAME): $(LIB@ADDON@) $(EXE@ADDON@_EXE)
+		@true
 
 clean-$(MODNAME)-dep:
 		-rm -f $(LIB@ADDON@_DEP)
 		-rm -f $(EXE@ADDON@_DEP)
 
+clean-$(MODNAME)-lib:
+		-rm -f $(LIB@ADDON@)
+
 clean-$(MODNAME)-obj:
 		-rm -f $(LIB@ADDON@_OBJ)
 		-rm -f $(EXE@ADDON@_OBJ)
@@ -59,8 +66,7 @@ clean-$(MODNAME)-src:
 clean-$(MODNAME): clean-$(MODNAME)-src
 # END:   NOT EXPORTED ##########################################
 
-clean-$(MODNAME): clean-$(MODNAME)-dep clean-$(MODNAME)-obj
-		-rm -f $(LIB@ADDON@)
+clean-$(MODNAME): clean-$(MODNAME)-dep clean-$(MODNAME)-lib clean-$(MODNAME)-obj
 		-rm -f $(EXE@ADDON@_EXE)
 
 distclean-$(MODNAME): clean-$(MODNAME)
diff --git a/templates/module.mk.in b/templates/module.mk.in
index 77a712744..a9dc250a7 100644
--- a/templates/module.mk.in
+++ b/templates/module.mk.in
@@ -145,11 +145,12 @@ SARAH_MODEL_FILES_@CLASSNAME@ := \
 endif
 
 .PHONY:         all-$(MODNAME) clean-$(MODNAME) clean-$(MODNAME)-src \
-		clean-$(MODNAME)-dep clean-$(MODNAME)-obj \
-		distclean-$(MODNAME) run-metacode-$(MODNAME) \
-		pack-$(MODNAME)-src
+		clean-$(MODNAME)-dep clean-$(MODNAME)-lib \
+		clean-$(MODNAME)-obj distclean-$(MODNAME) \
+		run-metacode-$(MODNAME) pack-$(MODNAME)-src
 
-all-$(MODNAME): $(LIB@CLASSNAME@)
+all-$(MODNAME): $(LIB@CLASSNAME@) $(EXE@CLASSNAME@_EXE)
+		@true
 
 ifneq ($(INSTALL_DIR),)
 install-src::
@@ -169,6 +170,9 @@ clean-$(MODNAME)-dep:
 		-rm -f $(LIB@CLASSNAME@_DEP)
 		-rm -f $(EXE@CLASSNAME@_DEP)
 
+clean-$(MODNAME)-lib:
+		-rm -f $(LIB@CLASSNAME@)
+
 clean-$(MODNAME)-obj:
 		-rm -f $(LIB@CLASSNAME@_OBJ)
 		-rm -f $(EXE@CLASSNAME@_OBJ)
@@ -186,8 +190,7 @@ clean-$(MODNAME)-src:
 clean-$(MODNAME): clean-$(MODNAME)-src
 # END:   NOT EXPORTED ##########################################
 
-clean-$(MODNAME): clean-$(MODNAME)-dep clean-$(MODNAME)-obj
-		-rm -f $(LIB@CLASSNAME@)
+clean-$(MODNAME): clean-$(MODNAME)-dep clean-$(MODNAME)-lib clean-$(MODNAME)-obj
 		-rm -f $(EXE@CLASSNAME@_EXE)
 
 distclean-$(MODNAME): clean-$(MODNAME)
diff --git a/test/module.mk b/test/module.mk
index e6deb8e79..1934acff2 100644
--- a/test/module.mk
+++ b/test/module.mk
@@ -355,17 +355,21 @@ $(DIR)/test_pv_softsusy.x  : CPPFLAGS += $(BOOSTFLAGS) $(EIGENFLAGS) -DTEST_PV_S
 endif
 
 .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
-		clean-$(MODNAME)-log \
+		clean-$(MODNAME)-dep clean-$(MODNAME)-log \
+		clean-$(MODNAME)-lib clean-$(MODNAME)-obj \
 		execute-tests execute-meta-tests execute-compiled-tests \
 		execute-shell-tests
 
-all-$(MODNAME): $(LIBTEST) $(TEST_EXE)
+all-$(MODNAME): $(LIBTEST) $(TEST_EXE) $(TEST_LOG)
 		@true
 
 clean-$(MODNAME)-dep:
 		-rm -f $(TEST_DEP)
 		-rm -f $(LIBTEST_DEP)
 
+clean-$(MODNAME)-lib:
+		-rm -f $(LIBTEST)
+
 clean-$(MODNAME)-obj:
 		-rm -f $(TEST_OBJ)
 		-rm -f $(LIBTEST_OBJ)
@@ -374,8 +378,7 @@ clean-$(MODNAME)-log:
 		-rm -f $(TEST_LOG)
 
 clean-$(MODNAME): clean-$(MODNAME)-dep clean-$(MODNAME)-obj \
-                  clean-$(MODNAME)-log
-		-rm -f $(LIBTEST)
+                  clean-$(MODNAME)-lib clean-$(MODNAME)-log
 		-rm -f $(TEST_EXE)
 
 distclean-$(MODNAME): clean-$(MODNAME)