cscvs to tla changeset 140

[onak.git] / Makefile

diff --git a/Makefile b/Makefile
index 733daf4c59b2ecdbd850fb79d6a824e7ce7ac9dc..d626ffdb5547cccb8289e123951fce973b126556 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for onak.
 #
 #
 # Makefile for onak.
 #

-# $Id: Makefile,v 1.20 2004/05/27 03:33:24 noodles Exp $
+# $Id: Makefile,v 1.23 2004/05/31 22:04:50 noodles Exp $

 #
 
 CC = gcc
 #
 
 CC = gcc


@@ -10,19 +10,20 @@ CFLAGS += -Wall -pedantic -g -I/usr/local/include
 # Uncomment to enable profiling.
 #LDFLAGS += -pg
 # Can be "pg" for Postgresql, "file" for flat files or "db2" for pksd db2 style.
 # Uncomment to enable profiling.
 #LDFLAGS += -pg
 # Can be "pg" for Postgresql, "file" for flat files or "db2" for pksd db2 style.

-DBTYPE = fs
+DBTYPE = db3

 # If using DBTYPE of "file" then comment the following line out.
 #LIBS = -L/usr/local/lib -lpq
 LIBS = -L/usr/local/lib -ldb3
 
 PROGS = add lookup gpgwww onak splitkeys
 CORE_OBJS = armor.o charfuncs.o decodekey.o getcgi.o hash.o keydb_$(DBTYPE).o \
 # If using DBTYPE of "file" then comment the following line out.
 #LIBS = -L/usr/local/lib -lpq
 LIBS = -L/usr/local/lib -ldb3
 
 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 sha.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
        log.o photoid.o wordlist.o

-OBJS = merge.o stats.o sendsync.o $(CORE_OBJS)
-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 \
-       gpgwww.c onak-conf.c charfuncs.c sendsync.c log.c photoid.c 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

 
 all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys
 
 
 all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys
 


@@ -41,14 +42,15 @@ sixdegrees: sixdegrees.o $(OBJS)
 gpgwww: gpgwww.o $(OBJS)
        $(LINK) -o gpgwww gpgwww.o $(OBJS) $(LIBS)
 
 gpgwww: gpgwww.o $(OBJS)
        $(LINK) -o gpgwww gpgwww.o $(OBJS) $(LIBS)
 

-lookup: lookup.o $(CORE_OBJS)
-       $(LINK) -o lookup lookup.o $(CORE_OBJS) $(LIBS)
+lookup: lookup.o cleankey.o merge.o $(CORE_OBJS)
+       $(LINK) -o lookup lookup.o cleankey.o merge.o $(CORE_OBJS) $(LIBS)

 
 

-add: add.o merge.o sendsync.o $(CORE_OBJS)
-       $(LINK) -o add add.o merge.o sendsync.o $(CORE_OBJS) $(LIBS)
+add: add.o cleankey.o merge.o sendsync.o $(CORE_OBJS)
+       $(LINK) -o add add.o cleankey.o merge.o sendsync.o $(CORE_OBJS) $(LIBS)

 
 

-onak: onak.o merge.o $(CORE_OBJS)
-       $(LINK) $(LDFLAGS) -o onak onak.o merge.o $(CORE_OBJS) $(LIBS)
+onak: onak.o merge.o cleankey.o $(CORE_OBJS)
+       $(LINK) $(LDFLAGS) -o onak onak.o merge.o cleankey.o $(CORE_OBJS) \
+               $(LIBS)

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