]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 220217 via svnmerge from
authorSean Bright <sean@malleable.com>
Thu, 24 Sep 2009 18:22:09 +0000 (18:22 +0000)
committerSean Bright <sean@malleable.com>
Thu, 24 Sep 2009 18:22:09 +0000 (18:22 +0000)
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.

    Reported by Klaus Darilion on the asterisk-dev mailing list.
  ........
................

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

Makefile

index d201a27eff0c304a18c51b880d44fa797f524e7f..6967f29538356257b8fbed48fe903f9fbffa8feb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -402,10 +402,10 @@ res:      main
 endif
 
 $(MOD_SUBDIRS):
-       @_ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS)" _ASTLDFLAGS="$(_ASTLDFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
+       +@_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
+       +@_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