X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=submit%2FMakefile;h=8c0e53c3f1854835766dd9fea7658ae960111eb5;hb=4c4549c822cca499e0815170c41587badb6b2a0f;hp=fe9f0bd43f8a1699a75f7ec8a18bdcf5757d99e0;hpb=8578967cba7d1deeae6ec4ea516e492e4496cdd2;p=eval.git

diff --git a/submit/Makefile b/submit/Makefile
index fe9f0bd..8c0e53c 100644
--- a/submit/Makefile
+++ b/submit/Makefile
@@ -1,9 +1,8 @@
-# Makefile for MO-Eval submitter
+# Makefile for Moe submitter
 # (c) 2008 Martin Mares <mj@ucw.cz>
 
-TLSCF:=$(shell libgnutls-config --cflags)
-TLSLF:=$(shell libgnutls-config --libs)
-GCRCF:=$(shell libgcrypt-config --cflags)
+SUBCF=$(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(GNUTLS_CFLAGS)
+SUBLF=$(LIBGCRYPT_LIBS) $(LIBGNUTLS_LIBS) $(GNUTLS_LIBS)
 
 DIRS+=submit
 SDIR=$(o)/submit
@@ -12,19 +11,20 @@ SDIR=$(o)/submit
 
 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)/submitd: CFLAGS+=$(SUBCF)
+$(SDIR)/submitd: LIBS+=$(SUBLF)
 
 $(SDIR)/connect: $(SDIR)/connect.o $(LIBUCW)
-$(SDIR)/connect: CFLAGS+=$(TLSCF) $(GCRCF)
-$(SDIR)/connect: LIBS+=$(TLSLF)
+$(SDIR)/connect: CFLAGS+=$(SUBCF)
+$(SDIR)/connect: LIBS+=$(SUBLF)
 
 $(SDIR)/privkey: $(SDIR)/privkey.o $(LIBUCW)
-$(SDIR)/privkey: CFLAGS+=$(TLSCF) $(GCRCF)
-$(SDIR)/privkey: LIBS+=$(TLSLF)
+$(SDIR)/privkey: CFLAGS+=$(SUBCF)
+$(SDIR)/privkey: LIBS+=$(SUBLF)
+
+CONFIGS+=submitd
+run/cf/submitd: $(SDIR)/submitd.cf
 
 ### Submitter perl module ###
 
@@ -32,6 +32,8 @@ EXTRA_RUNDIRS+=lib/perl5/MO
 SUBMIT_PERL_MODS=$(o)/submit/Submit.pm
 PROGS+=$(SUBMIT_PERL_MODS)
 
+$(SUBMIT_PERL_MODS): PERL_MODULE_DIR=MO
+
 ### The submit client and utilities ###
 
 PROGS+=$(addprefix $(SDIR)/,contest create-certs remote-status remote-submit show-submits)
@@ -42,13 +44,4 @@ $(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
-	certtool --generate-privkey --outfile ca-key.pem --template ca-cert.tpl
-	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
+DATAFILES+=$(addprefix $(SDIR)/,ca-cert.tpl client-cert.tpl server-cert.tpl)