kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 11:32:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 209056 via svnmerge from

Browse Source 
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.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@209057 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2009-07-27 15:39:44 +00:00
parent ab117ba86d
commit a1cb9549be
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@@ -239,7 +239,6 @@ endif
ifneq ($(findstring BSD,$(OSARCH)),)
_ASTCFLAGS+=-I/usr/local/include
_ASTLDFLAGS+=-L/usr/local/lib
endif
ifneq ($(PROC),ultrasparc)
@@ -299,7 +298,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
@@ -394,10 +393,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