X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=submit%2FMakefile;h=f30f86cff22e6d3e76f824ac6521a4dd1577abe1;hb=f33e36eda1f3334370020f9c24bc14f1a0e09356;hp=7866155972f22fd6e6d3d98a8613a8a0d4179500;hpb=92811b1aa5a791bc776b58afb241a7d93e737604;p=moe.git

diff --git a/submit/Makefile b/submit/Makefile
index 7866155..f30f86c 100644
--- a/submit/Makefile
+++ b/submit/Makefile
@@ -1,21 +1,22 @@
+UCWCF:=$(shell PKG_CONFIG_PATH=$(LIBUCW)/lib/pkgconfig pkg-config --cflags libucw libsh)
+UCWLF:=$(shell PKG_CONFIG_PATH=$(LIBUCW)/lib/pkgconfig pkg-config --libs libucw libsh)
 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)
-LDFLAGS=$(TLSLF)
+CFLAGS+=$(UCWCF) $(TLSCF) $(GCRCF)
+LDLIBS+=$(UCWLF) $(TLSLF)
 
-CC=gcc-4.1.1
-CFLAGS+=-Wno-pointer-sign -Wdisabled-optimization -Wno-missing-field-initializers
-LDFLAGS+=-lpthread	# FIXME: Use libucw without threads
+all: submitd privkey lib
 
-all: submitd connect
-
-submitd: submitd.o commands.o tasks.o lib/libsh.a lib/libucw.a
+submitd: submitd.o commands.o tasks.o
 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: connect.o
 connect.o: connect.c
+privkey: privkey.o
+privkey.o: privkey.c
 
 certs:
 	certtool --generate-privkey --outfile ca-key.pem
@@ -28,6 +29,21 @@ certs:
 	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
+	rm -f submitd connect privkey
+	rm -rf lib .lib-stamp
+
+.PHONY: lib