r5484 - trunk/data

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-01-10 13:15:51 -0500 (Sat, 10 Jan 2009)
New Revision: 5484

Modified:
   trunk/data/Makefile
   trunk/data/update-cvarcount.sh
Log:
make the Makefile always do update-cvarcount


Modified: trunk/data/Makefile
===================================================================
--- trunk/data/Makefile	2009-01-10 18:10:33 UTC (rev 5483)
+++ trunk/data/Makefile	2009-01-10 18:15:51 UTC (rev 5484)
@@ -13,6 +13,10 @@
 
 all: qc
 
+.PHONY: update-cvarcount
+update-cvarcount:
+	DO_NOT_RUN_MAKE=1 sh update-cvarcount.sh
+
 .PHONY: qc
 qc: menu.dat progs.dat csprogs.dat
 
@@ -26,13 +30,13 @@
 clean:
 	rm -f progs.dat menu.dat csprogs.dat
 
-csprogs.dat: qcsrc/client/*.* qcsrc/common/*.*
+csprogs.dat: qcsrc/client/*.* qcsrc/common/*.* update-cvarcount
 	cd qcsrc/client && $(FTEQCC) $(FTEQCCFLAGS) $(QCFLAGS_CSPROGS)
 
-progs.dat: qcsrc/server/*.* qcsrc/common/*.*
+progs.dat: qcsrc/server/*.* qcsrc/common/*.* update-cvarcount
 	cd qcsrc/server && $(FTEQCC) $(FTEQCCFLAGS) $(QCFLAGS_PROGS)
 
-menu.dat: qcsrc/menu/*.* qcsrc/menu/*/*.* qcsrc/common/*.*
+menu.dat: qcsrc/menu/*.* qcsrc/menu/*/*.* qcsrc/common/*.* update-cvarcount
 	cd qcsrc/menu && $(FTEQCC) $(FTEQCCFLAGS) $(FTEQCCFLAGS_MENU)
 
 gfx/menu/default/skinvalues.txt: qcsrc/menu/skin-customizables.inc

Modified: trunk/data/update-cvarcount.sh
===================================================================
--- trunk/data/update-cvarcount.sh	2009-01-10 18:10:33 UTC (rev 5483)
+++ trunk/data/update-cvarcount.sh	2009-01-10 18:15:51 UTC (rev 5484)
@@ -16,6 +16,6 @@
 sed -i "s/^string CVAR_CHECK_DEFAULT = .*/string CVAR_CHECK_DEFAULT = \"$countd\";/" qcsrc/server/constants.qh
 sed -i "s/^string CVAR_CHECK_WEAPONS = .*/string CVAR_CHECK_WEAPONS = \"$countw\";/" qcsrc/server/constants.qh
 
-make
+[ -z "$DO_NOT_RUN_MAKE" ] && make
 
-echo "New checksums: $countd, $countw"
+echo "New checksums: $countd, $countw; please recompile!"