- convert the 'uninstall' target to use separate targets to process each
subdirectory instead of a for loop - remove the FORCE target from the main Makefile and add the couple places I used it to the .PHONY target. .PHONY does the same thing and is a built-in more efficient way of doing it. - add a bunch more targets to .PHONY ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35503 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
parent
778d0f0c0a
commit
48ae9f0d4f
17
Makefile
17
Makefile
|
|
@ -13,8 +13,6 @@
|
|||
|
||||
.EXPORT_ALL_VARIABLES:
|
||||
|
||||
.PHONY: sounds clean clean-depend dist-clean all depend
|
||||
|
||||
# Create OPTIONS variable
|
||||
OPTIONS=
|
||||
|
||||
|
|
@ -273,6 +271,7 @@ SUBDIRS_CLEAN_DEPEND:=$(SUBDIRS:%=%-clean-depend)
|
|||
MOD_SUBDIRS_DEPEND:=$(MOD_SUBDIRS:%=%-depend)
|
||||
OTHER_SUBDIRS_DEPEND:=$(OTHER_SUBDIRS:%=%-depend)
|
||||
SUBDIRS_DEPEND:=$(MOD_SUBDIRS_DEPEND) $(OTHER_SUBDIRS_DEPEND)
|
||||
SUBDIRS_UNINSTALL:=$(SUBDIRS:%=%-uninstall)
|
||||
|
||||
OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
|
||||
translate.o file.o pbx.o cli.o md5.o term.o \
|
||||
|
|
@ -371,10 +370,10 @@ _all: all
|
|||
|
||||
all: cleantest config.status menuselect.makeopts depend asterisk $(SUBDIRS)
|
||||
|
||||
$(MOD_SUBDIRS): FORCE
|
||||
$(MOD_SUBDIRS):
|
||||
@CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $@
|
||||
|
||||
$(OTHER_SUBDIRS): FORCE
|
||||
$(OTHER_SUBDIRS):
|
||||
@CFLAGS="$(OTHER_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $@
|
||||
|
||||
config.status: configure
|
||||
|
|
@ -816,8 +815,6 @@ TAGS: .tags-depend .tags-sources
|
|||
|
||||
etags: TAGS
|
||||
|
||||
FORCE:
|
||||
|
||||
%_env:
|
||||
$(MAKE) -C $(shell echo $@ | sed "s/_env//g") env
|
||||
|
||||
|
|
@ -837,7 +834,10 @@ cleantest:
|
|||
$(MAKE) defaults.h;\
|
||||
fi
|
||||
|
||||
_uninstall:
|
||||
$(SUBDIRS_UNINSTALL):
|
||||
@$(MAKE) -C $(@:-uninstall=) uninstall
|
||||
|
||||
_uninstall: $(SUBDIRS_UNINSTALL)
|
||||
rm -f $(DESTDIR)$(MODULES_DIR)/*
|
||||
rm -f $(DESTDIR)$(ASTSBINDIR)/*asterisk*
|
||||
rm -f $(DESTDIR)$(ASTSBINDIR)/astgenkey
|
||||
|
|
@ -845,7 +845,6 @@ _uninstall:
|
|||
rm -rf $(DESTDIR)$(ASTHEADERDIR)
|
||||
rm -rf $(DESTDIR)$(ASTDATADIR)/firmware
|
||||
rm -rf $(DESTDIR)$(ASTMANDIR)/man8
|
||||
for x in $(SUBDIRS); do $(MAKE) -C $$x uninstall || exit 1 ; done
|
||||
$(MAKE) -C sounds uninstall
|
||||
|
||||
uninstall: _uninstall
|
||||
|
|
@ -883,3 +882,5 @@ mxml/libmxml.a:
|
|||
makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(dir)/*.c) build_tools/cflags.xml sounds/sounds.xml
|
||||
@echo "Generating list of available modules ..."
|
||||
@build_tools/prep_moduledeps > $@
|
||||
|
||||
.PHONY: sounds clean clean-depend dist-clean all _all depend cleantest uninstall _uninstall uninstall-all dont-optimize valgrind $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_CLEAN_DEPEND) $(SUBDIRS_DEPEND) $(SUBDIRS_UNINSTALL)
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
# the GNU General Public License
|
||||
#
|
||||
|
||||
.PHONY: clean clean-depend all depend
|
||||
.PHONY: clean clean-depend all depend uninstall
|
||||
|
||||
AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
# the GNU General Public License
|
||||
#
|
||||
|
||||
.PHONY: clean clean-depend all depend
|
||||
.PHONY: clean clean-depend all depend uninstall
|
||||
|
||||
ifneq ($(wildcard ../menuselect.makeopts),)
|
||||
include ../menuselect.makeopts
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
# the GNU General Public License
|
||||
#
|
||||
|
||||
.PHONY: clean clean-depend all depend
|
||||
.PHONY: clean clean-depend all depend uninstall
|
||||
|
||||
ifneq ($(wildcard ../menuselect.makeopts),)
|
||||
include ../menuselect.makeopts
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
# the GNU General Public License
|
||||
#
|
||||
|
||||
.PHONY: clean clean-depend all depend
|
||||
.PHONY: clean clean-depend all depend uninstall
|
||||
|
||||
ifneq ($(wildcard ../menuselect.makeopts),)
|
||||
include ../menuselect.makeopts
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
# the GNU General Public License
|
||||
#
|
||||
|
||||
.PHONY: clean clean-depend all depend
|
||||
.PHONY: clean clean-depend all depend uninstall
|
||||
|
||||
ifneq ($(wildcard ../menuselect.makeopts),)
|
||||
include ../menuselect.makeopts
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
# the GNU General Public License
|
||||
#
|
||||
|
||||
.PHONY: clean clean-depend all depend
|
||||
.PHONY: clean clean-depend all depend uninstall
|
||||
|
||||
ifneq ($(wildcard ../menuselect.makeopts),)
|
||||
include ../menuselect.makeopts
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
# the GNU General Public License
|
||||
#
|
||||
|
||||
.PHONY: clean clean-depend all depend
|
||||
.PHONY: clean clean-depend all depend uninstall
|
||||
|
||||
ifneq ($(wildcard ../menuselect.makeopts),)
|
||||
include ../menuselect.makeopts
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
# the GNU General Public License
|
||||
#
|
||||
|
||||
.PHONY: clean clean-depend all depend
|
||||
.PHONY: clean clean-depend all depend uninstall
|
||||
|
||||
ifneq ($(wildcard ../menuselect.makeopts),)
|
||||
include ../menuselect.makeopts
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
# the GNU General Public License
|
||||
#
|
||||
|
||||
.PHONY: clean clean-depend all depend
|
||||
.PHONY: clean clean-depend all depend uninstall
|
||||
|
||||
ifneq ($(wildcard ../menuselect.makeopts),)
|
||||
include ../menuselect.makeopts
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
# the GNU General Public License
|
||||
#
|
||||
|
||||
.PHONY: clean clean-depend all depend
|
||||
.PHONY: clean clean-depend all depend uninstall
|
||||
|
||||
UTILS:=astman smsq stereorize streamplayer aelparse
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue