From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sat, 9 Jan 2016 06:48:12 +0000 (+1100)
Subject: qcsrc/tmp: relocate
X-Git-Tag: xonotic-v0.8.2~1256
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4e2a95cd3f52ae10600c46efe69315926ae5e6b3;p=xonotic%2Fxonotic-data.pk3dir.git

qcsrc/tmp: relocate
---

diff --git a/.tmp/.gitignore b/.tmp/.gitignore
new file mode 100644
index 000000000..5e7d2734c
--- /dev/null
+++ b/.tmp/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index 04df61fa7..45360c60c 100644
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -41,8 +41,8 @@ qc: $(PROGS_OUT)/menu.dat $(PROGS_OUT)/progs.dat $(PROGS_OUT)/csprogs.dat
 
 .PHONY: clean
 clean:
-	rm -f $(PROGS_OUT)/progs.dat $(PROGS_OUT)/menu.dat $(PROGS_OUT)/csprogs.dat
-	rm -f tmp/*.qc tmp/*.d tmp/*.txt
+	rm -f $(PROGS_OUT)/{csprogs,progs,menu}.dat
+	rm -f ../.tmp/*.{qc,d,txt}
 
 $(QCCVERSIONFILE):
 	$(RM) qccversion.*
@@ -56,17 +56,17 @@ export QCCFLAGS
 $(PROGS_OUT)/csprogs.dat: client/progs.inc $(QCCVERSIONFILE)
 	@echo make[1]: Entering directory \`$(PWD)/client\'
 	sh ./qcc.sh client $@ $<
--include tmp/client.d
+-include ../.tmp/client.d
 
 $(PROGS_OUT)/progs.dat: server/progs.inc $(QCCVERSIONFILE)
 	@echo make[1]: Entering directory \`$(PWD)/server\'
 	sh ./qcc.sh server $@ $<
--include tmp/server.d
+-include ../.tmp/server.d
 
 $(PROGS_OUT)/menu.dat: menu/progs.inc $(QCCVERSIONFILE)
 	@echo make[1]: Entering directory \`$(PWD)/menu\'
 	sh ./qcc.sh menu $@ $<
--include tmp/menu.d
+-include ../.tmp/menu.d
 
 .PHONY: testcase
 testcase:
diff --git a/qcsrc/qcc.sh b/qcsrc/qcc.sh
index 0ee3c3a42..1678e668c 100755
--- a/qcsrc/qcc.sh
+++ b/qcsrc/qcc.sh
@@ -19,8 +19,8 @@ esac
 
 CPP="${CPP} -I. ${QCCIDENT} ${QCCDEFS} -D${PROG}"
 set -x
-${CPP} -MMD -MP -MT ${OUT} -Wall -Wundef -Werror -o ./tmp/${MODE}.txt ${IN}
-${CPP} -dM 1>./tmp/${MODE}_macros.txt -H 2>./tmp/${MODE}_includes.txt ${IN}
-sed 's/^#\(line\)\? \([[:digit:]]\+\) "\(.*\)".*/\n#pragma file(\3)\n#pragma line(\2)/g' ./tmp/${MODE}.txt > ./tmp/${MODE}.qc
+${CPP} -MMD -MP -MT ${OUT} -Wall -Wundef -Werror -o ../.tmp/${MODE}.txt ${IN}
+${CPP} -dM 1>../.tmp/${MODE}_macros.txt -H 2>../.tmp/${MODE}_includes.txt ${IN}
+sed 's/^#\(line\)\? \([[:digit:]]\+\) "\(.*\)".*/\n#pragma file(\3)\n#pragma line(\2)/g' ../.tmp/${MODE}.txt > ../.tmp/${MODE}.qc
 cd ${MODE}
-${QCC} ${QCCFLAGS} -o ${OUT} ../tmp/${MODE}.qc
+${QCC} ${QCCFLAGS} -o ${OUT} ../../.tmp/${MODE}.qc
diff --git a/qcsrc/tmp/.gitignore b/qcsrc/tmp/.gitignore
deleted file mode 100644
index 5e7d2734c..000000000
--- a/qcsrc/tmp/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore