more makefile tweaks to keep targets from being run when they don't need to be
authorKevin P. Fleming <kpfleming@digium.com>
Sat, 9 Sep 2006 03:27:21 +0000 (03:27 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Sat, 9 Sep 2006 03:27:21 +0000 (03:27 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@42505 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Makefile
Makefile.moddir_rules
Makefile.rules
agi/Makefile
utils/Makefile

index 08de69c..4ab5ad8 100644 (file)
--- a/Makefile
+++ b/Makefile
 
 .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
 #NOISY_BUILD=yes
@@ -235,9 +240,8 @@ endif
 
 all: cleantest $(SUBDIRS)
        @echo " +--------- Asterisk Build Complete ---------+"  
-       @echo " + Asterisk has successfully been built, but +"  
-       @echo " + cannot be run before being installed by   +"  
-       @echo " + running:                                  +"  
+       @echo " + Asterisk has successfully been built, and +"  
+       @echo " + can be installed by running:              +"
        @echo " +                                           +"
        @echo " +               make install                +"  
        @echo " +-------------------------------------------+"  
@@ -316,6 +320,7 @@ clean: $(SUBDIRS_CLEAN) clean-depend
        rm -f include/asterisk/version.h
        rm -f .depend
        @$(MAKE) -C menuselect clean
+       cp -f .cleancount .lastclean
 
 dist-clean: distclean
 
@@ -604,8 +609,7 @@ sounds:
 
 cleantest:
        @if ! cmp -s .cleancount .lastclean ; then \
-               $(MAKE) clean; cp -f .cleancount .lastclean;\
-               $(MAKE) defaults.h;\
+               $(MAKE) clean;\
        fi
 
 $(SUBDIRS_UNINSTALL):
index 82ee8e3..5f60470 100644 (file)
@@ -95,7 +95,9 @@ install:: all
 
 uninstall::
 
--include .depend
+ifneq ($(wildcard .depend),)
+  include .depend
+endif
 
 depend: .depend
 
index 02eed1f..b179ae6 100644 (file)
@@ -15,7 +15,7 @@
 # Prefixing one or the other with @\# or @ or nothing makes the desired
 # behaviour. ECHO_PREFIX prefixes the comment, CMD_PREFIX prefixes the command.
 
-include $(ASTTOPDIR)/makeopts
+-include $(ASTTOPDIR)/makeopts
 
 ifeq ($(NOISY_BUILD),)
    ECHO_PREFIX=@
index 743e0b9..c2e1c20 100644 (file)
@@ -40,7 +40,9 @@ clean-depend:
 clean: clean-depend
        rm -f *.so *.o look eagi-test eagi-sphinx-test
 
--include .depend
+ifneq ($(wildcard .depend),)
+  include .depend
+endif
 
 depend: .depend
 
index 86cbd3c..d59bfec 100644 (file)
@@ -100,7 +100,9 @@ streamplayer: streamplayer.o
 muted: muted.o
 muted: LIBS+=$(AUDIO_LIBS)
 
--include .depend
+ifneq ($(wildcard .depend),)
+  include .depend
+endif
 
 depend: .depend