More makefile fixes.

diff --git a/mop/admin/Makefile b/mop/admin/Makefile
index fc90aa5160effc8ab9ad2c166f5cdda56a5515f9..29ab8d012179cd2da7eb1c208e7f2ebf2289b6d4 100644 (file)
--- a/mop/admin/Makefile
+++ b/mop/admin/Makefile
@@ -12,17 +12,17 @@ PROGS+=$(addprefix $(o)/mop/admin/,\
 
 $(o)/mop/admin/md5crypt: $(o)/mop/admin/md5crypt.o $(LIBUCW)
 
-$(o)/mop/admin/mo-back-grab: mop/admin/mo-back-grab.sh
-$(o)/mop/admin/mo-back-status: mop/admin/mo-back-status.sh
-$(o)/mop/admin/mo-backup: mop/admin/mo-backup.sh
-$(o)/mop/admin/mo-create-contestants: mop/admin/mo-create-contestants.sh
-$(o)/mop/admin/mo-create-eval: mop/admin/mo-create-eval.sh
-$(o)/mop/admin/mo-create-logins: mop/admin/mo-create-logins.sh
-$(o)/mop/admin/mo-create-public: mop/admin/mo-create-public.sh
-$(o)/mop/admin/mo-create-submit: mop/admin/mo-create-submit.sh
-$(o)/mop/admin/mo-create-testusers: mop/admin/mo-create-testusers.sh
-$(o)/mop/admin/mo-grab-remote: mop/admin/mo-grab-remote.sh
-$(o)/mop/admin/mo-grab: mop/admin/mo-grab.sh
-$(o)/mop/admin/mo-install: mop/admin/mo-install.sh
-$(o)/mop/admin/mo-push-certs: mop/admin/mo-push-certs.sh
-$(o)/mop/admin/mo-push-feedback: mop/admin/mo-push-feedback.sh
+$(o)/mop/admin/mo-back-grab: $(s)/mop/admin/mo-back-grab.sh
+$(o)/mop/admin/mo-back-status: $(s)/mop/admin/mo-back-status.sh
+$(o)/mop/admin/mo-backup: $(s)/mop/admin/mo-backup.sh
+$(o)/mop/admin/mo-create-contestants: $(s)/mop/admin/mo-create-contestants.sh
+$(o)/mop/admin/mo-create-eval: $(s)/mop/admin/mo-create-eval.sh
+$(o)/mop/admin/mo-create-logins: $(s)/mop/admin/mo-create-logins.sh
+$(o)/mop/admin/mo-create-public: $(s)/mop/admin/mo-create-public.sh
+$(o)/mop/admin/mo-create-submit: $(s)/mop/admin/mo-create-submit.sh
+$(o)/mop/admin/mo-create-testusers: $(s)/mop/admin/mo-create-testusers.sh
+$(o)/mop/admin/mo-grab-remote: $(s)/mop/admin/mo-grab-remote.sh
+$(o)/mop/admin/mo-grab: $(s)/mop/admin/mo-grab.sh
+$(o)/mop/admin/mo-install: $(s)/mop/admin/mo-install.sh
+$(o)/mop/admin/mo-push-certs: $(s)/mop/admin/mo-push-certs.sh
+$(o)/mop/admin/mo-push-feedback: $(s)/mop/admin/mo-push-feedback.sh

diff --git a/mop/eval/Makefile b/mop/eval/Makefile
index f85a395f194af35195e1681e8201abf9424be5e1..6443cdc6139981e8fa321a67a88dffb87acbb13a 100644 (file)
--- a/mop/eval/Makefile
+++ b/mop/eval/Makefile
@@ -6,8 +6,8 @@ PROGS+=$(addprefix $(o)/mop/eval/,\
        mo-ev-all mo-ev-inc mo-get-users \
        mo-score mo-report)
 
-$(o)/mop/eval/mo-ev-all: mop/eval/mo-ev-all.sh
-$(o)/mop/eval/mo-ev-inc: mop/eval/mo-ev-inc.sh
-$(o)/mop/eval/mo-get-users: mop/eval/mo-get-users.sh
-$(o)/mop/eval/mo-report: mop/eval/mo-report.sh
-$(o)/mop/eval/mo-score: mop/eval/mo-score.sh
+$(o)/mop/eval/mo-ev-all: $(s)/mop/eval/mo-ev-all.sh
+$(o)/mop/eval/mo-ev-inc: $(s)/mop/eval/mo-ev-inc.sh
+$(o)/mop/eval/mo-get-users: $(s)/mop/eval/mo-get-users.sh
+$(o)/mop/eval/mo-report: $(s)/mop/eval/mo-report.sh
+$(o)/mop/eval/mo-score: $(s)/mop/eval/mo-score.sh

diff --git a/mop/public/Makefile b/mop/public/Makefile
index fed4b6bcb19c4f1385945295a456381164600bff..8b0b449bd5a2c8393381eb6e4e6d704416c600e3 100644 (file)
--- a/mop/public/Makefile
+++ b/mop/public/Makefile
@@ -4,7 +4,7 @@
 DIRS+=mop/public
 PROGS+=$(addprefix $(o)/mop/public/,check compile status submit)
 
-$(o)/mop/public/check: mop/public/check.sh
-$(o)/mop/public/compile: mop/public/compile.sh
-$(o)/mop/public/status: mop/public/status.sh
-$(o)/mop/public/submit: mop/public/submit.sh
+$(o)/mop/public/check: $(s)/mop/public/check.sh
+$(o)/mop/public/compile: $(s)/mop/public/compile.sh
+$(o)/mop/public/status: $(s)/mop/public/status.sh
+$(o)/mop/public/submit: $(s)/mop/public/submit.sh

diff --git a/mop/score/Makefile b/mop/score/Makefile
index 3b317251c8736497806bd2b65a395f93c38aea05..336e9961a6019be083cfaf43dc939ed18d57ed82 100644 (file)
--- a/mop/score/Makefile
+++ b/mop/score/Makefile
@@ -4,5 +4,5 @@
 DIRS+=mop/score
 PROGS+=$(addprefix $(o)/mop/score/,mo-score-mop mo-score-mop-formatted)
 
-$(o)/mop/score/mo-score-mop-formatted: mop/score/mo-score-mop-formatted.sh
-$(o)/mop/score/mo-score-mop: mop/score/mo-score-mop.sh
+$(o)/mop/score/mo-score-mop-formatted: $(s)/mop/score/mo-score-mop-formatted.sh
+$(o)/mop/score/mo-score-mop: $(s)/mop/score/mo-score-mop.sh