X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=submit%2FMakefile;h=9e7e0a6f8cc8a9bac374271a9cd170f8d07c4dcc;hb=1720c3b23dc805b9af4862a09b0d2f17859b9999;hp=d5fe54a9018a03bfc9ca547c25aa9f73ebb1a98b;hpb=9422910e55d1c798df7c5e377db4d9ef4d8a9bc3;p=moe.git

diff --git a/submit/Makefile b/submit/Makefile
index d5fe54a..9e7e0a6 100644
--- a/submit/Makefile
+++ b/submit/Makefile
@@ -1,13 +1,49 @@
+# 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)
+
+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)
 
-CFLAGS=-O2 -Iinclude -g -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes -Wundef -Wredundant-decls -std=gnu99 $(TLSCF)
-LDFLAGS=$(TLSLF)
+$(SDIR)/connect: $(SDIR)/connect.o $(LIBUCW)
+$(SDIR)/connect: CFLAGS+=$(TLSCF) $(GCRCF)
+$(SDIR)/connect: LIBS+=$(TLSLF)
 
-all: submitd
+$(SDIR)/privkey: $(SDIR)/privkey.o $(LIBUCW)
+$(SDIR)/privkey: CFLAGS+=$(TLSCF) $(GCRCF)
+$(SDIR)/privkey: LIBS+=$(TLSLF)
 
-submitd: submitd.o lib/libucw.a lib/libsh.a
-submitd.o: submitd.c
+CONFIGS+=submitd
+run/cf/submitd: $(SDIR)/submitd.cf
+
+### Submitter perl module ###
+
+EXTRA_RUNDIRS+=lib/perl5/MO
+SUBMIT_PERL_MODS=$(o)/submit/Submit.pm
+PROGS+=$(SUBMIT_PERL_MODS)
+
+### 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
@@ -15,8 +51,7 @@ certs:
 	certtool --generate-privkey --outfile server-key.pem
 	certtool --generate-request --load-privkey server-key.pem --outfile server-req.pem --template server-cert.tpl
 	certtool --generate-certificate --load-request server-req.pem --outfile server-cert.pem --load-ca-certificate ca-cert.pem --load-ca-privkey ca-key.pem --template server-cert.tpl
+	certtool --generate-privkey --outfile client-key.pem
+	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
-
-clean:
-	rm -f `find . -name "*~" -or -name "*.[oa]" -or -name "\#*\#" -or -name TAGS -or -name core -or -name .depend -or -name .#*`
-	rm -f submitd