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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@209059 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.2
Kevin P. Fleming 16 years ago
parent 2d99be05a5
commit e87d23f7bd

@ -242,7 +242,6 @@ endif
ifneq ($(findstring BSD,$(OSARCH)),) ifneq ($(findstring BSD,$(OSARCH)),)
_ASTCFLAGS+=-I/usr/local/include _ASTCFLAGS+=-I/usr/local/include
_ASTLDFLAGS+=-L/usr/local/lib
endif endif
ifeq ($(findstring -march,$(_ASTCFLAGS) $(ASTCFLAGS)),) ifeq ($(findstring -march,$(_ASTCFLAGS) $(ASTCFLAGS)),)
@ -304,7 +303,7 @@ else
# These are used for all but Darwin # These are used for all but Darwin
SOLINK=-shared SOLINK=-shared
ifneq ($(findstring BSD,$(OSARCH)),) ifneq ($(findstring BSD,$(OSARCH)),)
LDFLAGS+=-L/usr/local/lib _ASTLDFLAGS+=-L/usr/local/lib
endif endif
endif endif
@ -403,10 +402,10 @@ res: main
endif endif
$(MOD_SUBDIRS): $(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): $(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 defaults.h: makeopts
@build_tools/make_defaults_h > $@.tmp @build_tools/make_defaults_h > $@.tmp

Loading…
Cancel
Save