diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-10-01 21:54:41 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-10-01 21:54:41 +0000 |
| commit | d8dcdb07402bc898a5ab47d09b86eeb7f660fb41 (patch) | |
| tree | ea84dbeb15d0a223bd2defbf5c0ceb734b04e6c2 /channels/Makefile | |
| parent | ca893376226bccf0bc65ad0234b6271b7c4f1242 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@84300 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/Makefile')
| -rw-r--r-- | channels/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
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) |