Use the normal package of stand-alone Holmes libraries.

diff --git a/Makefile b/Makefile
index 7bc8e4a229727e3956673ce202df8cf8f04e499a..8598a419f807bd162b0ec7c2156bf44cd41e8e48 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ CFLAGS+=-Wno-pointer-sign -Wdisabled-optimization -Wno-missing-field-initializer
 
 # Comment out if you do not wish to build remote submit utilities
 SUBMIT=submit
-LIBUCW:=$(shell cd ../libucw && pwd)
+LIBUCW:=$(shell cd ../holmes-libs-3.12/run && pwd)
 
 export LIBUCW CFLAGS LDFLAGS DEBUG
 

diff --git a/README b/README
index e8f92202a4630073e4eebfbe9e9bc3075757fd14..972a6af0b8098322c7d7b1e5dbe0165b3d949949 100644 (file)
--- a/README
+++ b/README
@@ -18,3 +18,12 @@ Public License version 2.
 
 If you have any suggestions, bug reports or improvements you would like to share
 with others, please send them to mj@ucw.cz.
+
+
+** How to compile the submission system **
+
+First, unpack holmes-libs-3.12, configure it and run make. You can build a thinner
+version with `./configure default.cfg -CONFIG_IMAGES -CONFIG_UCW_THREADS'.
+
+Then uncomment the "SUBMIT" line in the top-level Makefile and let LIBUCW
+point to the compiled Holmes libraries.

diff --git a/submit/Makefile b/submit/Makefile
index b1b3b116895fe836ef165ec072fb39a9f6427564..9ccf005524ed597d541afb8f9a2f92b6b68776b3 100644 (file)
--- a/submit/Makefile
+++ b/submit/Makefile
@@ -1,20 +1,21 @@
+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+=-I$(LIBUCW)/include $(TLSCF) $(GCRCF)
-LDFLAGS+=$(TLSLF)
-LDFLAGS+=-lpthread     # FIXME: Use libucw without threads
+CFLAGS+=$(UCWCF) $(TLSCF) $(GCRCF)
+LDFLAGS+=$(UCWLF) $(TLSLF)
 
 all: submitd privkey lib
 
-submitd: submitd.o commands.o tasks.o $(LIBUCW)/lib/libsh.a $(LIBUCW)/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 $(LIBUCW)/lib/libucw.a
+connect: connect.o
 connect.o: connect.c
-privkey: privkey.o $(LIBUCW)/lib/libucw.a
+privkey: privkey.o
 privkey.o: privkey.c
 
 certs: