diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-12 16:52:42 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-12 16:52:42 +0000 |
commit | e217105bfc285f1b94ac99781a59efa3e7ed47db (patch) | |
tree | 1883e463a59ddee6ac9df55e3a9bb38ca50c14ca | |
parent | 5d9ed5739aab2b302efc178d21e6c75672369db3 (diff) |
ensure that dependencies are rebuilt after 'make update' so that builds don't break when files are removed/renamed
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@9691 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | Makefile | 26 | ||||
-rw-r--r-- | agi/Makefile | 7 | ||||
-rw-r--r-- | apps/Makefile | 7 | ||||
-rw-r--r-- | cdr/Makefile | 7 | ||||
-rw-r--r-- | channels/Makefile | 7 | ||||
-rw-r--r-- | codecs/Makefile | 7 | ||||
-rw-r--r-- | cygwin/Makefile | 3 | ||||
-rw-r--r-- | db1-ast/Makefile | 2 | ||||
-rw-r--r-- | formats/Makefile | 7 | ||||
-rw-r--r-- | funcs/Makefile | 7 | ||||
-rw-r--r-- | pbx/Makefile | 7 | ||||
-rw-r--r-- | res/Makefile | 7 | ||||
-rw-r--r-- | stdtime/Makefile | 7 | ||||
-rw-r--r-- | utils/Makefile | 7 |
14 files changed, 71 insertions, 37 deletions
@@ -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 5f2a6af9b..d9d10dcd3 100644 --- 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 b8a6b91f0..988645d61 100644 --- 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 40779a27f..e11cfb9b6 100644 --- 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 b2304a54c..6613a49f7 100644 --- 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 23e6ba1a4..5d1f17523 100644 --- 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 124628f9c..38f783735 100644 --- 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 0aa9fdb02..d36b592f9 100644 --- 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 108e85e80..80143e58f 100644 --- 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 493ec3a9a..f2f8a4b2b 100644 --- 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 e8eb087ac..b32fbcae7 100644 --- 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 01cdc4017..9bbb5871d 100644 --- 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 391b4550a..cbe3c48f7 100644 --- 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 cc90f358e..93da99338 100644 --- 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 |