From f4d36101d18955b4efc184a381c1f54d39e54abc Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Fri, 15 Oct 2010 16:33:59 +0200 Subject: [PATCH] proper detection of changed source files in the QC makefile --- Makefile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 83abf218d..7790a1829 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,8 @@ 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 ?= +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 @@ -38,15 +38,18 @@ skin: gfx/menu/default/skinvalues.txt clean: rm -f progs.dat menu.dat csprogs.dat -csprogs.dat: qcsrc/client/*.* qcsrc/common/*.* qcsrc/warpzonelib/*.* +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) -progs.dat: qcsrc/server/*.* qcsrc/common/*.* qcsrc/server/*/*.* qcsrc/server/*/*/*.* qcsrc/warpzonelib/*.* +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) -menu.dat: qcsrc/menu/*.* qcsrc/menu/*/*.* qcsrc/common/*.* +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) -- 2.39.2