From 3489d81b2eb9ea723e10de8c12e8a07908d4a82b Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Fri, 17 Aug 2007 14:49:08 +0200 Subject: [PATCH] Use the normal package of stand-alone Holmes libraries. --- Makefile | 2 +- README | 9 +++++++++ submit/Makefile | 13 +++++++------ 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 7bc8e4a..8598a41 100644 --- 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 e8f9220..972a6af 100644 --- 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 b1b3b11..9ccf005 100644 --- 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: -- 2.39.2