[asterisk-commits] kpfleming: branch 1.6.1 r209058 - in /branches/1.6.1: ./ Makefile

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Mon Jul 27 10:40:10 2009
New Revision: 209058

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=209058
Log:
Merged revisions 209056 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r209056 | kpfleming | 2009-07-27 10:38:59 -0500 (Mon, 27 Jul 2009) | 10 lines
  
  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:
    branches/1.6.1/   (props changed)
    branches/1.6.1/Makefile

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/Makefile
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/Makefile?view=diff&rev=209058&r1=209057&r2=209058
==============================================================================
--- branches/1.6.1/Makefile (original)
+++ branches/1.6.1/Makefile Mon Jul 27 10:40:10 2009
@@ -239,7 +239,6 @@
 
 ifneq ($(findstring BSD,$(OSARCH)),)
   _ASTCFLAGS+=-I/usr/local/include
-  _ASTLDFLAGS+=-L/usr/local/lib
 endif
 
 ifeq ($(findstring -march,$(_ASTCFLAGS) $(ASTCFLAGS)),)
@@ -301,7 +300,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
 
@@ -396,10 +395,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