X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=Makefile;h=6d0e9a617f2c875c84036faf78a9be5c148ab734;hp=7790a1829a0f9e3d3899fe0e32a0bda514588e84;hb=b7ee5fd9f465455a5691abba80a7e83a1ab5b2d8;hpb=f4d36101d18955b4efc184a381c1f54d39e54abc

diff --git a/Makefile b/Makefile
index 7790a1829..6d0e9a617 100644
--- a/Makefile
+++ b/Makefile
@@ -1,61 +1,33 @@
 SCM := $(shell if [ -d .svn ]; then echo svn; elif [ -d ../.git ]; then echo git; fi)
-FTEQCC ?= fteqcc
 PERL ?= perl
 ZIP ?= 7za a -tzip -mx=9
 ZIPEXCLUDE ?= -x\!*.pk3 -xr\!\.svn -x\!qcsrc
 DIFF ?= diff
 
-FTEQCCFLAGS_WATERMARK ?= -DWATERMARK='"^1$(shell git describe) TEST BUILD"'
-FTEQCCFLAGS ?= -Werror -Wall -Wno-mundane -O3 -Ono-c -Ono-cs -flo $(FTEQCCFLAGS_EXTRA) $(FTEQCCFLAGS_WATERMARK)
-FTEQCCFLAGS_PROGS ?=
-FTEQCCFLAGS_MENU ?=
-
 # NOTE: use -DUSE_FTE instead of -TFTE here!
 # It will automagically add an engine check with -TID and then change back to -TFTE
 FTEQCCFLAGS_CSPROGS ?= 
 
-# xonotic build system overrides this by command line argument to turn off the update-cvarcount step
+# xonotic build system overrides this by command line argument to turn off the check-cvars step
 XON_BUILDSYSTEM =
 
 all: qc
 
-.PHONY: update-cvarcount
-update-cvarcount:
+.PHONY: check-cvars
+check-cvars:
 	[ "$(XON_BUILDSYSTEM)" = "" ] || [ "$(XON_BUILDSYSTEM)" = "1" ]
-	[ "$(XON_BUILDSYSTEM)" = "1" ] || { DO_NOT_RUN_MAKE=1 sh update-cvarcount.sh; }
+	[ "$(XON_BUILDSYSTEM)" = "1" ] || { DO_NOT_RUN_MAKE=1 sh check-cvars.sh; }
 
 .PHONY: qc
-qc: update-cvarcount
-	$(MAKE) qc-recursive
-
-.PHONY: qc-recursive
-qc-recursive: menu.dat progs.dat csprogs.dat
+qc: check-cvars
+	$(MAKE) -C qcsrc
 
 .PHONY: skin
 skin: gfx/menu/default/skinvalues.txt
 
 .PHONY: clean
 clean:
-	rm -f progs.dat menu.dat csprogs.dat
-
-FILES_CSPROGS = qcsrc/client/progs.src $(shell sed '/\.dat$$/d; s,//.*,,; s,[^ 	],qcsrc/client/&,' < qcsrc/client/progs.src)
-csprogs.dat: $(FILES_CSPROGS)
-	@echo make[1]: Entering directory \`$(PWD)/qcsrc/client\'
-	cd qcsrc/client && $(FTEQCC) $(FTEQCCFLAGS) $(FTEQCCFLAGS_CSPROGS)
-
-FILES_PROGS = qcsrc/server/progs.src $(shell sed '/\.dat$$/d; s,//.*,,; s,[^ 	],qcsrc/server/&,' < qcsrc/server/progs.src)
-progs.dat: $(FILES_PROGS)
-	@echo make[1]: Entering directory \`$(PWD)/qcsrc/server\'
-	cd qcsrc/server && $(FTEQCC) $(FTEQCCFLAGS) $(FTEQCCFLAGS_PROGS)
-
-FILES_MENU = qcsrc/menu/progs.src $(shell sed '/\.dat$$/d; s,//.*,,; s,[^ 	],qcsrc/menu/&,' < qcsrc/menu/progs.src)
-menu.dat: $(FILES_MENU)
-	@echo make[1]: Entering directory \`$(PWD)/qcsrc/menu\'
-	cd qcsrc/menu && $(FTEQCC) $(FTEQCCFLAGS) $(FTEQCCFLAGS_MENU)
+	$(MAKE) -C qcsrc clean
 
 gfx/menu/default/skinvalues.txt: qcsrc/menu/skin-customizables.inc
 	$(PERL) qcsrc/menu/skin-customizables.inc > gfx/menu/default/skinvalues.txt
-
-.PHONY: testcase
-testcase:
-	cd qcsrc/testcase && $(FTEQCC) $(FTEQCCFLAGS) $(FTEQCCFLAGS_CSPROGS) -DTESTCASE="$$TESTCASE"