[asterisk-commits] russell: branch 1.6.2 r267353 - in /branches/1.6.2: ./ channels/ channels/h323/

[SVN commits to the Asterisk project]

Author: russell
Date: Wed Jun  2 17:46:58 2010
New Revision: 267353

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

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/channels/Makefile
    branches/1.6.2/channels/h323/Makefile.in

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/channels/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/Makefile?view=diff&rev=267353&r1=267352&r2=267353
==============================================================================
--- branches/1.6.2/channels/Makefile (original)
+++ branches/1.6.2/channels/Makefile Wed Jun  2 17:46:58 2010
@@ -63,7 +63,7 @@
 
 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

Modified: branches/1.6.2/channels/h323/Makefile.in
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/h323/Makefile.in?view=diff&rev=267353&r1=267352&r2=267353
==============================================================================
--- branches/1.6.2/channels/h323/Makefile.in (original)
+++ branches/1.6.2/channels/h323/Makefile.in Wed Jun  2 17:46:58 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