From f57f4201024c35ff304c7dc322290bad6933bac2 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Mon, 27 Jul 2009 15:38:59 +0000 Subject: [PATCH] Restore explicit export of ASTCFLAGS/ASTLDFLAGS and underscore-variants to sub-makes. During the recent Makefile improvements I made, it seemed the 'make' was automatically carrying down the ASTCFLAGS/ASTLDFLAGS settings to sub-makes, so I removed the explict export of them. However, there are some circumstances where make does this, and some where it does not, so I've brought them back to ensure they are always exported. I also removed an extraneous double setting of _ASTLDFLAGS on *BSD platforms. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@209056 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 401be98b46..b86c214d76 100644 --- a/Makefile +++ b/Makefile @@ -242,7 +242,6 @@ endif ifneq ($(findstring BSD,$(OSARCH)),) _ASTCFLAGS+=-I/usr/local/include - _ASTLDFLAGS+=-L/usr/local/lib endif ifeq ($(findstring -march,$(_ASTCFLAGS) $(ASTCFLAGS)),) @@ -304,7 +303,7 @@ else # These are used for all but Darwin SOLINK=-shared ifneq ($(findstring BSD,$(OSARCH)),) - LDFLAGS+=-L/usr/local/lib + _ASTLDFLAGS+=-L/usr/local/lib endif endif @@ -407,10 +406,10 @@ res: main endif $(MOD_SUBDIRS): - @_ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(_ASTCFLAGS)" $(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)" $(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