From 75281a1696388d97635c4283c4eab8538f9b61aa Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" <kpfleming@digium.com> Date: Sat, 15 Nov 2008 19:45:19 +0000 Subject: [PATCH] Merged revisions 157162-157163 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r157162 | kpfleming | 2008-11-15 20:24:24 +0100 (Sat, 15 Nov 2008) | 1 line dist-clean should remove dependency information files as well ........ r157163 | kpfleming | 2008-11-15 20:31:03 +0100 (Sat, 15 Nov 2008) | 1 line when an individual directory dist-clean is run, run clean in that directory first, and when running top-level dist-clean, do not run subdirectory clean operations twice ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@157164 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- Makefile | 8 +++++--- Makefile.moddir_rules | 1 + Makefile.rules | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index f9b3ded030..5e3055b8e3 100644 --- a/Makefile +++ b/Makefile @@ -440,7 +440,9 @@ $(SUBDIRS_CLEAN): $(SUBDIRS_DIST_CLEAN): @$(SUBMAKE) -C $(@:-dist-clean=) dist-clean -clean: $(SUBDIRS_CLEAN) +clean: $(SUBDIRS_CLEAN) _clean + +_clean: rm -f defaults.h rm -f include/asterisk/build.h rm -f main/version.c @@ -450,7 +452,7 @@ clean: $(SUBDIRS_CLEAN) dist-clean: distclean -distclean: $(SUBDIRS_DIST_CLEAN) clean +distclean: $(SUBDIRS_DIST_CLEAN) _clean @$(MAKE) -C menuselect dist-clean @$(MAKE) -C sounds dist-clean rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps @@ -933,7 +935,7 @@ pdf: asterisk.pdf asterisk.pdf: $(MAKE) -C doc/tex asterisk.pdf -.PHONY: menuselect menuselect.makeopts main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) badshell installdirs validate-docs +.PHONY: menuselect menuselect.makeopts main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) badshell installdirs validate-docs _clean FORCE: diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules index 18670f9a58..2836dd9086 100644 --- a/Makefile.moddir_rules +++ b/Makefile.moddir_rules @@ -124,6 +124,7 @@ uninstall:: dist-clean:: rm -f .*.moduleinfo .moduleinfo rm -f .*.makeopts .makeopts + rm -f .*.d .%.moduleinfo: %.c @echo "<member name=\"$*\" displayname=\"$(shell $(GREP) -e AST_MODULE_INFO $< | head -n 1 | cut -d '"' -f 2)\" remove_on_change=\"$(SUBDIR)/$*.o $(SUBDIR)/$*.so\">" > $@ diff --git a/Makefile.rules b/Makefile.rules index 73602506e3..3b876e6dcb 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -95,4 +95,4 @@ endif $(ECHO_PREFIX) echo " [LD] $^ -> $@" $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $^ $(PTHREAD_LIBS) $(LIBS) -dist-clean:: +dist-clean:: clean -- GitLab