[asterisk-commits] kpfleming: trunk r209056 - /trunk/Makefile

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Mon Jul 27 10:38:59 2009
New Revision: 209056

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=209056
Log:
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.


Modified:
    trunk/Makefile

Modified: trunk/Makefile
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/Makefile?view=diff&rev=209056&r1=209055&r2=209056
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Mon Jul 27 10:38:59 2009
@@ -242,7 +242,6 @@
 
 ifneq ($(findstring BSD,$(OSARCH)),)
   _ASTCFLAGS+=-I/usr/local/include
-  _ASTLDFLAGS+=-L/usr/local/lib
 endif
 
 ifeq ($(findstring -march,$(_ASTCFLAGS) $(ASTCFLAGS)),)
@@ -304,7 +303,7 @@
 # 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 @@
 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