Merged revisions 865 via svnmerge from

https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r865 | kpfleming | 2005-12-16 20:04:05 -0600 (Fri, 16 Dec 2005) | 3 lines

add version and echo canceller selection reporting when zaptel module is loaded
make 'update' target work like the Asterisk one and report conflicts

........


git-svn-id: http://svn.digium.com/svn/zaptel/trunk@866 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 41 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index b6c05df..e1d25a4 100644
--- a/Makefile
+++ b/Makefile
@@ -95,6 +95,21 @@ ifndef CHKCONFIG
 CHKCONFIG:=:
 endif
 
+ifneq ($(wildcard .version),)
+  ZAPTELVERSION:=$(shell cat .version)
+endif
+
+# CVS mirrors of SVN have .svnrevision files showing
+# which SVN revision they are based on, and .svnbranch
+# showing the branch they are made from
+ifneq ($(wildcard .svnrevision),)
+  ZAPTELVERSION:=SVN-$(shell cat .svnbranch)-r$(shell cat .svnrevision)
+else
+  ifneq ($(wildcard .svn),)
+    ZAPTELVERSION=SVN-$(shell build_tools/make_svn_branch_name)
+  endif
+endif
+
 TZOBJS:=zonedata.lo tonezone.lo
 LIBTONEZONE_SO:=libtonezone.so
 LIBTONEZONE_SO_MAJOR_VER:=1
@@ -137,13 +152,20 @@ obj-m := $(MODULESO)
 
 MOD_DESTDIR:=zaptel
 
+version.h: FORCE
+	ZAPTELVERSION="${ZAPTELVERSION}" build_tools/make_version_h > $@.tmp
+	if cmp -s $@.tmp $@ ; then echo; else \
+		mv $@.tmp $@ ; \
+	fi
+	rm -f $@.tmp
+
 devel: tor2ee 
 
 tests: patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
 
 tor2.o: tor2-hw.h tor2fw.h zaptel.h
 
-zaptel.o: zaptel.h digits.h arith.h sec.h mec.h sec-2.h mec2.h mec3.h zconfig.h
+zaptel.o: zaptel.h digits.h arith.h sec.h mec.h sec-2.h mec2.h mec3.h zconfig.h version.h
 
 torisa.o: zaptel.h torisa.h
 
@@ -206,7 +228,7 @@ gendigits: gendigits.o
 
 zaptel.c: tones.h 
 
-prereq: tones.h tor2fw.h radfw.h
+prereq: tones.h tor2fw.h radfw.h version.h
 
 zttool.o: zttool.c zaptel.h
 
@@ -400,12 +422,24 @@ config:
 update:
 	@if [ -d .svn ]; then \
 		echo "Updating from Subversion..." ; \
-		svn update -q; \
+		svn update | tee update.out; \
+		rm -f .version; \
+		if [ `grep -c ^C update.out` -gt 0 ]; then \
+			echo ; echo "The following files have conflicts:" ; \
+			grep ^C update.out | cut -b4- ; \
+		fi ; \
+		rm -f update.out; \
 	elif [ -d CVS ]; then \
 		echo "Updating from CVS..." ; \
-		cvs -q -z3 update -Pd; \
+		cvs -q -z3 update -Pd | tee update.out; \
+		rm -f .version; \
+		if [ `grep -c ^C update.out` -gt 0 ]; then \
+			echo ; echo "The following files have conflicts:" ; \
+			grep ^C update.out | cut -d' ' -f2- ; \
+		fi ; \
+		rm -f update.out; \
 	else \
-		echo "Not under version control"; \
+		echo "Not under version control";  \
 	fi
 
 clean:
@@ -421,3 +455,5 @@ clean:
 	rm -f fxotune
 	rm -f core
 	rm -f ztcfg-shared fxstest
+
+FORCE: