diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-24 18:22:09 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-24 18:22:09 +0000 |
| commit | a02b71dd1281e55e76b4e3ac5c1d7899346fa27f (patch) | |
| tree | 3d54ebb5527495088d55d0aef4dc6f12f70a0ae9 /Makefile | |
| parent | dc5aba9f9e15e0a707c4374810de85fab61b5bd3 (diff) | |
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.
Reported by Klaus Darilion on the asterisk-dev mailing list.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@220220 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |