]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
qcsrc/tmp: relocate
authorTimePath <andrew.hardaker1995@gmail.com>
Sat, 9 Jan 2016 06:48:12 +0000 (17:48 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Sat, 9 Jan 2016 06:48:12 +0000 (17:48 +1100)
.tmp/.gitignore [new file with mode: 0644]
qcsrc/Makefile
qcsrc/qcc.sh
qcsrc/tmp/.gitignore [deleted file]

diff --git a/.tmp/.gitignore b/.tmp/.gitignore
new file mode 100644 (file)
index 0000000..5e7d273
--- /dev/null
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
index 04df61fa7953e12ed6ae84df1fc128b90987117f..45360c60c19ff9ae2799e8aecb0c8ee20ada8b36 100644 (file)
@@ -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:
index 0ee3c3a425cb6198c7d7558326f7ea5cc8ad2d63..1678e668cd2c594c32cf02e463138fad2e221759 100755 (executable)
@@ -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 (file)
index 5e7d273..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore