X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/3e3f47ec2fdbfaf0682d9790a99264a4e60e9bf1..f0822345a23524444df900e19b58c0b930e76cbf:/Makefile.in?ds=inline

diff --git a/Makefile.in b/Makefile.in
index 66a3b5c..867245d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -48,6 +48,9 @@ OBJS = stats.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
 all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys onak.conf \
 	$(BACKENDS)
 
+test: onak $(BACKENDS)
+	@./runtests
+
 install: $(PROGS) onak.conf $(BACKENDS)
 	install -d $(DESTDIR)/@bindir@
 	install -d $(DESTDIR)/@libdir@/onak/backends
@@ -74,13 +77,13 @@ keydctl: keydctl.o onak-conf.o ll.o log.o
 	$(CC) $(LDFLAGS) $(PROGS_LDFLAGS_EXTRA) \
 		-o keydctl keydctl.o onak-conf.o ll.o log.o $(LIBS)
 
-libkeydb_db4.so: keydb_db4.o
+libkeydb_db4.so: keydb_db4.o $(CORE_OBJS)
 	$(CC) -shared $(DB4LIBS) -o libkeydb_db4.so keydb_db4.o $(CORE_OBJS)
 
-libkeydb_pg.so: keydb_pg.o
+libkeydb_pg.so: keydb_pg.o $(CORE_OBJS)
 	$(CC) -shared $(PQLIBS) -o libkeydb_pg.so keydb_pg.o $(CORE_OBJS)
 
-libkeydb_%.so: keydb_%.o
+libkeydb_%.so: keydb_%.o $(CORE_OBJS)
 	$(CC) -shared -o $@ $< $(CORE_OBJS)
 
 splitkeys: splitkeys.o $(CORE_OBJS) $(KEYDB_OBJ)
@@ -142,6 +145,7 @@ clean:
 	$(RM) $(PROGS) $(OBJS) Makefile.bak testparse maxpath *.core core \
 		gpgwww.o add.o lookup.o main.o maxpath.o onak.o sixdegrees \
 		sixdegrees.o splitkeys.o stripkey.o onak.conf keyd.o \
+		keydctl.o version.h \
 		$(foreach be,@BACKENDS@,keydb_$(be).o) *.so
 ifeq (x@KEYD@, xyes)
 	$(RM) keyd.o keydb_$(DBTYPE).o
@@ -151,7 +155,16 @@ distclean: clean
 	$(RM) -f Makefile .depend config.log config.status config.h
 	$(RM) -r autom4te.cache
 
-.depend: $(SRCS)
+version.h:
+	@echo '#include "config.h"' > version.h
+	@if [ -e .bzr ]; then \
+		echo "#define ONAK_VERSION PACKAGE_VERSION \"+bzr`bzr revno`\"" \
+		>> version.h; \
+	else \
+		echo "#define ONAK_VERSION PACKAGE_VERSION" >> version.h; \
+	fi
+
+.depend: $(SRCS) version.h
 	rm -f .depend
 	$(MAKEDEPEND) $(CFLAGS) $(SRCS) > .depend