Skip to content
Snippets Groups Projects
Commit be29512d authored by Kevin P. Fleming's avatar Kevin P. Fleming
Browse files

more makefile tweaks to keep targets from being run when they don't need to be

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@42505 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent f4434eba
Branches
Tags
No related merge requests found
...@@ -22,7 +22,12 @@ ...@@ -22,7 +22,12 @@
.EXPORT_ALL_VARIABLES: .EXPORT_ALL_VARIABLES:
include makeopts # even though we could use '-include makeopts' here, use a wildcard
# lookup anyway, so that make won't try to build makeopts if it doesn't
# exist (other rules will force it to be built if needed)
ifneq ($(wildcard makeopts),)
include makeopts
endif
#Uncomment this to see all build commands instead of 'quiet' output #Uncomment this to see all build commands instead of 'quiet' output
#NOISY_BUILD=yes #NOISY_BUILD=yes
...@@ -235,9 +240,8 @@ endif ...@@ -235,9 +240,8 @@ endif
all: cleantest $(SUBDIRS) all: cleantest $(SUBDIRS)
@echo " +--------- Asterisk Build Complete ---------+" @echo " +--------- Asterisk Build Complete ---------+"
@echo " + Asterisk has successfully been built, but +" @echo " + Asterisk has successfully been built, and +"
@echo " + cannot be run before being installed by +" @echo " + can be installed by running: +"
@echo " + running: +"
@echo " + +" @echo " + +"
@echo " + make install +" @echo " + make install +"
@echo " +-------------------------------------------+" @echo " +-------------------------------------------+"
...@@ -316,6 +320,7 @@ clean: $(SUBDIRS_CLEAN) clean-depend ...@@ -316,6 +320,7 @@ clean: $(SUBDIRS_CLEAN) clean-depend
rm -f include/asterisk/version.h rm -f include/asterisk/version.h
rm -f .depend rm -f .depend
@$(MAKE) -C menuselect clean @$(MAKE) -C menuselect clean
cp -f .cleancount .lastclean
dist-clean: distclean dist-clean: distclean
...@@ -604,8 +609,7 @@ sounds: ...@@ -604,8 +609,7 @@ sounds:
cleantest: cleantest:
@if ! cmp -s .cleancount .lastclean ; then \ @if ! cmp -s .cleancount .lastclean ; then \
$(MAKE) clean; cp -f .cleancount .lastclean;\ $(MAKE) clean;\
$(MAKE) defaults.h;\
fi fi
$(SUBDIRS_UNINSTALL): $(SUBDIRS_UNINSTALL):
......
...@@ -95,7 +95,9 @@ install:: all ...@@ -95,7 +95,9 @@ install:: all
uninstall:: uninstall::
-include .depend ifneq ($(wildcard .depend),)
include .depend
endif
depend: .depend depend: .depend
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
# Prefixing one or the other with @\# or @ or nothing makes the desired # Prefixing one or the other with @\# or @ or nothing makes the desired
# behaviour. ECHO_PREFIX prefixes the comment, CMD_PREFIX prefixes the command. # behaviour. ECHO_PREFIX prefixes the comment, CMD_PREFIX prefixes the command.
include $(ASTTOPDIR)/makeopts -include $(ASTTOPDIR)/makeopts
ifeq ($(NOISY_BUILD),) ifeq ($(NOISY_BUILD),)
ECHO_PREFIX=@ ECHO_PREFIX=@
......
...@@ -40,7 +40,9 @@ clean-depend: ...@@ -40,7 +40,9 @@ clean-depend:
clean: clean-depend clean: clean-depend
rm -f *.so *.o look eagi-test eagi-sphinx-test rm -f *.so *.o look eagi-test eagi-sphinx-test
-include .depend ifneq ($(wildcard .depend),)
include .depend
endif
depend: .depend depend: .depend
......
...@@ -100,7 +100,9 @@ streamplayer: streamplayer.o ...@@ -100,7 +100,9 @@ streamplayer: streamplayer.o
muted: muted.o muted: muted.o
muted: LIBS+=$(AUDIO_LIBS) muted: LIBS+=$(AUDIO_LIBS)
-include .depend ifneq ($(wildcard .depend),)
include .depend
endif
depend: .depend depend: .depend
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment