Makefile: depend on transitive #includes

diff --git a/.gitignore b/.gitignore
index 6b5cef68e6ae6881cd0fc23abc2340230d73614e..6ecb3d2eb62e1c68d9602b7391a23ec2a6aa44e2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,6 @@
 csprogs.dat
 menu.dat
 progs.dat
-qcsrc/client/fteqcc.log
-qcsrc/menu/fteqcc.log
-qcsrc/server/fteqcc.log
-weapons.qc.tmp
 *.lno
-qcsrc/qccversion*
-qcsrc/server/precache-for-csqc.inc
 .DS_Store
+.idea/

diff --git a/qcsrc/.gitignore b/qcsrc/.gitignore
index 5ccff1a6bea2633d14bbbb0e6011427683ce9a19..79fce6a59259d580292e269c2db59394f44f8b34 100644 (file)
--- a/qcsrc/.gitignore
+++ b/qcsrc/.gitignore
@@ -1 +1,3 @@
 html/
+qccversion*
+*.d

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index 6e0f04365f4494dde86370c4413f9e1e079ff1d6..0294374a023cb207c27f2430aaaf01d3846e2a30 100644 (file)
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -39,25 +39,29 @@ qc: ../menu.dat ../progs.dat ../csprogs.dat
 .PHONY: clean
 clean:
        rm -f ../progs.dat ../menu.dat ../csprogs.dat
+       rm -f progs.d menu.d csprogs.d
 
 $(QCCVERSIONFILE):
        $(RM) qccversion.*
        echo This file intentionally left blank. > $@
 
-FILES_CSPROGS = $(shell find lib common client -type f)
-../csprogs.dat: $(FILES_CSPROGS) $(QCCVERSIONFILE)
+../csprogs.dat: client/progs.inc $(QCCVERSIONFILE)
+       @$(CC) -MM -MP -MF csprogs.d -MT $@ -x c -DCSQC -o $@ $<
        @echo make[1]: Entering directory \`$(PWD)/client\'
-       cd client && $(QCC) $(QCCFLAGS) -DCSQC -o ../../csprogs.dat progs.inc
+       cd client && $(QCC) $(QCCFLAGS) -DCSQC -o ../$@ ../$<
+-include csprogs.d
 
-FILES_PROGS = $(shell find lib common server -type f)
-../progs.dat: $(FILES_PROGS) $(QCCVERSIONFILE)
+../progs.dat: server/progs.inc $(QCCVERSIONFILE)
+       @$(CC) -MM -MP -MF progs.d -MT $@ -x c -DSVQC -o $@ $<
        @echo make[1]: Entering directory \`$(PWD)/server\'
-       cd server && $(QCC) $(QCCFLAGS) -DSVQC -o ../../progs.dat progs.inc
+       cd server && $(QCC) $(QCCFLAGS) -DSVQC -o ../$@ ../$<
+-include progs.d
 
-FILES_MENU = $(shell find lib common menu -type f)
-../menu.dat: $(FILES_MENU) $(QCCVERSIONFILE)
+../menu.dat: menu/progs.inc $(QCCVERSIONFILE)
+       @$(CC) -MM -MP -MF menu.d -MT $@ -x c -DMENUQC -o $@ $<
        @echo make[1]: Entering directory \`$(PWD)/menu\'
-       cd menu && $(QCC) $(QCCFLAGS) -DMENUQC -o ../../menu.dat progs.inc
+       cd menu && $(QCC) $(QCCFLAGS) -DMENUQC -o ../$@ ../$<
+-include menu.d
 
 .PHONY: testcase
 testcase: