-PROGS = keymerge add lookup gpgwww
-OBJS = armor.o parsekey.o keydb_$(DBTYPE).o merge.o keyid.o md5.o sha.o \
- getcgi.o keyindex.o mem.o stats.o ll.o hash.o onak_conf.o
-SRCS = armor.c parsekey.c merge.c keyid.c md5.c sha.c main.c getcgi.c stats.c \
- keyindex.c mem.c lookup.c add.c keydb_$(DBTYPE).c ll.c hash.c \
- pathtest.c gpgwww.c onak_conf.c
+PROGS = add lookup gpgwww onak splitkeys
+CORE_OBJS = armor.o charfuncs.o decodekey.o getcgi.o hash.o keydb_$(DBTYPE).o \
+ keyid.o keyindex.o ll.o mem.o onak-conf.o parsekey.o sha1.o md5.o \
+ log.o photoid.o wordlist.o
+OBJS = merge.o stats.o sendsync.o cleankey.o $(CORE_OBJS)
+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