X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=Makefile.in;h=ceb936783b191c5a758ff02346c655149fd50c36;hb=adc800dbc424a1e246dd4a82a0c2e88eeda25531;hp=c5725935e50ca98387bc59f20d7c80d6407dabf4;hpb=5c137b7d6af54fb54dfe13b65c933b5b6a4c764c;p=onak.git

diff --git a/Makefile.in b/Makefile.in
index c572593..ceb9367 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -22,7 +22,7 @@ PROGS = add lookup hashquery gpgwww onak splitkeys onak-mail.pl stripkey \
 CORE_OBJS = armor.o charfuncs.o decodekey.o getcgi.o hash.o marshal.o \
 	keyid.o keyindex.o ll.o mem.o onak-conf.o parsekey.o sigcheck.o \
 	log.o photoid.o wordlist.o cleanup.o merge.o sendsync.o keyarray.o \
-	sha1x.o
+	sha1x.o cleankey.o
 ifeq (x@NETTLE_LIBS@, x)
 CORE_OBJS += md5.o sha1.o
 endif
@@ -50,15 +50,23 @@ PROGS_LDFLAGS_EXTRA = -rdynamic
 SRCS += keyd.c keydctl.c
 endif
 
-OBJS = stats.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
+ifeq (x@GOSSIP@, xyes)
+SRCS += gossip-server.c
+GOSSIP_OBJS = gossip-server.o
+else
+GOSSIP_OBJS =
+endif
+
+OBJS = stats.o $(CORE_OBJS) $(KEYDB_OBJ) $(GOSSIP_OBJS)
 
-all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys onak.conf \
+all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys onak.ini \
 	wotsap $(BACKENDS)
 
 test: onak $(BACKENDS)
+	perl -cw onak-mail.pl
 	@./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
@@ -76,23 +84,23 @@ ifeq (x@DBTYPE@, xdynamic)
 	install keydctl $(DESTDIR)/@bindir@
 endif
 
-keyd: keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o
+keyd: keyd.o $(CORE_OBJS) $(GOSSIP_OBJS) keydb_$(DBTYPE).o
 	$(CC) $(LDFLAGS) $(PROGS_LDFLAGS_EXTRA) \
-		-o keyd keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o $(LIBS) \
-		@SYSTEMD_LIBS@
+		-o keyd keyd.o $(CORE_OBJS) $(GOSSIP_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)
@@ -129,20 +137,20 @@ hashquery: hashquery.o $(CORE_OBJS) $(KEYDB_OBJ)
 	$(CC) $(LDFLAGS) -o hashquery hashquery.o $(CORE_OBJS) \
 		$(KEYDB_OBJ) $(LIBS) $(PROGS_LDFLAGS_EXTRA)
 
-lookup: lookup.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
-	$(CC) $(LDFLAGS) -o lookup lookup.o cleankey.o $(CORE_OBJS) \
+lookup: lookup.o $(CORE_OBJS) $(KEYDB_OBJ)
+	$(CC) $(LDFLAGS) -o lookup lookup.o $(CORE_OBJS) \
 		$(KEYDB_OBJ) $(LIBS) $(PROGS_LDFLAGS_EXTRA)
 
-add: add.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
-	$(CC) $(LDFLAGS) -o add add.o cleankey.o \
+add: add.o $(CORE_OBJS) $(KEYDB_OBJ)
+	$(CC) $(LDFLAGS) -o add add.o \
 		$(CORE_OBJS) $(KEYDB_OBJ) $(LIBS) $(PROGS_LDFLAGS_EXTRA)
 
-onak: onak.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
-	$(CC) $(LDFLAGS) -o onak onak.o cleankey.o \
+onak: onak.o $(CORE_OBJS) $(KEYDB_OBJ)
+	$(CC) $(LDFLAGS) -o onak onak.o \
 		$(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
@@ -152,8 +160,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' \
 		< $< > $@
@@ -161,7 +171,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
@@ -176,10 +186,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; \