[Asterisk-cvs] asterisk .cleancount, NONE, 1.1 .cvsignore, 1.5, 1.6 Makefile, 1.128, 1.129 README, 1.29, 1.30

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv24939

Modified Files:
	.cvsignore Makefile README 
Added Files:
	.cleancount 
Log Message:
Allow me to force a "make clean ; make install" on a cvs update (bug #3358)


--- NEW FILE: .cleancount ---
1

Index: .cvsignore
===================================================================
RCS file: /usr/cvsroot/asterisk/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- .cvsignore	31 Dec 2004 15:17:25 -0000	1.5
+++ .cvsignore	17 Jan 2005 04:48:51 -0000	1.6
@@ -7,3 +7,5 @@
 mpg123-0.59r
 mpg123-0.59r.tar.gz
 update.out
+.lastclean
+.cleancount

Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- Makefile	10 Jan 2005 04:18:17 -0000	1.128
+++ Makefile	17 Jan 2005 04:48:51 -0000	1.129
@@ -255,7 +255,9 @@
 	@echo " +               $(MAKE) install                +"  
 	@echo " +-------------------------------------------+"  
 
-all: depend asterisk subdirs 
+all: cleantest depend asterisk subdirs 
+
+noclean: depend asterisk subdirs
 
 editline/config.h:
 	cd editline && unset CFLAGS LIBS && ./configure ; \
@@ -330,6 +332,7 @@
 	rm -f *.o *.so asterisk .depend
 	rm -f build.h 
 	rm -f ast_expr.c
+	rm -f .version
 	@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
@@ -580,3 +583,14 @@
 
 env:
 	env
+
+# If the cleancount has been changed, force a make clean.
+# .cleancount is the global clean count, and .lastclean is the 
+# 	last clean count # we had
+# We can avoid this by making noclean
+
+cleantest:
+	if ! cmp -s .cleancount .lastclean ; then \
+		make clean; cp -f .cleancount .lastclean;\
+	fi
+		

Index: README
===================================================================
RCS file: /usr/cvsroot/asterisk/README,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- README	25 Aug 2004 14:14:57 -0000	1.29
+++ README	17 Jan 2005 04:48:51 -0000	1.30
@@ -71,6 +71,12 @@
 1) Run "make"
 2) Run "make install"
 
+Each time you update or checkout from CVS, you are strongly encouraged 
+to ensure all previous object files are removed to avoid internal 
+inconsistency in Asterisk. Normally, this is automatically done with 
+the presence of the file .cleancount, which increments each time a 'make clean'
+is required, and the file .lastclean, which contains the last .cleancount used. 
+
 If this is your first time working with Asterisk, you may wish to install
 the sample PBX, with demonstration extensions, etc.  If so, run: