diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-03 03:28:12 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-03 03:28:12 +0000 |
commit | 43352cadc9691faf6c1cafb4a96c9d207974e531 (patch) | |
tree | 50576732e1e57fa2409ef5a07c4cac16d185865f /Makefile | |
parent | 00c143471966247d8b1907cf1d68e46cc44ed4e2 (diff) |
Merged revisions 49282 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49282 | kpfleming | 2007-01-02 21:21:25 -0600 (Tue, 02 Jan 2007) | 2 lines
various Makefile improvements to get chan_vpb (and any other C++ modules) to build properly
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@49283 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -312,10 +312,10 @@ $(SUBDIRS): include/asterisk/version.h include/asterisk/build.h include/asterisk main: $(filter-out main,$(MOD_SUBDIRS)) $(MOD_SUBDIRS): - @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AST_LIBS="$(AST_LIBS)" $(MAKE) --no-print-directory -C $@ SUBDIR=$@ all + @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AST_LIBS="$(AST_LIBS)" $(MAKE) --no-print-directory --no-builtin-rules -C $@ SUBDIR=$@ all $(OTHER_SUBDIRS): - @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AUDIO_LIBS="$(AUDIO_LIBS)" $(MAKE) --no-print-directory -C $@ SUBDIR=$@ all + @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AUDIO_LIBS="$(AUDIO_LIBS)" $(MAKE) --no-print-directory --no-builtin-rules -C $@ SUBDIR=$@ all defaults.h: makeopts @build_tools/make_defaults_h > $@.tmp |