diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-15 19:47:36 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-15 19:47:36 +0000 |
| commit | 4546c1078b97f9b913e367a41c7193b973debb4a (patch) | |
| tree | 9d629f3dac589c4feb091067b716098ff38d580f | |
| parent | 060c0291597b7d80e5860c55403a6fdd81e16723 (diff) | |
Merged revisions 157164 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r157164 | kpfleming | 2008-11-15 20:45:19 +0100 (Sat, 15 Nov 2008) | 13 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@157165 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | Makefile.moddir_rules | 1 | ||||
| -rw-r--r-- | Makefile.rules | 2 |
3 files changed, 7 insertions, 4 deletions
@@ -425,7 +425,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 @@ -435,7 +437,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 @@ -887,6 +889,6 @@ pdf: asterisk.pdf asterisk.pdf: $(MAKE) -C doc/tex asterisk.pdf -.PHONY: menuselect 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 +.PHONY: menuselect 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 _clean FORCE: diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules index 18670f9a5..2836dd908 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 73602506e..3b876e6dc 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 |