[svn-commits] russell: trunk r267352 - in /trunk/channels: Makefile h323/Makefile.in

[SVN commits to the Digium repositories]

Author: russell
Date: Wed Jun  2 17:46:37 2010
New Revision: 267352

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=267352
Log:
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.

Modified:
    trunk/channels/Makefile
    trunk/channels/h323/Makefile.in

Modified: trunk/channels/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/Makefile?view=diff&rev=267352&r1=267351&r2=267352
==============================================================================
--- trunk/channels/Makefile (original)
+++ trunk/channels/Makefile Wed Jun  2 17:46:37 2010
@@ -63,8 +63,8 @@
 
 clean::
 	$(MAKE) -C misdn clean
-	if [ -f h323/Makefile ]; then $(MAKE) -C h323 clean; fi
 	rm -f sip/*.o sip/*.i
+	rm -f h323/libchanh323.a h323/Makefile.ast h323/*.o h323/*.dep
 
 dist-clean::
 	rm -f h323/Makefile

Modified: trunk/channels/h323/Makefile.in
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/h323/Makefile.in?view=diff&rev=267352&r1=267351&r2=267352
==============================================================================
--- trunk/channels/h323/Makefile.in (original)
+++ trunk/channels/h323/Makefile.in Wed Jun  2 17:46:37 2010
@@ -47,4 +47,3 @@
 	@if [ -r $@ ] && cmp -s $@ $@.tmp; then rm -f $@.tmp; else mv -f $@.tmp $@; fi
 
 clean::
-	rm -f $(TARGET) $(OBJS) Makefile.ast *.dep