X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=submit%2FMakefile;h=9e7e0a6f8cc8a9bac374271a9cd170f8d07c4dcc;hb=5df9d386bdbb242b44f055b3db02e145260db073;hp=b1b3b116895fe836ef165ec072fb39a9f6427564;hpb=73bbb717e3a95e1b504f97f7f06287500c143669;p=moe.git

diff --git a/submit/Makefile b/submit/Makefile
index b1b3b11..9e7e0a6 100644
--- a/submit/Makefile
+++ b/submit/Makefile
@@ -1,21 +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)
 
-CFLAGS+=-I$(LIBUCW)/include $(TLSCF) $(GCRCF)
-LDFLAGS+=$(TLSLF)
-LDFLAGS+=-lpthread	# FIXME: Use libucw without threads
+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)
+
+CONFIGS+=submitd
+run/cf/submitd: $(SDIR)/submitd.cf
+
+### 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 $(LIBUCW)/lib/libsh.a $(LIBUCW)/lib/libucw.a
-submitd.o: submitd.c submitd.h
-commands.o: commands.c submitd.h
-tasks.o: tasks.c submitd.h
-connect: connect.o $(LIBUCW)/lib/libucw.a
-connect.o: connect.c
-privkey: privkey.o $(LIBUCW)/lib/libucw.a
-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
@@ -27,22 +55,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