# Can be "pg" for Postgresql, "file" for flat files or "db2" for pksd db2 style.
DBTYPE = @DBTYPE@
#
-LIBS = @LIBS@
+LIBS = @LIBS@ @NETTLE_LIBS@
DB4LIBS = @DB4LIBS@
+CURLLIBS = @LIBCURL@
#MAKEDEPEND = makedepend -f- --
MAKEDEPEND = $(CC) -MM
prefix ?= @prefix@
exec_prefix ?= @exec_prefix@
-PROGS = add lookup gpgwww onak splitkeys onak-mail.pl stripkey
-CORE_OBJS = armor.o charfuncs.o decodekey.o getcgi.o hash.o \
- keyid.o keyindex.o ll.o mem.o onak-conf.o parsekey.o sha1.o md5.o \
+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
+ifeq (x@NETTLE_LIBS@, x)
+CORE_OBJS += md5.o sha1.o
+endif
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 \
- wordlist.c cleankey.c cleanup.c keyarray.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 \
$(foreach be,@BACKENDS@,keydb_$(be).c)
PROGS_LDFLAGS_EXTRA =
ifeq (x@KEYD@, xyes)
-PROGS += keyd
+PROGS += keyd keydctl
KEYDB_OBJ = keydb_keyd.o
-SRCS += keyd.c keydb_keyd.c
+SRCS += keyd.c keydb_keyd.c keydctl.c
else
KEYDB_OBJ = keydb_$(DBTYPE).o
endif
ifeq (x@DBTYPE@, xdynamic)
LIBS += -ldl
BACKENDS = $(foreach be,@BACKENDS@,libkeydb_$(be).so)
-PROGS += keyd
+PROGS += keyd keydctl
PROGS_LDFLAGS_EXTRA = -rdynamic
-SRCS += keyd.c
+SRCS += keyd.c keydctl.c
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
install: $(PROGS) onak.conf $(BACKENDS)
install -d $(DESTDIR)/@bindir@
install onak-mail.pl $(DESTDIR)/@libdir@/onak
install onak splitkeys $(DESTDIR)/@bindir@
install onak.1 splitkeys.1 $(DESTDIR)/@mandir@/man1
- install keyd.8 onak-mail.pl.8 $(DESTDIR)/@mandir@/man8
+ install keyd.8 keydctl.8 onak-mail.pl.8 $(DESTDIR)/@mandir@/man8
ifeq (x@DBTYPE@, xdynamic)
install $(BACKENDS) $(DESTDIR)/@libdir@/onak/backends
install -d $(DESTDIR)/@sbindir@
install keyd $(DESTDIR)/@sbindir@
+ install keydctl $(DESTDIR)/@bindir@
endif
keyd: keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o
$(CC) $(LDFLAGS) $(PROGS_LDFLAGS_EXTRA) \
-o keyd keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o $(LIBS)
-libkeydb_db4.so: keydb_db4.o
- $(CC) -shared $(DB4LIBS) -o libkeydb_db4.so keydb_db4.o $(CORE_OBJS)
+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)
+
+libkeydb_hkp.so: keydb_hkp.o $(CORE_OBJS)
+ $(CC) $(LDFLAGS) -shared $(CURLLIBS) -o libkeydb_hkp.so keydb_hkp.o $(CORE_OBJS)
-libkeydb_pg.so: keydb_pg.o
- $(CC) -shared $(PQLIBS) -o libkeydb_pg.so keydb_pg.o $(CORE_OBJS)
+libkeydb_pg.so: keydb_pg.o $(CORE_OBJS)
+ $(CC) $(LDFLAGS) -shared $(PQLIBS) -o libkeydb_pg.so keydb_pg.o $(CORE_OBJS)
-libkeydb_%.so: keydb_%.o
- $(CC) -shared -o $@ $< $(CORE_OBJS)
+libkeydb_%.so: keydb_%.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) \
$(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)
$(CC) $(LDFLAGS) -o gpgwww gpgwww.o $(OBJS) $(LIBS) \
$(PROGS_LDFLAGS_EXTRA)
+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) \
$(KEYDB_OBJ) $(LIBS) $(PROGS_LDFLAGS_EXTRA)
$(CC) $(CFLAGS) -DCONFIGFILE=\"@sysconfdir@/onak.conf\" \
-DDBFUNCS=keydb_@DBTYPE@_funcs -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
+
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
$(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 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
$(RM) -f Makefile .depend config.log config.status config.h
$(RM) -r autom4te.cache
-.depend: $(SRCS)
+doxygen-docs: *.c *.h Doxyfile
+ doxygen
+
+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
projects / onak.git / blobdiff