X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/e02c731dfbb288c736f2cd09a9b6df0507c59ddd..42bcfe2cae29f375af4cf2cd3ccfa196b77a3946:/Makefile?ds=sidebyside

diff --git a/Makefile b/Makefile
index 9f432b8..2d6cfee 100644
--- a/Makefile
+++ b/Makefile
@@ -4,17 +4,17 @@ CC = gcc
 CFLAGS += -Wall -pedantic -g -I/usr/local/include
 #LDFLAGS += -pg
 # Can be "pg" for Postgresql, "file" for flat files or "db2" for pksd db2 style.
-DBTYPE = pg
+DBTYPE = db3
 # If using DBTYPE of "file" then comment the following line out.
-LIBS = -L/usr/local/lib -lpq
-#LIBS = -L/usr/local/lib -ldb2
+#LIBS = -L/usr/local/lib -lpq
+LIBS = -L/usr/local/lib -ldb3
 
 PROGS = add lookup gpgwww onak
 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
+	getcgi.o keyindex.o mem.o stats.o ll.o hash.o onak-conf.o charfuncs.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 \
-	gpgwww.c onak-conf.c
+	gpgwww.c onak-conf.c charfuncs.c
 
 all: $(PROGS) testparse maxpath
 
@@ -28,22 +28,22 @@ 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 \
-		parsekey.o mem.o armor.o ll.o hash.o onak-conf.o
+		parsekey.o mem.o armor.o ll.o hash.o onak-conf.o charfuncs.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 onak-conf.o $(LIBS)
+		sha.o parsekey.o mem.o armor.o ll.o hash.o onak-conf.o \
+		charfuncs.o $(LIBS)
 
 add: add.o getcgi.o armor.o parsekey.o keydb_$(DBTYPE).o keyid.o sha.o mem.o \
-		keyindex.o ll.o hash.o merge.o onak-conf.o
+		keyindex.o ll.o hash.o merge.o onak-conf.o charfuncs.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 merge.o onak-conf.o \
-		$(LIBS)
+		charfuncs.o $(LIBS)
 
-onak: onak.o merge.o keyid.o sha.o armor.o parsekey.o ll.o \
+onak: onak.o merge.o keyid.o sha.o armor.o parsekey.o ll.o charfuncs.o \
 		keydb_$(DBTYPE).o mem.o keyindex.o hash.o getcgi.o onak-conf.o
-	$(CC) $(LDFLAGS) -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)
-
+	$(CC) $(LDFLAGS) -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 charfuncs.o onak-conf.o $(LIBS)
 
 clean:
 	rm -f $(PROGS) $(OBJS) Makefile.bak testparse maxpath *.core core \
@@ -52,6 +52,4 @@ clean:
 depend:
 	makedepend $(SRCS)
 
-keydb_pg.o: keydb.o
-
 # DO NOT DELETE