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

Merged revisions 157164 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r157164 | kpfleming | 2008-11-15 20:45:19 +0100 (Sat, 15 Nov 2008) | 13 lines
  
  Merged revisions 157162-157163 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r157162 | kpfleming | 2008-11-15 20:24:24 +0100 (Sat, 15 Nov 2008) | 1 line
    
    dist-clean should remove dependency information files as well
  ........
    r157163 | kpfleming | 2008-11-15 20:31:03 +0100 (Sat, 15 Nov 2008) | 1 line
    
    when an individual directory dist-clean is run, run clean in that directory first, and when running top-level dist-clean, do not run subdirectory clean operations twice
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@157166 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2008-11-15 19:49:56 +00:00
parent 7e71c8f94f
commit f80dad0c3f
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -433,7 +433,9 @@ $(SUBDIRS_CLEAN):
$(SUBDIRS_DIST_CLEAN): $(SUBDIRS_DIST_CLEAN):
@$(SUBMAKE) -C $(@:-dist-clean=) dist-clean @$(SUBMAKE) -C $(@:-dist-clean=) dist-clean
clean: $(SUBDIRS_CLEAN) clean: $(SUBDIRS_CLEAN) _clean
_clean:
rm -f defaults.h rm -f defaults.h
rm -f include/asterisk/build.h rm -f include/asterisk/build.h
rm -f main/version.c rm -f main/version.c
@@ -443,7 +445,7 @@ clean: $(SUBDIRS_CLEAN)
dist-clean: distclean dist-clean: distclean
distclean: $(SUBDIRS_DIST_CLEAN) clean distclean: $(SUBDIRS_DIST_CLEAN) _clean
@$(MAKE) -C menuselect dist-clean @$(MAKE) -C menuselect dist-clean
@$(MAKE) -C sounds dist-clean @$(MAKE) -C sounds dist-clean
rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
@@ -895,7 +897,7 @@ pdf: asterisk.pdf
asterisk.pdf: asterisk.pdf:
$(MAKE) -C doc/tex asterisk.pdf $(MAKE) -C doc/tex asterisk.pdf
.PHONY: menuselect menuselect.makeopts main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) badshell installdirs .PHONY: menuselect menuselect.makeopts main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) badshell installdirs _clean
FORCE: FORCE:

1
Makefile.moddir_rules
View File

@@ -124,6 +124,7 @@ uninstall::
dist-clean:: dist-clean::
rm -f .*.moduleinfo .moduleinfo rm -f .*.moduleinfo .moduleinfo
rm -f .*.makeopts .makeopts rm -f .*.makeopts .makeopts
rm -f .*.d
.%.moduleinfo: %.c .%.moduleinfo: %.c
@echo "<member name=\"$*\" displayname=\"$(shell $(GREP) -e AST_MODULE_INFO $< | head -n 1 | cut -d '"' -f 2)\" remove_on_change=\"$(SUBDIR)/$*.o $(SUBDIR)/$*.so\">" > $@ @echo "<member name=\"$*\" displayname=\"$(shell $(GREP) -e AST_MODULE_INFO $< | head -n 1 | cut -d '"' -f 2)\" remove_on_change=\"$(SUBDIR)/$*.o $(SUBDIR)/$*.so\">" > $@

2
Makefile.rules
View File

@@ -95,4 +95,4 @@ endif
$(ECHO_PREFIX) echo " [LD] $^ -> $@" $(ECHO_PREFIX) echo " [LD] $^ -> $@"
$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $^ $(PTHREAD_LIBS) $(LIBS) $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $^ $(PTHREAD_LIBS) $(LIBS)
dist-clean:: dist-clean:: clean