cscvs to tla changeset 2

[onak.git] / Makefile

diff --git a/Makefile b/Makefile
index aacd7a8fd7859678a7695e3bc125c0ad9adfc493..115ebe044c0af7420cfdfd5a92e2dcd0e5d19f87 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,10 +10,10 @@ LIBS = -L/usr/local/lib -lpq
 
 PROGS = keymerge add lookup gpgwww
 OBJS = armor.o parsekey.o keydb_$(DBTYPE).o merge.o keyid.o md5.o sha.o \
 
 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
+       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 \
 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
+       pathtest.c gpgwww.c onak_conf.c

 
 all: $(PROGS) testparse pathtest maxpath
 
 
 all: $(PROGS) testparse pathtest maxpath
 


@@ -30,19 +30,28 @@ gpgwww: gpgwww.o $(OBJS)
        $(CC) -o gpgwww gpgwww.o $(OBJS) $(LIBS)
 
 lookup: lookup.o getcgi.o keyindex.o keydb_$(DBTYPE).o keyid.o sha.o \
        $(CC) -o gpgwww gpgwww.o $(OBJS) $(LIBS)
 
 lookup: lookup.o getcgi.o keyindex.o keydb_$(DBTYPE).o keyid.o sha.o \

-               parsekey.o mem.o armor.o ll.o hash.o
+               parsekey.o mem.o armor.o ll.o hash.o onak_conf.o

        $(CC) -o lookup lookup.o getcgi.o keyindex.o keydb_$(DBTYPE).o keyid.o \
        $(CC) -o lookup lookup.o getcgi.o keyindex.o keydb_$(DBTYPE).o keyid.o \

-               sha.o parsekey.o mem.o armor.o ll.o hash.o $(LIBS)
+               sha.o parsekey.o mem.o armor.o ll.o hash.o onak_conf.o $(LIBS)

 
 add: add.o getcgi.o armor.o parsekey.o keydb_$(DBTYPE).o keyid.o sha.o mem.o \
 
 add: add.o getcgi.o armor.o parsekey.o keydb_$(DBTYPE).o keyid.o sha.o mem.o \

-               keyindex.o ll.o hash.o
+               keyindex.o ll.o hash.o merge.o onak_conf.o

        $(CC) -o add add.o getcgi.o armor.o parsekey.o keydb_$(DBTYPE).o \
        $(CC) -o add add.o getcgi.o armor.o parsekey.o keydb_$(DBTYPE).o \

-               keyid.o sha.o mem.o keyindex.o ll.o hash.o $(LIBS)
+               keyid.o sha.o mem.o keyindex.o ll.o hash.o merge.o onak_conf.o \
+               $(LIBS)

 
 keymerge: keymerge.o merge.o keyid.o sha.o armor.o parsekey.o ll.o \
 
 keymerge: keymerge.o merge.o keyid.o sha.o armor.o parsekey.o ll.o \

-               keydb_$(DBTYPE).o mem.o keyindex.o hash.o getcgi.o
+               keydb_$(DBTYPE).o mem.o keyindex.o hash.o getcgi.o onak_conf.o

        $(CC) -o keymerge keymerge.o merge.o keyid.o sha.o armor.o parsekey.o \
        $(CC) -o keymerge keymerge.o merge.o keyid.o sha.o armor.o parsekey.o \

-               keydb_$(DBTYPE).o mem.o keyindex.o ll.o hash.o getcgi.o $(LIBS)
+               keydb_$(DBTYPE).o mem.o keyindex.o ll.o hash.o getcgi.o \
+               onak_conf.o $(LIBS)
+
+onak: onak.o merge.o keyid.o sha.o armor.o parsekey.o ll.o \
+               keydb_$(DBTYPE).o mem.o keyindex.o hash.o getcgi.o onak_conf.o
+       $(CC) -o onak onak.o merge.o keyid.o sha.o armor.o parsekey.o \
+               keydb_$(DBTYPE).o mem.o keyindex.o ll.o hash.o getcgi.o \
+               onak_conf.o $(LIBS)
+

 
 clean:
        rm -f $(PROGS) $(OBJS) Makefile.bak testparse pathtest maxpath \
 
 clean:
        rm -f $(PROGS) $(OBJS) Makefile.bak testparse pathtest maxpath \