From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 2 Jun 2010 22:46:58 +0000 (+0000)
Subject: Merged revisions 267352 via svnmerge from
X-Git-Tag: 1.6.2.10-rc1~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f9bf18d05067a9242205338df2ef3c3e996ca71;p=thirdparty%2Fasterisk.git

Merged revisions 267352 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r267352 | russell | 2010-06-02 17:46:37 -0500 (Wed, 02 Jun 2010) | 7 lines

  try to fix some random chan_h323 compilation failures

  After some debugging, the random chan_h323 build failures appear to be due
  to complications introduced by some chan_h323 specific build stuff getting
  triggered during a clean.  Simplify this by moving the h323 clean commands
  down into channels/makefile.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@267353 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/Makefile b/channels/Makefile
index b7d1d39d91..e4ee2ec3bd 100644
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -63,7 +63,7 @@ endif
 
 clean::
 	$(MAKE) -C misdn clean
-	if [ -f h323/Makefile ]; then $(MAKE) -C h323 clean; fi
+	rm -f h323/libchanh323.a h323/Makefile.ast h323/*.o h323/*.dep
 
 dist-clean::
 	rm -f h323/Makefile
diff --git a/channels/h323/Makefile.in b/channels/h323/Makefile.in
index 5f949ca7db..2d5f3a5477 100644
--- a/channels/h323/Makefile.in
+++ b/channels/h323/Makefile.in
@@ -47,4 +47,3 @@ Makefile.ast:
 	@if [ -r $@ ] && cmp -s $@ $@.tmp; then rm -f $@.tmp; else mv -f $@.tmp $@; fi
 
 clean::
-	rm -f $(TARGET) $(OBJS) Makefile.ast *.dep