Submit: More gnutls fixes

[eval.git] / submit / Makefile

diff --git a/submit/Makefile b/submit/Makefile
index 4b7944a9e2ca127ac9a63307b860311e2a1a1bb1..0fa14ec8687b48a356f4e3eabf506d2a8c1392d1 100644 (file)
--- a/submit/Makefile
+++ b/submit/Makefile
@@ -1,8 +1,8 @@
 # Makefile for MO-Eval submitter
 # (c) 2008 Martin Mares <mj@ucw.cz>
 
-SUBCF=$(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS)
-SUBLF=$(LIBGCRYPT_LIBS) $(LIBGNUTLS_LIBS)
+SUBCF=$(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(GNUTLS_CFLAGS)
+SUBLF=$(LIBGCRYPT_LIBS) $(LIBGNUTLS_LIBS) $(GNUTLS_LIBS)
 
 DIRS+=submit
 SDIR=$(o)/submit
@@ -11,8 +11,6 @@ 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+=$(SUBCF)
 $(SDIR)/submitd: LIBS+=$(SUBLF)
@@ -34,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)
@@ -44,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)