diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-27 15:40:28 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-27 15:40:28 +0000 |
| commit | ddd9ed005af775d15eb8ce4f6b9a17c8e41b3916 (patch) | |
| tree | 20789a7cf4356c4c92e4bfe489cced265f6b9a0d /Makefile | |
| parent | 0638b1db571173f6c61f7125c2d7d364ccdb03b4 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@209059 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -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 @@ -403,10 +402,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 |