[asterisk-commits] trunk r9691 - in /trunk: ./ agi/ apps/ cdr/
channels/ codecs/ cygwin/ db1-ast...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Sun Feb 12 09:52:46 MST 2006
Author: kpfleming
Date: Sun Feb 12 10:52:42 2006
New Revision: 9691
URL: http://svn.digium.com/view/asterisk?rev=9691&view=rev
Log:
ensure that dependencies are rebuilt after 'make update' so that builds don't break when files are removed/renamed
Modified:
trunk/Makefile
trunk/agi/Makefile
trunk/apps/Makefile
trunk/cdr/Makefile
trunk/channels/Makefile
trunk/codecs/Makefile
trunk/cygwin/Makefile
trunk/db1-ast/Makefile
trunk/formats/Makefile
trunk/funcs/Makefile
trunk/pbx/Makefile
trunk/res/Makefile
trunk/stdtime/Makefile
trunk/utils/Makefile
Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=9691&r1=9690&r2=9691&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sun Feb 12 10:52:42 2006
@@ -454,12 +454,7 @@
$(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 @@
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 @@
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 @@
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 @@
grep ^C update.out | cut -d' ' -f2- ; \
fi ; \
rm -f update.out; \
+ $(MAKE) clean-depend; \
else \
echo "Not under version control"; \
fi
Modified: trunk/agi/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/agi/Makefile?rev=9691&r1=9690&r2=9691&view=diff
==============================================================================
--- trunk/agi/Makefile (original)
+++ trunk/agi/Makefile Sun Feb 12 10:52:42 2006
@@ -39,8 +39,11 @@
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 $@ $<
Modified: trunk/apps/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/apps/Makefile?rev=9691&r1=9690&r2=9691&view=diff
==============================================================================
--- trunk/apps/Makefile (original)
+++ trunk/apps/Makefile Sun Feb 12 10:52:42 2006
@@ -63,8 +63,11 @@
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}
Modified: trunk/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/cdr/Makefile?rev=9691&r1=9690&r2=9691&view=diff
==============================================================================
--- trunk/cdr/Makefile (original)
+++ trunk/cdr/Makefile Sun Feb 12 10:52:42 2006
@@ -106,8 +106,11 @@
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}
Modified: trunk/channels/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/channels/Makefile?rev=9691&r1=9690&r2=9691&view=diff
==============================================================================
--- trunk/channels/Makefile (original)
+++ trunk/channels/Makefile Sun Feb 12 10:52:42 2006
@@ -151,8 +151,11 @@
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
Modified: trunk/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/codecs/Makefile?rev=9691&r1=9690&r2=9691&view=diff
==============================================================================
--- trunk/codecs/Makefile (original)
+++ trunk/codecs/Makefile Sun Feb 12 10:52:42 2006
@@ -63,8 +63,11 @@
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
Modified: trunk/cygwin/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/cygwin/Makefile?rev=9691&r1=9690&r2=9691&view=diff
==============================================================================
--- trunk/cygwin/Makefile (original)
+++ trunk/cygwin/Makefile Sun Feb 12 10:52:42 2006
@@ -2,5 +2,8 @@
all: $(OBJS)
$(OBJS) : %.o: %.c
$(CC) $< -o asterisk.exe
+
+clean-depend:
+
clean:
rm -f asterisk.exe
Modified: trunk/db1-ast/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/db1-ast/Makefile?rev=9691&r1=9690&r2=9691&view=diff
==============================================================================
--- trunk/db1-ast/Makefile (original)
+++ trunk/db1-ast/Makefile Sun Feb 12 10:52:42 2006
@@ -42,6 +42,8 @@
$(PROG): db_dump185.o $(LIBDBSO)
$(CC) -o $@ db_dump185.o -L. -ldb
+clean-depend:
+
clean:
rm -f $(LIBDB) $(LIBDBSO) $(OBJS) $(SHOBJS)
Modified: trunk/formats/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/formats/Makefile?rev=9691&r1=9690&r2=9691&view=diff
==============================================================================
--- trunk/formats/Makefile (original)
+++ trunk/formats/Makefile Sun Feb 12 10:52:42 2006
@@ -31,8 +31,11 @@
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}
Modified: trunk/funcs/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/funcs/Makefile?rev=9691&r1=9690&r2=9691&view=diff
==============================================================================
--- trunk/funcs/Makefile (original)
+++ trunk/funcs/Makefile Sun Feb 12 10:52:42 2006
@@ -26,8 +26,11 @@
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}
Modified: trunk/pbx/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/pbx/Makefile?rev=9691&r1=9690&r2=9691&view=diff
==============================================================================
--- trunk/pbx/Makefile (original)
+++ trunk/pbx/Makefile Sun Feb 12 10:52:42 2006
@@ -40,8 +40,11 @@
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 $@ $<
Modified: trunk/res/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/res/Makefile?rev=9691&r1=9690&r2=9691&view=diff
==============================================================================
--- trunk/res/Makefile (original)
+++ trunk/res/Makefile Sun Feb 12 10:52:42 2006
@@ -86,8 +86,11 @@
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
Modified: trunk/stdtime/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/stdtime/Makefile?rev=9691&r1=9690&r2=9691&view=diff
==============================================================================
--- trunk/stdtime/Makefile (original)
+++ trunk/stdtime/Makefile Sun Feb 12 10:52:42 2006
@@ -10,8 +10,11 @@
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
Modified: trunk/utils/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/utils/Makefile?rev=9691&r1=9690&r2=9691&view=diff
==============================================================================
--- trunk/utils/Makefile (original)
+++ trunk/utils/Makefile Sun Feb 12 10:52:42 2006
@@ -43,8 +43,11 @@
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
More information about the asterisk-commits
mailing list