From 472e607d2ab4bfe9b1302af54078c903d3d65ca8 Mon Sep 17 00:00:00 2001 From: TimePath Date: Fri, 1 Jan 2016 00:38:10 +1100 Subject: [PATCH] Makefile: be very specific --- qcsrc/Makefile | 6 +++--- qcsrc/qcc.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qcsrc/Makefile b/qcsrc/Makefile index a0848a185..20d935e61 100644 --- a/qcsrc/Makefile +++ b/qcsrc/Makefile @@ -53,17 +53,17 @@ export QCCFLAGS ../csprogs.dat: client/progs.inc $(QCCVERSIONFILE) @echo make[1]: Entering directory \`$(PWD)/client\' - ./qcc.sh client $@ $< + sh ./qcc.sh client $@ $< -include tmp/client.d ../progs.dat: server/progs.inc $(QCCVERSIONFILE) @echo make[1]: Entering directory \`$(PWD)/server\' - ./qcc.sh server $@ $< + sh ./qcc.sh server $@ $< -include tmp/server.d ../menu.dat: menu/progs.inc $(QCCVERSIONFILE) @echo make[1]: Entering directory \`$(PWD)/menu\' - ./qcc.sh menu $@ $< + sh ./qcc.sh menu $@ $< -include tmp/menu.d .PHONY: testcase diff --git a/qcsrc/qcc.sh b/qcsrc/qcc.sh index f0a734a6e..429771ce6 100755 --- a/qcsrc/qcc.sh +++ b/qcsrc/qcc.sh @@ -19,8 +19,8 @@ esac CPP="${CPP} -I. ${QCCIDENT} ${QCCDEFS} -D${PROG}" set -x -${CPP} -CC -MMD -MP -MT ${OUT} -Wall -Wundef -Werror -o tmp/${MODE}.qc ${IN} -${CPP} -dM 1>tmp/${MODE}_macros.txt -H 2>tmp/${MODE}_includes.txt ${IN} -sed -i 's/^#\(line\)\? \([[:digit:]]\+\) "\(.*\)".*/\n#pragma file(\3)\n#pragma line(\2)/g' tmp/${MODE}.qc +${CPP} -CC -MMD -MP -MT ${OUT} -Wall -Wundef -Werror -o ./tmp/${MODE}.qc ${IN} +${CPP} -dM 1>./tmp/${MODE}_macros.txt -H 2>./tmp/${MODE}_includes.txt ${IN} +sed -i 's/^#\(line\)\? \([[:digit:]]\+\) "\(.*\)".*/\n#pragma file(\3)\n#pragma line(\2)/g' ./tmp/${MODE}.qc cd ${MODE} ${QCC} ${QCCFLAGS} -o ../${OUT} ../tmp/${MODE}.qc -- 2.39.2