diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-11 16:15:18 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-11 16:15:18 +0000 |
commit | fe6d336438a713eef2842c1ebbe5b368f10c7f8e (patch) | |
tree | 9732fec3038f4133b14f1131464cf68dc2fde16e | |
parent | fcbf4c374f63e51a1ec81b052fd662d69cb2b346 (diff) |
Merged revisions 137239 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r137239 | russell | 2008-08-11 11:14:29 -0500 (Mon, 11 Aug 2008) | 2 lines
Make PRINT_DIR work as advertised.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@137240 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | Makefile | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -312,7 +312,7 @@ endif SILENTMAKE:=$(MAKE) --quiet --no-print-directory ifneq ($(PRINT_DIR)$(NOISY_BUILD),) -SUBMAKE:=$(MAKE) --quiet +SUBMAKE:=$(MAKE) else SUBMAKE:=$(MAKE) --quiet --no-print-directory endif @@ -369,9 +369,9 @@ $(MOD_SUBDIRS_MENUSELECT_TREE): makeopts.embed_rules: menuselect.makeopts @echo "Generating embedded module rules ..." @rm -f $@ - @$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LDSCRIPT) - @$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LDFLAGS) - @$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LIBS) + @$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDSCRIPT) + @$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDFLAGS) + @$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LIBS) $(SUBDIRS): main/version.c include/asterisk/version.h include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules @@ -394,10 +394,10 @@ res: main endif $(MOD_SUBDIRS): - @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) $(PRINT_DIR) --no-builtin-rules -C $@ SUBDIR=$@ all + @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all $(OTHER_SUBDIRS): - @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) $(PRINT_DIR) --no-builtin-rules -C $@ SUBDIR=$@ all + @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all defaults.h: makeopts @build_tools/make_defaults_h > $@.tmp @@ -425,10 +425,10 @@ include/asterisk/build.h: @rm -f $@.tmp $(SUBDIRS_CLEAN): - @$(MAKE) $(PRINT_DIR) -C $(@:-clean=) clean + @$(SUBMAKE) -C $(@:-clean=) clean $(SUBDIRS_DIST_CLEAN): - @$(MAKE) $(PRINT_DIR) -C $(@:-dist-clean=) dist-clean + @$(SUBMAKE) -C $(@:-dist-clean=) dist-clean clean: $(SUBDIRS_CLEAN) rm -f defaults.h @@ -539,7 +539,7 @@ bininstall: _all installdirs $(SUBDIRS_INSTALL) fi $(SUBDIRS_INSTALL): - @DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(MAKE) --quiet $(PRINT_DIR) -C $(@:-install=) install + @DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install NEWMODS:=$(foreach d,$(MOD_SUBDIRS),$(notdir $(wildcard $(d)/*.so))) OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so))) @@ -803,7 +803,7 @@ cleantest: @cmp -s .cleancount .lastclean || $(MAKE) clean $(SUBDIRS_UNINSTALL): - @$(MAKE) $(PRINT_DIR) -C $(@:-uninstall=) uninstall + @$(SUBMAKE) -C $(@:-uninstall=) uninstall _uninstall: $(SUBDIRS_UNINSTALL) rm -f $(DESTDIR)$(MODULES_DIR)/* |