From: Andre Noll <maan@tuebingen.mpg.de>
Date: Tue, 12 Jul 2016 19:56:13 +0000 (+0200)
Subject: build: Rename clean targets.
X-Git-Tag: v0.6.0~9^2~4
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=1426c2f051ddb98b6852cd20b251fd859b0cb253;ds=sidebyside

build: Rename clean targets.

The documentation of gnu make recommends to have targets called
mostlyclean, clean, distclean and maintainer-clean while we have clean,
clean2, distclean and maintainer clean.

This patch adds mostlyclean and removes clean2. The former target
removes the executables and all object files, clean additionally
removes the whole build directory and distclean removes, on top of
that, all files created by autoconf. Finally, maintainer-clean removes
the tarball and the files created by doxygen and global.
---

diff --git a/Makefile.real b/Makefile.real
index 8ededf6a..c4539860 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -63,7 +63,7 @@ tarball_pfx := $(PACKAGE_TARNAME)-$(GIT_VERSION)
 tarball_delete := $(addprefix $(tarball_pfx)/, web .gitignore)
 tarball := $(tarball_pfx).tar.bz2
 
-.PHONY: all clean clean2 distclean maintainer-clean install man tarball
+.PHONY: all mostlyclean clean distclean maintainer-clean install man tarball
 all: $(prefixed_executables) $(man_pages)
 man: $(man_pages)
 tarball: $(tarball)
@@ -337,22 +337,21 @@ $(prefixed_executables):
 	@[ -z "$(Q)" ] || echo 'LD $@'
 	$(Q) $(CC) $^ -o $@ $(LDFLAGS)
 
-clean:
-	@[ -z "$(Q)" ] || echo 'CLEAN'
+mostlyclean:
+	@[ -z "$(Q)" ] || echo 'MOSTLYCLEAN'
 	$(Q) rm -f para_*
 	$(Q) rm -rf $(object_dir)
-
-clean2: clean
-	@[ -z "$(Q)" ] || echo 'CLEAN2'
+clean: mostlyclean
+	@[ -z "$(Q)" ] || echo 'CLEAN'
 	$(Q) rm -rf $(build_dir)
-distclean: clean2 test-clean
+distclean: clean
 	@[ -z "$(Q)" ] || echo 'DISTCLEAN'
 	$(Q) rm -f Makefile autoscan.log config.status config.log
-	$(Q) rm -f GPATH GRTAGS GSYMS GTAGS
-
+	$(Q) rm -f config.h configure config.h.in
 maintainer-clean: distclean
 	@[ -z "$(Q)" ] || echo 'MAINTAINER-CLEAN'
-	$(Q) rm -f *.tar.bz2 config.h configure config.h.in
+	$(Q) rm -f *.tar.bz2
+	$(Q) rm -f GPATH GRTAGS GSYMS GTAGS
 
 install: all man
 	$(MKDIR_P) $(bindir) $(mandir)
diff --git a/autogen.sh b/autogen.sh
index d432adbb..708602e7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -24,5 +24,5 @@ autoheader
 echo configuring...
 ./configure $@ > /dev/null
 echo compiling...
-make clean2 > /dev/null 2>&1
+make clean > /dev/null 2>&1
 make -j $n > /dev/null