Makefile cleanup.

[eval.git] / submit / Makefile

diff --git a/submit/Makefile b/submit/Makefile
index d5fe54a9018a03bfc9ca547c25aa9f73ebb1a98b..5e48d95b34d9820db53a16583e0e8c3bb438e35f 100644 (file)
--- a/submit/Makefile
+++ b/submit/Makefile
@@ -1,13 +1,24 @@
 TLSCF:=$(shell libgnutls-config --cflags)
 TLSLF:=$(shell libgnutls-config --libs)
+GCRCF:=$(shell libgcrypt-config --cflags)
 
-CFLAGS=-O2 -Iinclude -g -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes -Wundef -Wredundant-decls -std=gnu99 $(TLSCF)
+CFLAGS=-O2 -Iinclude -g -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes -Wundef -Wredundant-decls -std=gnu99 $(TLSCF) $(GCRCF)
 LDFLAGS=$(TLSLF)
 
-all: submitd
+CC=gcc-4.1.1
+CFLAGS+=-Wno-pointer-sign -Wdisabled-optimization -Wno-missing-field-initializers
+LDFLAGS+=-lpthread     # FIXME: Use libucw without threads
 
-submitd: submitd.o lib/libucw.a lib/libsh.a
-submitd.o: submitd.c
+all: submitd privkey
+
+submitd: submitd.o commands.o tasks.o lib/libsh.a lib/libucw.a
+submitd.o: submitd.c submitd.h
+commands.o: commands.c submitd.h
+tasks.o: tasks.c submitd.h
+connect: connect.o lib/libucw.a
+connect.o: connect.c
+privkey: privkey.o lib/libucw.a
+privkey.o: privkey.c
 
 certs:
        certtool --generate-privkey --outfile ca-key.pem
@@ -15,8 +26,11 @@ 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
+       rm -f submitd connect privkey