diff options
author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-10-01 21:52:45 +0000 |
---|---|---|
committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-10-01 21:52:45 +0000 |
commit | 5117af8b6ce998e74bdcfcaf54b3ebfbc5739ee0 (patch) | |
tree | 375c8b01df9b8c7011f513c2a9aed00ef744bcba | |
parent | 6c41fcab5e61440e473a08ab15244982cb54e02c (diff) |
Add dist-clean support for subdirs.
Change h323 to only remove the Makefile on a dist-clean, rather than a clean.
This fixes a bug I found with trying to run make after a make clean
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@84291 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | Makefile | 8 | ||||
-rw-r--r-- | Makefile.rules | 4 | ||||
-rw-r--r-- | channels/Makefile | 4 |
3 files changed, 13 insertions, 3 deletions
@@ -254,6 +254,7 @@ OTHER_SUBDIRS:=utils agi SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS) SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install) SUBDIRS_CLEAN:=$(SUBDIRS:%=%-clean) +SUBDIRS_DIST_CLEAN:=$(SUBDIRS:%=%-dist-clean) SUBDIRS_UNINSTALL:=$(SUBDIRS:%=%-uninstall) MOD_SUBDIRS_EMBED_LDSCRIPT:=$(MOD_SUBDIRS:%=%-embed-ldscript) MOD_SUBDIRS_EMBED_LDFLAGS:=$(MOD_SUBDIRS:%=%-embed-ldflags) @@ -360,6 +361,9 @@ include/asterisk/buildopts.h: menuselect.makeopts $(SUBDIRS_CLEAN): @$(MAKE) --no-print-directory -C $(@:-clean=) clean +$(SUBDIRS_DIST_CLEAN): + @$(MAKE) --no-print-directory -C $(@:-dist-clean=) dist-clean + clean: $(SUBDIRS_CLEAN) rm -f defaults.h rm -f include/asterisk/build.h @@ -369,7 +373,7 @@ clean: $(SUBDIRS_CLEAN) dist-clean: distclean -distclean: 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 @@ -712,4 +716,4 @@ menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(di @echo "Generating input for menuselect ..." @build_tools/prep_moduledeps > $@ -.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) menuselect.makeopts +.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) menuselect.makeopts diff --git a/Makefile.rules b/Makefile.rules index 9d20c5a91..735ecf68b 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -17,6 +17,8 @@ -include $(ASTTOPDIR)/makeopts +.PHONY: dist-clean + ifeq ($(NOISY_BUILD),) ECHO_PREFIX=@ CMD_PREFIX=@ @@ -79,3 +81,5 @@ endif %: %.o $(ECHO_PREFIX) echo " [LD] $^ -> $@" $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $^ $(PTHREAD_LIBS) $(LIBS) + +dist-clean:: diff --git a/channels/Makefile b/channels/Makefile index 8bb737ae9..94b324b96 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -68,7 +68,6 @@ ifneq ($(wildcard h323/Makefile.ast),) H323LDFLAGS+=-Wl,--version-script=h323/noexport.map clean:: $(MAKE) -C h323 clean - rm -f h323/Makefile else h323/libchanh323.a h323/Makefile.ast: $(CMD_PREFIX) $(MAKE) -C h323 @@ -81,6 +80,9 @@ h323/libchanh323.a h323/Makefile.ast: $(CMD_PREFIX) exit 1 endif +dist-clean:: + rm -f h323/Makefile + gentone: gentone.c $(ECHO_PREFIX) echo " [LD] $^ -> $@" $(CMD_PREFIX) $(HOST_CC) $(STATIC_BUILD) -o $@ $(HOST_CFLAGS) $(HOST_LDFLAGS) $^ $(LIBS) |