Move update_keys to keydb rather than merge.

[onak.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 95e24f23fb66d596c7c6774cab8dc25a9a90782d..896711cea1cc7779c776ebd3400d7aee1cfe530f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -10,22 +10,38 @@ LDFLAGS += @LDFLAGS@
 DBTYPE = @DBTYPE@
 #
 LIBS = @LIBS@
 DBTYPE = @DBTYPE@
 #
 LIBS = @LIBS@

+#MAKEDEPEND = makedepend -f- -- 
+MAKEDEPEND = $(CC) -MM

 prefix ?= @prefix@
 prefix ?= @prefix@

+exec_prefix ?= @exec_prefix@

 
 

-PROGS = add lookup gpgwww onak splitkeys onak-mail.pl
-CORE_OBJS = armor.o charfuncs.o decodekey.o getcgi.o hash.o keydb_$(DBTYPE).o \
+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 \
        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
-OBJS = merge.o stats.o sendsync.o cleankey.o $(CORE_OBJS)
+       log.o photoid.o wordlist.o cleanup.o merge.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
 
 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
 

-all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys
+ifeq (x@KEYD@, xyes)
+PROGS += keyd
+KEYDB_OBJ = keydb_keyd.o
+SRCS += keyd.c keydb_keyd.c
+else
+KEYDB_OBJ = keydb_$(DBTYPE).o
+endif

 
 

-splitkeys: splitkeys.o $(CORE_OBJS)
-       $(CC) $(LDFLAGS) -o splitkeys splitkeys.o $(CORE_OBJS) $(LIBS)
+OBJS = stats.o sendsync.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
+
+all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys onak.conf
+
+keyd: keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o
+       $(CC) $(LDFLAGS) -o keyd keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o $(LIBS)
+
+splitkeys: splitkeys.o $(CORE_OBJS) $(KEYDB_OBJ)
+       $(CC) $(LDFLAGS) -o splitkeys splitkeys.o $(CORE_OBJS) $(KEYDB_OBJ) \
+               $(LIBS)

 
 testparse: main.o $(OBJS)
        $(CC) $(LDFLAGS) -o testparse main.o $(OBJS) $(LIBS)
 
 testparse: main.o $(OBJS)
        $(CC) $(LDFLAGS) -o testparse main.o $(OBJS) $(LIBS)


@@ -36,20 +52,23 @@ maxpath: maxpath.o $(OBJS)
 sixdegrees: sixdegrees.o $(OBJS)
        $(CC) $(LDFLAGS) -o sixdegrees sixdegrees.o $(OBJS) $(LIBS)
 
 sixdegrees: sixdegrees.o $(OBJS)
        $(CC) $(LDFLAGS) -o sixdegrees sixdegrees.o $(OBJS) $(LIBS)
 

+stripkey: stripkey.o $(OBJS)
+       $(CC) $(LDFLAGS) -o stripkey stripkey.o $(OBJS) $(LIBS)
+

 gpgwww: gpgwww.o $(OBJS)
        $(CC) $(LDFLAGS) -o gpgwww gpgwww.o $(OBJS) $(LIBS)
 
 gpgwww: gpgwww.o $(OBJS)
        $(CC) $(LDFLAGS) -o gpgwww gpgwww.o $(OBJS) $(LIBS)
 

-lookup: lookup.o cleankey.o merge.o $(CORE_OBJS)
-       $(CC) $(LDFLAGS) -o lookup lookup.o cleankey.o merge.o $(CORE_OBJS) \
-               $(LIBS)
+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)
-       $(CC) $(LDFLAGS) -o add add.o cleankey.o merge.o sendsync.o \
-               $(CORE_OBJS) $(LIBS)
+add: add.o cleankey.o sendsync.o $(CORE_OBJS) $(KEYDB_OBJ)
+       $(CC) $(LDFLAGS) -o add add.o cleankey.o sendsync.o \
+               $(CORE_OBJS) $(KEYDB_OBJ) $(LIBS)

 
 

-onak: onak.o merge.o cleankey.o $(CORE_OBJS)
-       $(CC) $(LDFLAGS) -o onak onak.o merge.o cleankey.o \
-               $(CORE_OBJS) $(LIBS)
+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
        $(CC) $(CFLAGS) -DCONFIGFILE=\"@sysconfdir@/onak.conf\" -c onak-conf.c
 
 onak-conf.o: onak-conf.c onak-conf.h
        $(CC) $(CFLAGS) -DCONFIGFILE=\"@sysconfdir@/onak.conf\" -c onak-conf.c


@@ -58,10 +77,15 @@ 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
 
        sed 's:@CONFIG@:@sysconfdir@/onak.conf:g' < onak-mail.pl.in > onak-mail.pl
        chmod +x onak-mail.pl
 

+onak.conf: onak.conf.in
+       sed -e 's:@BINDIR@:@bindir@:g' \
+               -e 's:@STATEDIR@:@localstatedir@:g' \
+               < onak.conf.in > onak.conf
+

 clean:
        $(RM) -f $(PROGS) $(OBJS) Makefile.bak testparse maxpath *.core core \
                gpgwww.o add.o lookup.o main.o maxpath.o onak.o sixdegrees \
 clean:
        $(RM) -f $(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
+               sixdegrees.o splitkeys.o stripkey.o onak.conf

 
 distclean: clean
        $(RM) -f Makefile .depend config.{log,status,h}
 
 distclean: clean
        $(RM) -f Makefile .depend config.{log,status,h}


@@ -69,7 +93,7 @@ distclean: clean
 
 .depend: $(SRCS)
        rm -f .depend
 
 .depend: $(SRCS)
        rm -f .depend

-       makedepend -f- -- $(CFLAGS) -- $(SRCS) > .depend
+       $(MAKEDEPEND) $(CFLAGS) $(SRCS) > .depend

 
 include .depend
 
 
 include .depend