Add unicode and file parsing test

[moe.git] / submit / Makefile

diff --git a/submit/Makefile b/submit/Makefile
index 9e7e0a6f8cc8a9bac374271a9cd170f8d07c4dcc..f94df309ef18d728ca99e957bede8edf1010c2b2 100644 (file)
--- a/submit/Makefile
+++ b/submit/Makefile
@@ -1,9 +1,8 @@
 # Makefile for MO-Eval submitter
 # (c) 2008 Martin Mares <mj@ucw.cz>
 
 # 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)
+SUBCF=$(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS)
+SUBLF=$(LIBGCRYPT_LIBS) $(LIBGNUTLS_LIBS)

 
 DIRS+=submit
 SDIR=$(o)/submit
 
 DIRS+=submit
 SDIR=$(o)/submit


@@ -12,19 +11,17 @@ SDIR=$(o)/submit
 
 PROGS+=$(addprefix $(SDIR)/,submitd privkey connect)
 
 
 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: $(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: $(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: $(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
 
 CONFIGS+=submitd
 run/cf/submitd: $(SDIR)/submitd.cf


@@ -35,6 +32,8 @@ EXTRA_RUNDIRS+=lib/perl5/MO
 SUBMIT_PERL_MODS=$(o)/submit/Submit.pm
 PROGS+=$(SUBMIT_PERL_MODS)
 
 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)
 ### The submit client and utilities ###
 
 PROGS+=$(addprefix $(SDIR)/,contest create-certs remote-status remote-submit show-submits)


@@ -45,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
 
 $(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)