From 3e3bde269b5492e7de5099514d3c2c46a1445aeb Mon Sep 17 00:00:00 2001 From: seanbright Date: Thu, 24 Sep 2009 18:22:11 +0000 Subject: 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.2@220221 f38db490-d61c-443f-a65b-d21fe96a405b --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 81d1bf476..caf039137 100644 --- a/Makefile +++ b/Makefile @@ -409,10 +409,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 -- cgit v1.2.3