[sr-dev] git:master:2143d1eb: Merge pull request #170 from kamailio/vseva/distclean

[Victor Seva]

Module: kamailio
Branch: master
Commit: 2143d1eb56bd3a9a775494afaa0e71d6f584d5bb
URL: https://github.com/kamailio/kamailio/commit/2143d1eb56bd3a9a775494afaa0e71d6f584d5bb

Author: Victor Seva <linuxmaniac at torreviejawireless.org>
Committer: Victor Seva <linuxmaniac at torreviejawireless.org>
Date: 2015-05-22T15:03:27+02:00

Merge pull request #170 from kamailio/vseva/distclean

Makefile: use distclean as shortcut of maintainer-clean

---

Modified: Makefile
Modified: Makefile.targets

---

Diff:  https://github.com/kamailio/kamailio/commit/2143d1eb56bd3a9a775494afaa0e71d6f584d5bb.diff
Patch: https://github.com/kamailio/kamailio/commit/2143d1eb56bd3a9a775494afaa0e71d6f584d5bb.patch

---

diff --git a/Makefile b/Makefile
index 31fe195..efd58cc 100644
--- a/Makefile
+++ b/Makefile
@@ -920,10 +920,10 @@ clean: clean-libs
 clean-extra-names:
 	@rm -f $(filter-out $(MAIN_NAME), sip-router ser kamailio)
 
-# proper/distclean a.s.o modules, utils and libs too
+# proper/distclean-old a.s.o modules, utils and libs too
 
 proper: clean-extra-names proper-modules proper-utils proper-libs
-distclean: distclean-modules distclean-utils distclean-libs
+distclean-old: distclean-modules distclean-utils distclean-libs
 realclean: realclean-modules realclean-utils realclean-libs
 maintainer-clean: maintainer-clean-modules maintainer-clean-utils \
  maintainer-clean-libs
@@ -936,7 +936,7 @@ clean-all: clean
 maintainer-clean: modules=$(modules_all)
 
 # on make proper clean also the build config (w/o module list)
-proper realclean distclean maintainer-clean: clean_cfg
+proper realclean distclean-old maintainer-clean: clean_cfg
 
 # on maintainer clean, remove also the configured module list
 maintainer-clean: clean_modules_cfg clean_makefile_vars
@@ -959,7 +959,7 @@ clean_modules_cfg clean-modules-cfg:
 
 # clean everything generated - shortcut on maintainer-clean
 .PHONY: pure
-pure: maintainer-clean
+pure distclean: maintainer-clean
 
 .PHONY: install_initd_debian install-initd-debian
 install_initd_debian install-initd-debian:
diff --git a/Makefile.targets b/Makefile.targets
index 93399c8..9f9bf66 100644
--- a/Makefile.targets
+++ b/Makefile.targets
@@ -10,7 +10,7 @@ ifeq (,$(strip $(modules_dirs)))
 include $(COREPATH)/Makefile.dirs
 endif
 
-clean_targets:=	clean proper distclean realclean maintainer-clean local-clean \
+clean_targets:=	clean proper distclean-old realclean maintainer-clean local-clean \
 				clean-all proper-all distclean-all realclean-all \
 				clean_cfg clean-cfg clean_modules_cfg clean-modules-cfg \
 				clean-modules proper-modules realclean-modules \
@@ -19,7 +19,8 @@ clean_targets:=	clean proper distclean realclean maintainer-clean local-clean \
 				maintaner-clean-utils \
 				clean-libs proper-libs realclean-libs distclean-libs \
 				maintainer-clean-libs \
-				clean-tmp clean_doxygen clean-extra-names
+				clean-tmp clean_doxygen clean-extra-names \
+				pure distclean
 doc_targets:=	README man install-doc install-man install-ser-man \
 		install-every-module-doc install-every-module-man \
 		$(foreach m,$(modules_dirs),$(m)-doc $(m)-readme $(m)-man) \