Prevent read_openpgp_stream from returning empty packets

[onak.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 1fb16d9426478d0100128c3f07ce4e6f44085aa6..b952ff0c578875ec3f3bcd61a2192a32ee89e8ce 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,7 +9,7 @@ LDFLAGS += @LDFLAGS@
 # 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@
 #MAKEDEPEND = makedepend -f- -- 
 MAKEDEPEND = $(CC) -MM
@@ -18,11 +18,14 @@ exec_prefix ?= @exec_prefix@
 
 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 sha1.o md5.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 \
+       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 =
@@ -149,7 +152,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 \
+               keydctl.o hashquery.o version.h \
                $(foreach be,@BACKENDS@,keydb_$(be).o) *.so
 ifeq (x@KEYD@, xyes)
        $(RM) keyd.o keydb_$(DBTYPE).o
@@ -159,6 +162,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 \