Add de-duplication of subkeys on a key

[onak.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 403a2704219c2f9dd08481caff07e12e808431cc..d23f50accf051d96bd160bb29dc1724150d77b28 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,20 +6,23 @@ CC = @CC@
 CFLAGS += @CFLAGS@ -Wall -pedantic -fPIC
 # Uncomment to enable profiling.
 LDFLAGS += @LDFLAGS@
-# Can be "pg" for Postgresql, "file" for flat files or "db2" for pksd db2 style.
+# Can be "pg" for Postgresql, "file" for flat files or "db4" for Berkeley DB.
 DBTYPE = @DBTYPE@
 #
 LIBS = @LIBS@ @NETTLE_LIBS@
 DB4LIBS = @DB4LIBS@
+CURLLIBS = @LIBCURL@
 #MAKEDEPEND = makedepend -f- -- 
 MAKEDEPEND = $(CC) -MM
 prefix ?= @prefix@
 exec_prefix ?= @exec_prefix@
 
-PROGS = add lookup hashquery gpgwww onak splitkeys onak-mail.pl stripkey
+PROGS = add lookup hashquery gpgwww onak splitkeys onak-mail.pl stripkey \
+       wotsap
 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
+       log.o photoid.o wordlist.o cleanup.o merge.o sendsync.o keyarray.o \
+       sha1x.o
 ifeq (x@NETTLE_LIBS@, x)
 CORE_OBJS += md5.o sha1.o
 endif
@@ -27,6 +30,7 @@ SRCS = armor.c parsekey.c merge.c keyid.c md5.c sha1.c main.c getcgi.c mem.c \
        keyindex.c stats.c lookup.c add.c keydb_$(DBTYPE).c ll.c hash.c \
        gpgwww.c onak-conf.c charfuncs.c sendsync.c log.c photoid.c sigcheck.c \
        wordlist.c cleankey.c cleanup.c keyarray.c hashquery.c marshal.c \
+       sha1x.c \
        $(foreach be,@BACKENDS@,keydb_$(be).c)
 PROGS_LDFLAGS_EXTRA =
 
@@ -49,7 +53,7 @@ endif
 OBJS = stats.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
 
 all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys onak.conf \
-       $(BACKENDS)
+       wotsap $(BACKENDS)
 
 test: onak $(BACKENDS)
        @./runtests
@@ -61,7 +65,7 @@ install: $(PROGS) onak.conf $(BACKENDS)
        install -d $(DESTDIR)/@mandir@/man1
        install -d $(DESTDIR)/@mandir@/man8
        install -d $(DESTDIR)/@sysconfdir@
-       install onak-mail.pl $(DESTDIR)/@libdir@/onak
+       install -m 755 onak-mail.pl $(DESTDIR)/@libdir@/onak
        install onak splitkeys $(DESTDIR)/@bindir@
        install onak.1 splitkeys.1 $(DESTDIR)/@mandir@/man1
        install keyd.8 keydctl.8 onak-mail.pl.8 $(DESTDIR)/@mandir@/man8
@@ -74,20 +78,24 @@ 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) -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 -o libkeydb_hkp.so keydb_hkp.o $(CURLLIBS) $(CORE_OBJS)
 
 libkeydb_pg.so: keydb_pg.o $(CORE_OBJS)
-       $(CC) -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) -shared -o $@ $< $(CORE_OBJS)
+       $(CC) $(LDFLAGS) -shared -o $@ $< $(CORE_OBJS)
 
 splitkeys: splitkeys.o $(CORE_OBJS) $(KEYDB_OBJ)
        $(CC) $(LDFLAGS) -o splitkeys splitkeys.o $(CORE_OBJS) $(KEYDB_OBJ) \
@@ -105,6 +113,10 @@ sixdegrees: sixdegrees.o $(OBJS)
        $(CC) $(LDFLAGS) -o sixdegrees sixdegrees.o $(OBJS) $(LIBS) \
                $(PROGS_LDFLAGS_EXTRA)
 
+wotsap: wotsap.o $(OBJS)
+       $(CC) $(LDFLAGS) -o wotsap wotsap.o $(OBJS) $(LIBS) \
+               $(PROGS_LDFLAGS_EXTRA)
+
 stripkey: stripkey.o $(OBJS)
        $(CC) $(LDFLAGS) -o stripkey stripkey.o $(OBJS) $(LIBS) \
                $(PROGS_LDFLAGS_EXTRA)
@@ -131,28 +143,27 @@ onak: onak.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
 
 onak-conf.o: onak-conf.c onak-conf.h
        $(CC) $(CFLAGS) -DCONFIGFILE=\"@sysconfdir@/onak.conf\" \
-               -DDBFUNCS=keydb_@DBTYPE@_funcs -c onak-conf.c
+               -DDBINIT=keydb_@DBTYPE@_init -c onak-conf.c
 
 # HACK: onak-conf.o needs to be able to see keydb_@DBTYPE@_funcs, but
 # keydctl doesn't want to link against the DB stuff. To be fixed more cleanly.
 keydctl.o: keydctl.c keyd.h
-       $(CC) $(CFLAGS) -DDBFUNCS=keydb_@DBTYPE@_funcs -c keydctl.c
+       $(CC) $(CFLAGS) -DDBINIT=keydb_@DBTYPE@_init -c keydctl.c
 
-onak-mail.pl: onak-mail.pl.in
-       sed 's:@CONFIG@:@sysconfdir@/onak.conf:g' < onak-mail.pl.in > onak-mail.pl
-       chmod +x onak-mail.pl
-
-onak.conf: onak.conf.in
+%: %.in
        sed -e 's:@BINDIR@:@bindir@:g' \
+               -e 's:@CONFIG@:@sysconfdir@/onak.conf:g' \
                -e 's:@LIBDIR@:@libdir@:g' \
+               -e 's:@SBINDIR@:@sbindir@:g' \
                -e 's:@STATEDIR@:@localstatedir@:g' \
-               < onak.conf.in > onak.conf
+               < $< > $@
 
 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 hashquery.o version.h \
+               keydctl.o hashquery.o wotsap.o version.h \
+               TAGS cscope.out cscope.files \
                $(foreach be,@BACKENDS@,keydb_$(be).o) *.so
 ifeq (x@KEYD@, xyes)
        $(RM) keyd.o keydb_$(DBTYPE).o
@@ -162,6 +173,9 @@ distclean: clean
        $(RM) -f Makefile .depend config.log config.status config.h
        $(RM) -r autom4te.cache
 
+doxygen-docs: *.c *.h Doxyfile
+       doxygen
+
 version.h:
        @echo '#include "config.h"' > version.h
        @if [ -e .bzr ]; then \