From 4e2a95cd3f52ae10600c46efe69315926ae5e6b3 Mon Sep 17 00:00:00 2001 From: TimePath Date: Sat, 9 Jan 2016 17:48:12 +1100 Subject: [PATCH] qcsrc/tmp: relocate --- {qcsrc/tmp => .tmp}/.gitignore | 0 qcsrc/Makefile | 10 +++++----- qcsrc/qcc.sh | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) rename {qcsrc/tmp => .tmp}/.gitignore (100%) diff --git a/qcsrc/tmp/.gitignore b/.tmp/.gitignore similarity index 100% rename from qcsrc/tmp/.gitignore rename to .tmp/.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 -- 2.39.2