Introduce sorted keyid array functions and use in DB4.

[onak.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index cd6620ef24d8e38b91e3eee014bd2c7719938dc2..dec603d999874e6056c02f390b44f24ce0682560 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,11 +18,11 @@ 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 \
-       log.o photoid.o wordlist.o cleanup.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
+       wordlist.c cleankey.c cleanup.c keyarray.c
 
 ifeq (x@KEYD@, xyes)
 PROGS += keyd
@@ -32,7 +32,7 @@ else
 KEYDB_OBJ = keydb_$(DBTYPE).o
 endif
 
-OBJS = merge.o stats.o sendsync.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
+OBJS = stats.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
 
 all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys onak.conf
 
@@ -58,16 +58,16 @@ stripkey: stripkey.o $(OBJS)
 gpgwww: gpgwww.o $(OBJS)
        $(CC) $(LDFLAGS) -o gpgwww gpgwww.o $(OBJS) $(LIBS)
 
-lookup: lookup.o cleankey.o merge.o $(CORE_OBJS) $(KEYDB_OBJ)
-       $(CC) $(LDFLAGS) -o lookup lookup.o cleankey.o merge.o $(CORE_OBJS) \
+lookup: lookup.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
+       $(CC) $(LDFLAGS) -o lookup lookup.o cleankey.o $(CORE_OBJS) \
                $(KEYDB_OBJ) $(LIBS)
 
-add: add.o cleankey.o merge.o sendsync.o $(CORE_OBJS) $(KEYDB_OBJ)
-       $(CC) $(LDFLAGS) -o add add.o cleankey.o merge.o sendsync.o \
+add: add.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
+       $(CC) $(LDFLAGS) -o add add.o cleankey.o \
                $(CORE_OBJS) $(KEYDB_OBJ) $(LIBS)
 
-onak: onak.o merge.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
-       $(CC) $(LDFLAGS) -o onak onak.o merge.o cleankey.o \
+onak: onak.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
+       $(CC) $(LDFLAGS) -o onak onak.o cleankey.o \
                $(CORE_OBJS) $(KEYDB_OBJ) $(LIBS)
 
 onak-conf.o: onak-conf.c onak-conf.h
@@ -83,9 +83,12 @@ onak.conf: onak.conf.in
                < onak.conf.in > onak.conf
 
 clean:
-       $(RM) -f $(PROGS) $(OBJS) Makefile.bak testparse maxpath *.core core \
+       $(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
+ifeq (x@KEYD@, xyes)
+       $(RM) keyd.o keydb_$(DBTYPE).o
+endif
 
 distclean: clean
        $(RM) -f Makefile .depend config.{log,status,h}