From 8578967cba7d1deeae6ec4ea516e492e4496cdd2 Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Thu, 15 May 2008 12:21:02 +0200
Subject: [PATCH] Integrated the submitter to the build system.

---
 Makefile                                   |  1 +
 submit/Makefile                            | 69 ++++++++++++----------
 submit/{MO => }/Submit.pm                  |  0
 submit/{contest => contest.pl}             |  0
 submit/{create-certs => create-certs.sh}   |  0
 submit/{remote-status => remote-status.pl} |  0
 submit/{remote-submit => remote-submit.pl} |  0
 submit/{show-submits => show-submits.pl}   |  0
 8 files changed, 38 insertions(+), 32 deletions(-)
 rename submit/{MO => }/Submit.pm (100%)
 rename submit/{contest => contest.pl} (100%)
 rename submit/{create-certs => create-certs.sh} (100%)
 rename submit/{remote-status => remote-status.pl} (100%)
 rename submit/{remote-submit => remote-submit.pl} (100%)
 rename submit/{show-submits => show-submits.pl} (100%)

diff --git a/Makefile b/Makefile
index 79a1193..e183f4c 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,7 @@ include $(s)/box/Makefile
 include $(s)/utils/Makefile
 include $(s)/eval/Makefile
 include $(s)/judge/Makefile
+include $(s)/submit/Makefile
 
 # And finally the default rules of the build system
 include $(s)/build/Makebottom
diff --git a/submit/Makefile b/submit/Makefile
index f30f86c..fe9f0bd 100644
--- a/submit/Makefile
+++ b/submit/Makefile
@@ -1,22 +1,46 @@
-UCWCF:=$(shell PKG_CONFIG_PATH=$(LIBUCW)/lib/pkgconfig pkg-config --cflags libucw libsh)
-UCWLF:=$(shell PKG_CONFIG_PATH=$(LIBUCW)/lib/pkgconfig pkg-config --libs libucw libsh)
+# Makefile for MO-Eval submitter
+# (c) 2008 Martin Mares <mj@ucw.cz>
+
 TLSCF:=$(shell libgnutls-config --cflags)
 TLSLF:=$(shell libgnutls-config --libs)
 GCRCF:=$(shell libgcrypt-config --cflags)
 
-CFLAGS+=$(UCWCF) $(TLSCF) $(GCRCF)
-LDLIBS+=$(UCWLF) $(TLSLF)
+DIRS+=submit
+SDIR=$(o)/submit
+
+### The submit server ###
+
+PROGS+=$(addprefix $(SDIR)/,submitd privkey connect)
+
+$(SHERLOCK_PERL_MODS): PERL_MODULE_DIR=MO
+
+$(SDIR)/submitd: $(addprefix $(SDIR)/,submitd.o commands.o tasks.o) $(LIBUCW) $(LIBSH)
+$(SDIR)/submitd: CFLAGS+=$(TLSCF) $(GCRCF)
+$(SDIR)/submitd: LIBS+=$(TLSLF)
+
+$(SDIR)/connect: $(SDIR)/connect.o $(LIBUCW)
+$(SDIR)/connect: CFLAGS+=$(TLSCF) $(GCRCF)
+$(SDIR)/connect: LIBS+=$(TLSLF)
+
+$(SDIR)/privkey: $(SDIR)/privkey.o $(LIBUCW)
+$(SDIR)/privkey: CFLAGS+=$(TLSCF) $(GCRCF)
+$(SDIR)/privkey: LIBS+=$(TLSLF)
+
+### Submitter perl module ###
 
-all: submitd privkey lib
+EXTRA_RUNDIRS+=lib/perl5/MO
+SUBMIT_PERL_MODS=$(o)/submit/Submit.pm
+PROGS+=$(SUBMIT_PERL_MODS)
 
-submitd: submitd.o commands.o tasks.o
-submitd.o: submitd.c submitd.h
-commands.o: commands.c submitd.h
-tasks.o: tasks.c submitd.h
-connect: connect.o
-connect.o: connect.c
-privkey: privkey.o
-privkey.o: privkey.c
+### The submit client and utilities ###
+
+PROGS+=$(addprefix $(SDIR)/,contest create-certs remote-status remote-submit show-submits)
+
+$(SDIR)/contest: $(s)/submit/contest.pl
+$(SDIR)/create-certs: $(s)/submit/create-certs.sh
+$(SDIR)/remote-status: $(s)/submit/remote-status.pl
+$(SDIR)/remote-submit: $(s)/submit/remote-submit.pl
+$(SDIR)/show-submits: $(s)/submit/show-submits.pl
 
 certs:
 	certtool --generate-privkey --outfile ca-key.pem
@@ -28,22 +52,3 @@ certs:
 	certtool --generate-request --load-privkey client-key.pem --outfile client-req.pem --template client-cert.tpl
 	certtool --generate-certificate --load-request client-req.pem --outfile client-cert.pem --load-ca-certificate ca-cert.pem --load-ca-privkey ca-key.pem --template client-cert.tpl
 	# Beware of serial numbers
-
-lib: .lib-stamp lib/perl5/MO/Submit.pm lib/perl5/Sherlock/Object.pm
-
-.lib-stamp:
-	mkdir -p lib/perl5/{MO,Sherlock}
-	touch .lib-stamp
-
-lib/perl5/MO/Submit.pm: MO/Submit.pm
-	cp $^ $@
-
-lib/perl5/Sherlock/Object.pm: $(LIBUCW)/lib/perl5/Sherlock/Object.pm
-	cp $^ $@
-
-clean:
-	rm -f `find . -name "*~" -or -name "*.[oa]" -or -name "\#*\#" -or -name TAGS -or -name core -or -name .depend -or -name .#*`
-	rm -f submitd connect privkey
-	rm -rf lib .lib-stamp
-
-.PHONY: lib
diff --git a/submit/MO/Submit.pm b/submit/Submit.pm
similarity index 100%
rename from submit/MO/Submit.pm
rename to submit/Submit.pm
diff --git a/submit/contest b/submit/contest.pl
similarity index 100%
rename from submit/contest
rename to submit/contest.pl
diff --git a/submit/create-certs b/submit/create-certs.sh
similarity index 100%
rename from submit/create-certs
rename to submit/create-certs.sh
diff --git a/submit/remote-status b/submit/remote-status.pl
similarity index 100%
rename from submit/remote-status
rename to submit/remote-status.pl
diff --git a/submit/remote-submit b/submit/remote-submit.pl
similarity index 100%
rename from submit/remote-submit
rename to submit/remote-submit.pl
diff --git a/submit/show-submits b/submit/show-submits.pl
similarity index 100%
rename from submit/show-submits
rename to submit/show-submits.pl
-- 
2.39.2