kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-04 05:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 137239 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@137240 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-08-11 16:15:18 +00:00
parent 3a483084a1
commit ed7e56bcf9
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile
View File

@@ -312,7 +312,7 @@ endif
SILENTMAKE:=$(MAKE) --quiet --no-print-directory SILENTMAKE:=$(MAKE) --quiet --no-print-directory
ifneq ($(PRINT_DIR)$(NOISY_BUILD),) ifneq ($(PRINT_DIR)$(NOISY_BUILD),)
SUBMAKE:=$(MAKE) --quiet SUBMAKE:=$(MAKE)
else else
SUBMAKE:=$(MAKE) --quiet --no-print-directory SUBMAKE:=$(MAKE) --quiet --no-print-directory
endif endif
@@ -369,9 +369,9 @@ $(MOD_SUBDIRS_MENUSELECT_TREE):
makeopts.embed_rules: menuselect.makeopts makeopts.embed_rules: menuselect.makeopts
@echo "Generating embedded module rules ..." @echo "Generating embedded module rules ..."
@rm -f $@ @rm -f $@
@$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LDSCRIPT) @$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDSCRIPT)
@$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LDFLAGS) @$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDFLAGS)
@$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LIBS) @$(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 $(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 endif
$(MOD_SUBDIRS): $(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): $(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 defaults.h: makeopts
@build_tools/make_defaults_h > $@.tmp @build_tools/make_defaults_h > $@.tmp
@@ -425,10 +425,10 @@ include/asterisk/build.h:
@rm -f $@.tmp @rm -f $@.tmp
$(SUBDIRS_CLEAN): $(SUBDIRS_CLEAN):
@$(MAKE) $(PRINT_DIR) -C $(@:-clean=) clean @$(SUBMAKE) -C $(@:-clean=) clean
$(SUBDIRS_DIST_CLEAN): $(SUBDIRS_DIST_CLEAN):
@$(MAKE) $(PRINT_DIR) -C $(@:-dist-clean=) dist-clean @$(SUBMAKE) -C $(@:-dist-clean=) dist-clean
clean: $(SUBDIRS_CLEAN) clean: $(SUBDIRS_CLEAN)
rm -f defaults.h rm -f defaults.h
@@ -539,7 +539,7 @@ bininstall: _all installdirs $(SUBDIRS_INSTALL)
fi fi
$(SUBDIRS_INSTALL): $(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))) NEWMODS:=$(foreach d,$(MOD_SUBDIRS),$(notdir $(wildcard $(d)/*.so)))
OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so))) OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
@@ -803,7 +803,7 @@ cleantest:
@cmp -s .cleancount .lastclean || $(MAKE) clean @cmp -s .cleancount .lastclean || $(MAKE) clean
$(SUBDIRS_UNINSTALL): $(SUBDIRS_UNINSTALL):
@$(MAKE) $(PRINT_DIR) -C $(@:-uninstall=) uninstall @$(SUBMAKE) -C $(@:-uninstall=) uninstall
_uninstall: $(SUBDIRS_UNINSTALL) _uninstall: $(SUBDIRS_UNINSTALL)
rm -f $(DESTDIR)$(MODULES_DIR)/* rm -f $(DESTDIR)$(MODULES_DIR)/*