X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=Makefile.in;h=28e93c9d6829b033fea4e36a7d7d23e33497277b;hb=f46771092d60993b448f422920fa3afec1a3e9ec;hp=c35db1aba2e26d0727001d2a69b607b5bcaef8ce;hpb=5417cdd421260e2263e165ec3cbefe8fea00551d;p=onak.git

diff --git a/Makefile.in b/Makefile.in
index c35db1a..28e93c9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -52,13 +52,13 @@ endif
 
 OBJS = stats.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
 
-all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys onak.conf \
+all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys onak.ini \
 	wotsap $(BACKENDS)
 
 test: onak $(BACKENDS)
 	@./runtests
 
-install: $(PROGS) onak.conf $(BACKENDS)
+install: $(PROGS) onak.ini $(BACKENDS)
 	install -d $(DESTDIR)/@bindir@
 	install -d $(DESTDIR)/@libdir@/onak/backends
 	install -d $(DESTDIR)/@localstatedir@/lib/onak
@@ -78,20 +78,21 @@ endif
 
 keyd: keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o
 	$(CC) $(LDFLAGS) $(PROGS_LDFLAGS_EXTRA) \
-		-o keyd keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o $(LIBS)
+		-o keyd keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o $(LIBS) \
+		@SYSTEMD_LIBS@
 
 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 $(CORE_OBJS)
-	$(CC) $(LDFLAGS) -shared $(DB4LIBS) -o libkeydb_db4.so keydb_db4.o $(CORE_OBJS)
+	$(CC) $(LDFLAGS) -shared -o libkeydb_db4.so keydb_db4.o $(DB4LIBS) $(CORE_OBJS)
 
 libkeydb_hkp.so: keydb_hkp.o $(CORE_OBJS)
-	$(CC) $(LDFLAGS) -shared $(CURLLIBS) -o libkeydb_hkp.so keydb_hkp.o $(CORE_OBJS)
+	$(CC) $(LDFLAGS) -shared -o libkeydb_hkp.so keydb_hkp.o $(CURLLIBS) $(CORE_OBJS)
 
 libkeydb_pg.so: keydb_pg.o $(CORE_OBJS)
-	$(CC) $(LDFLAGS) -shared $(PQLIBS) -o libkeydb_pg.so keydb_pg.o $(CORE_OBJS)
+	$(CC) $(LDFLAGS) -shared -o libkeydb_pg.so keydb_pg.o $(PQLIBS) $(CORE_OBJS)
 
 libkeydb_%.so: keydb_%.o $(CORE_OBJS)
 	$(CC) $(LDFLAGS) -shared -o $@ $< $(CORE_OBJS)
@@ -141,7 +142,7 @@ onak: onak.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
 		$(CORE_OBJS) $(KEYDB_OBJ) $(LIBS) $(PROGS_LDFLAGS_EXTRA)
 
 onak-conf.o: onak-conf.c onak-conf.h
-	$(CC) $(CFLAGS) -DCONFIGFILE=\"@sysconfdir@/onak.conf\" \
+	$(CC) $(CFLAGS) -DCONFIGDIR=\"@sysconfdir@\" \
 		-DDBINIT=keydb_@DBTYPE@_init -c onak-conf.c
 
 # HACK: onak-conf.o needs to be able to see keydb_@DBTYPE@_funcs, but
@@ -151,8 +152,10 @@ keydctl.o: keydctl.c keyd.h
 
 %: %.in
 	sed -e 's:@BINDIR@:@bindir@:g' \
-		-e 's:@CONFIG@:@sysconfdir@/onak.conf:g' \
+		-e 's:@CONFIG@:@sysconfdir@/onak.ini:g' \
+		-e 's:@CONFIGOLD@:@sysconfdir@/onak.conf:g' \
 		-e 's:@LIBDIR@:@libdir@:g' \
+		-e 's:@RUNDIR@:@runstatedir@:g' \
 		-e 's:@SBINDIR@:@sbindir@:g' \
 		-e 's:@STATEDIR@:@localstatedir@:g' \
 		< $< > $@
@@ -160,7 +163,7 @@ keydctl.o: keydctl.c keyd.h
 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 \
+		sixdegrees.o splitkeys.o stripkey.o onak.ini keyd.o \
 		keydctl.o hashquery.o wotsap.o version.h \
 		TAGS cscope.out cscope.files \
 		$(foreach be,@BACKENDS@,keydb_$(be).o) *.so
@@ -175,10 +178,10 @@ distclean: clean
 doxygen-docs: *.c *.h Doxyfile
 	doxygen
 
-version.h:
+version.h: $(SRCS)
 	@echo '#include "config.h"' > version.h
-	@if [ -e .bzr ]; then \
-		echo "#define ONAK_VERSION PACKAGE_VERSION \"+bzr`bzr revno`\"" \
+	@if [ -e .git ]; then \
+		echo "#define ONAK_VERSION \"`git describe --tags --dirty | cut -d - -f 2-`\"" \
 		>> version.h; \
 	else \
 		echo "#define ONAK_VERSION PACKAGE_VERSION" >> version.h; \