From 728b5ea016805417a2dffd110fe632af08c7b52c Mon Sep 17 00:00:00 2001 From: Alexander Voigt Date: Fri, 26 Aug 2016 16:37:59 +0200 Subject: [PATCH] don't let `make clean' delete generated files For that purpose use now make clean-generated # deletes all generated files or make clean--src # deletes generated files of --- README | 9 ++++++--- config/Makefile.in | 4 ++-- doc/building.dox | 7 +++++-- templates/module.addon.mk.in | 4 +++- templates/module.mk.in | 4 +++- 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/README b/README index ade66a854..6f3854dc6 100644 --- a/README +++ b/README @@ -354,9 +354,10 @@ Cleaning There are several make targets to remove generated files, compiled object files, libraries or executables: - $ make clean # deletes all .d .o .a .x and generated files + $ make clean # deletes all .d .o .a .x files - $ make distclean # calls `make clean' and deletes in addition + $ make distclean # does `clean' and `clean-generated' + # and deletes in addition: # Makefile flexiblesusy-config config.* # config/list_sarah_model_files.sh @@ -364,6 +365,8 @@ object files, libraries or executables: $ make clean-executables # deletes all .x files + $ make clean-generated # deletes generated files + $ make clean-lib # deletes all libraries $ make clean-obj # deletes all .o files @@ -371,7 +374,7 @@ object files, libraries or executables: For each model or addon there are specific clean targets to remove model-specific files: - $ make clean- # deletes .d .o .a .x and generated files + $ make clean- # deletes .d .o .a .x files $ make distclean- # same as `make clean-' diff --git a/config/Makefile.in b/config/Makefile.in index d9294a97a..14e1ee3c6 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -117,8 +117,8 @@ CONVERT_DOS_PATHS := config/convert_dos_paths.sh README_FILE := README .PHONY: all allsrc allexec alllib alltest clean clean-dep \ - clean-executables clean-lib clean-obj depend distclean \ - release-tag release-head showbuild tag + clean-executables clean-generated clean-lib clean-obj \ + depend distclean release-tag release-head showbuild tag all: ifeq ($(ENABLE_META),yes) diff --git a/doc/building.dox b/doc/building.dox index 54b8a38fb..1b989bf64 100644 --- a/doc/building.dox +++ b/doc/building.dox @@ -217,9 +217,10 @@ dynamic libraries. There are several make targets to remove generated files, compiled object files, libraries or executables: - make clean # deletes all .d .o .a .x and generated files + make clean # deletes all .d .o .a .x files - make distclean # calls `make clean' and deletes in addition + make distclean # does `clean' and `clean-generated' + # and deletes in addition: # Makefile flexiblesusy-config config.* # config/list_sarah_model_files.sh @@ -227,6 +228,8 @@ object files, libraries or executables: make clean-executables # deletes all .x files + make clean-generated # deletes generated files + make clean-lib # deletes all libraries make clean-obj # deletes all .o files diff --git a/templates/module.addon.mk.in b/templates/module.addon.mk.in index 886cdec80..6e6d4c82c 100644 --- a/templates/module.addon.mk.in +++ b/templates/module.addon.mk.in @@ -64,7 +64,7 @@ clean-$(MODNAME)-obj: clean-$(MODNAME)-src: @true -clean-$(MODNAME): clean-$(MODNAME)-src +distclean-$(MODNAME): clean-$(MODNAME)-src # END: NOT EXPORTED ########################################## clean-$(MODNAME): clean-$(MODNAME)-dep clean-$(MODNAME)-lib clean-$(MODNAME)-obj @@ -72,6 +72,8 @@ clean-$(MODNAME): clean-$(MODNAME)-dep clean-$(MODNAME)-lib clean-$(MODNAME)-obj distclean-$(MODNAME): clean-$(MODNAME) +clean-generated:: clean-$(MODNAME)-src + clean-obj:: clean-$(MODNAME)-obj clean:: clean-$(MODNAME) diff --git a/templates/module.mk.in b/templates/module.mk.in index 434a26443..cc908d920 100644 --- a/templates/module.mk.in +++ b/templates/module.mk.in @@ -188,7 +188,7 @@ clean-$(MODNAME)-src: -rm -f $(@CLASSNAME@_SLHA_INPUT) -rm -f $(@CLASSNAME@_GNUPLOT) -clean-$(MODNAME): clean-$(MODNAME)-src +distclean-$(MODNAME): clean-$(MODNAME)-src # END: NOT EXPORTED ########################################## clean-$(MODNAME): clean-$(MODNAME)-dep clean-$(MODNAME)-lib clean-$(MODNAME)-obj @@ -197,6 +197,8 @@ clean-$(MODNAME): clean-$(MODNAME)-dep clean-$(MODNAME)-lib clean-$(MODNAME)-obj distclean-$(MODNAME): clean-$(MODNAME) @true +clean-generated:: clean-$(MODNAME)-src + clean-obj:: clean-$(MODNAME)-obj clean:: clean-$(MODNAME)