[asterisk-commits] seanbright: branch 1.6.1 r220220 - in /branches/1.6.1: ./ Makefile

[SVN commits to the Asterisk project]

Author: seanbright
Date: Thu Sep 24 13:22:09 2009
New Revision: 220220

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=220220
Log:
Merged revisions 220217 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r220217 | seanbright | 2009-09-24 14:19:41 -0400 (Thu, 24 Sep 2009) | 9 lines
  
  Merged revisions 220213 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r220213 | seanbright | 2009-09-24 14:18:18 -0400 (Thu, 24 Sep 2009) | 1 line
    
    Resolve parallel build warnings.
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/Makefile

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

Modified: branches/1.6.1/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/Makefile?view=diff&rev=220220&r1=220219&r2=220220
==============================================================================
--- branches/1.6.1/Makefile (original)
+++ branches/1.6.1/Makefile Thu Sep 24 13:22:09 2009
@@ -402,10 +402,10 @@
 endif
 
 $(MOD_SUBDIRS):
-	@_ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS)" _ASTLDFLAGS="$(_ASTLDFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
+	+ at _ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS)" _ASTLDFLAGS="$(_ASTLDFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
 
 $(OTHER_SUBDIRS):
-	@_ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS)" _ASTLDFLAGS="$(_ASTLDFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
+	+ at _ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS)" _ASTLDFLAGS="$(_ASTLDFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
 
 defaults.h: makeopts
 	@build_tools/make_defaults_h > $@.tmp