From f63c257025b4c96c22922b71874a526348cd9f97 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sat, 10 Sep 2011 20:31:29 +0200 Subject: [PATCH] split Makefile into two for more convenient source packaging --- Makefile | 32 ++------------------------------ qcsrc/Makefile | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 30 deletions(-) create mode 100644 qcsrc/Makefile diff --git a/Makefile b/Makefile index 53c5cf5b7..abd82b133 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,9 @@ 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='"$(shell git describe)"' -DCVAR_POPCON -FTEQCCFLAGS ?= -Werror -Wno-Q302 -O3 -Ono-c -Ono-cs $(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 ?= @@ -26,36 +20,14 @@ update-cvarcount: .PHONY: qc qc: update-cvarcount - $(MAKE) qc-recursive - -.PHONY: qc-recursive -qc-recursive: menu.dat progs.dat csprogs.dat + $(MAKE) -C qcsrc .PHONY: skin skin: gfx/menu/default/skinvalues.txt .PHONY: clean clean: - rm -f progs.dat menu.dat csprogs.dat - -FILES_CSPROGS = $(shell find qcsrc/client qcsrc/common qcsrc/warpzonelib -type f -not -name fteqcc.log -not -name qc.asm) qcsrc/server/w_*.qc -csprogs.dat: $(FILES_CSPROGS) - @echo make[1]: Entering directory \`$(PWD)/qcsrc/client\' - cd qcsrc/client && $(FTEQCC) $(FTEQCCFLAGS) $(FTEQCCFLAGS_CSPROGS) - -FILES_PROGS = $(shell find qcsrc/server qcsrc/common qcsrc/warpzonelib -type f -not -name fteqcc.log -not -name qc.asm) qcsrc/server/w_*.qc -progs.dat: $(FILES_PROGS) - @echo make[1]: Entering directory \`$(PWD)/qcsrc/server\' - cd qcsrc/server && $(FTEQCC) $(FTEQCCFLAGS) $(FTEQCCFLAGS_PROGS) - -FILES_MENU = $(shell find qcsrc/menu qcsrc/common qcsrc/warpzonelib -type f -not -name fteqcc.log -not -name qc.asm) qcsrc/server/w_*.qc -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" diff --git a/qcsrc/Makefile b/qcsrc/Makefile new file mode 100644 index 000000000..de44b785c --- /dev/null +++ b/qcsrc/Makefile @@ -0,0 +1,47 @@ +SCM := $(shell if [ -d .svn ]; then echo svn; elif [ -d ../.git ]; then echo git; fi) +FTEQCC ?= fteqcc +PERL ?= perl + +FTEQCCFLAGS_WATERMARK ?= -DWATERMARK='"$(shell git describe)"' -DCVAR_POPCON +FTEQCCFLAGS ?= -Werror -Wno-Q302 -O3 -Ono-c -Ono-cs $(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 +XON_BUILDSYSTEM = + +all: qc + +.PHONY: qc +qc: + $(MAKE) qc-recursive + +.PHONY: qc-recursive +qc-recursive: ../menu.dat ../progs.dat ../csprogs.dat + +.PHONY: clean +clean: + rm -f ../progs.dat ../menu.dat ../csprogs.dat + +FILES_CSPROGS = $(shell find client common warpzonelib -type f -not -name fteqcc.log -not -name qc.asm) server/w_*.qc +../csprogs.dat: $(FILES_CSPROGS) + @echo make[1]: Entering directory \`$(PWD)/client\' + cd client && $(FTEQCC) $(FTEQCCFLAGS) $(FTEQCCFLAGS_CSPROGS) + +FILES_PROGS = $(shell find server common warpzonelib -type f -not -name fteqcc.log -not -name qc.asm) server/w_*.qc +../progs.dat: $(FILES_PROGS) + @echo make[1]: Entering directory \`$(PWD)/server\' + cd server && $(FTEQCC) $(FTEQCCFLAGS) $(FTEQCCFLAGS_PROGS) + +FILES_MENU = $(shell find menu common warpzonelib -type f -not -name fteqcc.log -not -name qc.asm) server/w_*.qc +../menu.dat: $(FILES_MENU) + @echo make[1]: Entering directory \`$(PWD)/menu\' + cd menu && $(FTEQCC) $(FTEQCCFLAGS) $(FTEQCCFLAGS_MENU) + +.PHONY: testcase +testcase: + cd testcase && $(FTEQCC) $(FTEQCCFLAGS) $(FTEQCCFLAGS_CSPROGS) -DTESTCASE="$$TESTCASE" -- 2.39.2