From 5b5a2df463323f3a0be6556f9d45431a09af2ed2 Mon Sep 17 00:00:00 2001 From: Jason Parker Date: Mon, 1 Oct 2007 21:54:41 +0000 Subject: Merged revisions 84291 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r84291 | qwell | 2007-10-01 16:52:45 -0500 (Mon, 01 Oct 2007) | 6 lines 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: https://origsvn.digium.com/svn/asterisk/trunk@84300 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'channels/Makefile') diff --git a/channels/Makefile b/channels/Makefile index ca3505aa5..c2c8ddadf 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) -- cgit v1.2.3