ensure that dependencies are rebuilt after 'make update' so that builds don't break...

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@9691 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index 6f68919c0f8b98a58c4f88996c103d1fc01fedc1..04ea7bc8e361e378559806ed702bfaa8084ae6fb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -454,12 +454,7 @@ editline/libedit.a: FORCE
        $(MAKE) -C editline libedit.a
 
 db1-ast/libdb1.a: FORCE
-       @if [ -d db1-ast ]; then \
-               $(MAKE) -C db1-ast libdb1.a ; \
-       else \
-               echo "You need to do a cvs update -d not just cvs update"; \
-               exit 1; \
-       fi
+       $(MAKE) -C db1-ast libdb1.a
 
 ifneq ($(wildcard .depend),)
   include .depend
@@ -516,12 +511,7 @@ include/asterisk/version.h: FORCE
        rm -f $@.tmp
 
 stdtime/libtime.a: FORCE
-       @if [ -d stdtime ]; then \
-               $(MAKE) -C stdtime libtime.a ; \
-       else \
-               echo "You need to do a cvs update -d not just cvs update"; \
-               exit 1; \
-       fi
+       $(MAKE) -C stdtime libtime.a
 
 cygwin_a:
        $(MAKE) -C cygwin all
@@ -541,13 +531,17 @@ muted: muted.o
 subdirs: 
        for x in $(SUBDIRS); do $(MAKE) -C $$x || exit 1 ; done
 
-clean:
+clean-depend:
+       for x in $(SUBDIRS); do $(MAKE) -C $$x clean-depend || exit 1 ; done
+       rm -f .depend .tags-depend
+
+clean: clean-depend
        for x in $(SUBDIRS); do $(MAKE) -C $$x clean || exit 1 ; done
-       rm -f *.o *.so asterisk .depend
+       rm -f *.o *.so asterisk
        rm -f defaults.h
        rm -f include/asterisk/build.h
        rm -f include/asterisk/version.h
-       rm -f .tags-depend .tags-sources tags TAGS
+       rm -f .tags-sources tags TAGS
        @if [ -f editline/Makefile ]; then $(MAKE) -C editline distclean ; fi
        @if [ -d mpg123-0.59r ]; then $(MAKE) -C mpg123-0.59r clean; fi
        $(MAKE) -C db1-ast clean
@@ -617,6 +611,7 @@ update:
                        grep ^C update.out | cut -b4- ; \
                fi ; \
                rm -f update.out; \
+               $(MAKE) clean-depend; \
        elif [ -d CVS ]; then \
                echo "Updating from CVS..." ; \
                cvs -q -z3 update -Pd | tee update.out; \
@@ -626,6 +621,7 @@ update:
                        grep ^C update.out | cut -d' ' -f2- ; \
                fi ; \
                rm -f update.out; \
+               $(MAKE) clean-depend; \
        else \
                echo "Not under version control";  \
        fi

diff --git a/agi/Makefile b/agi/Makefile
index 5f2a6af9be5c6b0e3a0e7728e8f30aad45156e02..d9d10dcd375ebdba1a672868668356a4c1f1ab17 100644 (file)
--- a/agi/Makefile
+++ b/agi/Makefile
@@ -39,8 +39,11 @@ eagi-test: eagi-test.o
 eagi-sphinx-test: eagi-sphinx-test.o
        $(CC) $(CFLAGS) -o eagi-sphinx-test eagi-sphinx-test.o $(LIBS) 
 
-clean:
-       rm -f *.so *.o look .depend eagi-test eagi-sphinx-test
+clean-depend:
+       rm -f .depend
+
+clean: clean-depend
+       rm -f *.so *.o look eagi-test eagi-sphinx-test
 
 %.so : %.o
        $(CC) -shared -Xlinker -x -o $@ $<

diff --git a/apps/Makefile b/apps/Makefile
index b8a6b91f06ad89f60764b48301dffcac4fe055b2..988645d6140f4b06d71e7fa2226a0613dc63e690 100644 (file)
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -63,8 +63,11 @@ endif
 
 all: $(MODS)
 
-clean:
-       rm -f *.so *.o look .depend
+clean-depend:
+       rm -f .depend
+
+clean: clean-depend
+       rm -f *.so *.o look
 
 %.so : %.o
        $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}

diff --git a/cdr/Makefile b/cdr/Makefile
index 40779a27f3739f8b412148c429af6a8ac210480f..e11cfb9b63898a98b1a81ee3b90e34bd4e4b830c 100644 (file)
--- a/cdr/Makefile
+++ b/cdr/Makefile
@@ -106,8 +106,11 @@ install: all
 
 uninstall:
 
-clean:
-       rm -f *.so *.o .depend
+clean-depend:
+       rm -f .depend
+
+clean: clean-depend
+       rm -f *.so *.o
 
 %.so : %.o
        $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}

diff --git a/channels/Makefile b/channels/Makefile
index b2304a54c3969ef1a09ba069202c9ea71197c366..6613a49f75c186628a45cf2a3f12e9b03fe5bae1 100644 (file)
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -151,8 +151,11 @@ endif
 
 all: depend $(MODS) 
 
-clean:
-       rm -f *.so *.o .depend
+clean-depend:
+       rm -f .depend
+
+clean: clean-depend
+       rm -f *.so *.o
        rm -f busy.h ringtone.h gentone gentone-ulaw
 
 %.so : %.o

diff --git a/codecs/Makefile b/codecs/Makefile
index 23e6ba1a49e4ce4def185d6cd459b6374d7fdb1b..5d1f17523bd9e4369491ed712c5c6b3f21af8c1e 100644 (file)
--- a/codecs/Makefile
+++ b/codecs/Makefile
@@ -63,8 +63,11 @@ LIBLPC10=lpc10/liblpc10.a
 
 all: depend $(MODS)
 
-clean:
-       rm -f *.so *.o .depend
+clean-depend:
+       rm -f .depend
+
+clean: clean-depend
+       rm -f *.so *.o
        [ ! -d g723.1 ] || $(MAKE) -C g723.1 clean
        [ ! -d g723.1b ] || $(MAKE) -C g723.1b clean
        $(MAKE) -C gsm clean

diff --git a/cygwin/Makefile b/cygwin/Makefile
index 124628f9c711e0c9fce9261f848016526ef2f9ea..38f7837354d8aa1d36f63e0c35ce0028bb8e7b87 100644 (file)
--- a/cygwin/Makefile
+++ b/cygwin/Makefile
@@ -2,5 +2,8 @@ OBJS=cygloader.o
 all: $(OBJS)
 $(OBJS) : %.o: %.c
        $(CC) $< -o asterisk.exe
+
+clean-depend:
+
 clean:
        rm -f asterisk.exe

diff --git a/db1-ast/Makefile b/db1-ast/Makefile
index 0aa9fdb0241806c62dc5f9ec24bd8bc85b2bf121..d36b592f96ef3869b84f9578b8030e5046593c08 100644 (file)
--- a/db1-ast/Makefile
+++ b/db1-ast/Makefile
@@ -42,6 +42,8 @@ $(LIBDBSO): $(SHOBJS)
 $(PROG): db_dump185.o $(LIBDBSO)
        $(CC) -o $@ db_dump185.o -L. -ldb
 
+clean-depend:
+
 clean:
        rm -f $(LIBDB) $(LIBDBSO) $(OBJS) $(SHOBJS)
 

diff --git a/formats/Makefile b/formats/Makefile
index 108e85e8099a6915648352168410999b9f6bedfd..80143e58f890cac533037a235f9264bb87d85c4c 100644 (file)
--- a/formats/Makefile
+++ b/formats/Makefile
@@ -31,8 +31,11 @@ endif
 
 all: depend $(MODS)
 
-clean:
-       rm -f *.so *.o .depend
+clean-depend:
+       rm -f .depend
+
+clean: clean-depend
+       rm -f *.so *.o
 
 %.so : %.o
        $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}

diff --git a/funcs/Makefile b/funcs/Makefile
index 493ec3a9adbdfa9943af0eb3d604235fe2125627..f2f8a4b2be8b1565121e411819df24df39fd9fad 100644 (file)
--- a/funcs/Makefile
+++ b/funcs/Makefile
@@ -26,8 +26,11 @@ endif
 
 all: $(MODS)
 
-clean:
-       rm -f *.so *.o .depend
+clean-depend:
+       rm -f .depend
+
+clean: clean-depend
+       rm -f *.so *.o
 
 %.so : %.o
        $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}

diff --git a/pbx/Makefile b/pbx/Makefile
index e8eb087acf39fd9a54f7ebae81d8d3222b74f559..b32fbcae750a0989be841fb85dc8eedce9573410 100644 (file)
--- a/pbx/Makefile
+++ b/pbx/Makefile
@@ -40,8 +40,11 @@ KDE_CONSOLE_OBJS=pbx_kdeconsole_main.o pbx_kdeconsole.o
 
 all: depend $(MODS)
 
-clean:
-       rm -f *.so *.o .depend
+clean-depend:
+       rm -f .depend
+
+clean: clean-depend
+       rm -f *.so *.o
 
 pbx_gtkconsole.o: pbx_gtkconsole.c
        $(CC) $(CFLAGS) $(GTK_FLAGS) -c -o $@ $<

diff --git a/res/Makefile b/res/Makefile
index 01cdc4017bede1bc34f9e1fda22d1899f2e6ef26..9bbb5871dca8ea685709061ed5bb6a54b01deaf2 100644 (file)
--- a/res/Makefile
+++ b/res/Makefile
@@ -86,8 +86,11 @@ uninstall:
 res_crypto.so: res_crypto.o
        $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CRYPTO_LIBS)
 
-clean:
-       rm -f *.so *.o .depend
+clean-depend:
+       rm -f .depend
+
+clean: clean-depend
+       rm -f *.so *.o
 
 res_odbc.so: res_odbc.o
        $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc

diff --git a/stdtime/Makefile b/stdtime/Makefile
index 391b4550a884ff11a99eb3cffc8fa4ae0da38ac0..cbe3c48f70d5bf39d66dacb167b9f1165916e015 100644 (file)
--- a/stdtime/Makefile
+++ b/stdtime/Makefile
@@ -10,8 +10,11 @@ install:
 
 uninstall:
 
-clean:
-       rm -f libtime.a *.o test .depend
+clean-depend:
+       rm -f .depend
+
+clean: clean-depend
+       rm -f libtime.a *.o test
 
 depend: .depend
 

diff --git a/utils/Makefile b/utils/Makefile
index cc90f358e3adb4f327ab698fef4561e57925bfbc..93da99338197f923f672631340a0d7879c64e6ce 100644 (file)
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -43,8 +43,11 @@ install:
 uninstall:
        for x in $(TARGET); do rm -f $$x $(DESTDIR)$(ASTSBINDIR)/$$x; done
 
-clean:
-       rm -f *.o astman smsq stereorize streamplayer check_expr .depend
+clean-depend:
+       rm -f .depend
+
+clean: clean-depend
+       rm -f *.o astman smsq stereorize streamplayer check_expr
        rm -f ast_expr2.o ast_expr2f.o
 
 astman: astman.o ../md5.o