Add /pks/hashquery

[onak.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 4ec39dad8fbbc4b71da02ba3191010ee8f6b9638..1fb16d9426478d0100128c3f07ce4e6f44085aa6 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,14 +16,14 @@ MAKEDEPEND = $(CC) -MM
 prefix ?= @prefix@
 exec_prefix ?= @exec_prefix@
 
 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 \
+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 \
        log.o photoid.o wordlist.o cleanup.o merge.o sendsync.o keyarray.o
 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 \
        keyid.o keyindex.o ll.o mem.o onak-conf.o parsekey.o sha1.o md5.o \
        log.o photoid.o wordlist.o cleanup.o merge.o sendsync.o keyarray.o
 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 \
+       wordlist.c cleankey.c cleanup.c keyarray.c hashquery.c marshal.c \

        $(foreach be,@BACKENDS@,keydb_$(be).c)
 PROGS_LDFLAGS_EXTRA =
 
        $(foreach be,@BACKENDS@,keydb_$(be).c)
 PROGS_LDFLAGS_EXTRA =
 


@@ -48,6 +48,9 @@ OBJS = stats.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
 all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys onak.conf \
        $(BACKENDS)
 
 all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys onak.conf \
        $(BACKENDS)
 

+test: onak $(BACKENDS)
+       @./runtests
+

 install: $(PROGS) onak.conf $(BACKENDS)
        install -d $(DESTDIR)/@bindir@
        install -d $(DESTDIR)/@libdir@/onak/backends
 install: $(PROGS) onak.conf $(BACKENDS)
        install -d $(DESTDIR)/@bindir@
        install -d $(DESTDIR)/@libdir@/onak/backends


@@ -74,13 +77,13 @@ 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)
 
        $(CC) $(LDFLAGS) $(PROGS_LDFLAGS_EXTRA) \
                -o keydctl keydctl.o onak-conf.o ll.o log.o $(LIBS)
 

-libkeydb_db4.so: keydb_db4.o
+libkeydb_db4.so: keydb_db4.o $(CORE_OBJS)

        $(CC) -shared $(DB4LIBS) -o libkeydb_db4.so keydb_db4.o $(CORE_OBJS)
 
        $(CC) -shared $(DB4LIBS) -o libkeydb_db4.so keydb_db4.o $(CORE_OBJS)
 

-libkeydb_pg.so: keydb_pg.o
+libkeydb_pg.so: keydb_pg.o $(CORE_OBJS)

        $(CC) -shared $(PQLIBS) -o libkeydb_pg.so keydb_pg.o $(CORE_OBJS)
 
        $(CC) -shared $(PQLIBS) -o libkeydb_pg.so keydb_pg.o $(CORE_OBJS)
 

-libkeydb_%.so: keydb_%.o
+libkeydb_%.so: keydb_%.o $(CORE_OBJS)

        $(CC) -shared -o $@ $< $(CORE_OBJS)
 
 splitkeys: splitkeys.o $(CORE_OBJS) $(KEYDB_OBJ)
        $(CC) -shared -o $@ $< $(CORE_OBJS)
 
 splitkeys: splitkeys.o $(CORE_OBJS) $(KEYDB_OBJ)


@@ -107,6 +110,10 @@ gpgwww: gpgwww.o $(OBJS)
        $(CC) $(LDFLAGS) -o gpgwww gpgwww.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)
 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)