X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/a953676d714ba11d3b9509bbea747ad0858b28ba..0f9e9f98538575cf98f55699962d605caa9567f0:/Makefile?ds=sidebyside

diff --git a/Makefile b/Makefile
index 4eb0ad7..9855c7c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 # Makefile for onak.
 
 CC = gcc
+LINK = 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.
@@ -10,40 +11,32 @@ DBTYPE = db3
 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
+CORE_OBJS = armor.o charfuncs.o getcgi.o hash.o keydb_$(DBTYPE).o keyid.o \
+	keyindex.o ll.o mem.o onak-conf.o parsekey.o sha.o
+OBJS = merge.o md5.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
+	gpgwww.c onak-conf.c charfuncs.c sendsync.c
 
 all: $(PROGS) testparse maxpath
 
 testparse: main.o $(OBJS)
-	$(CC) -o testparse main.o $(OBJS) $(LIBS)
+	$(LINK) -o testparse main.o $(OBJS) $(LIBS)
 
 maxpath: maxpath.o $(OBJS)
-	$(CC) -o maxpath maxpath.o $(OBJS) $(LIBS)
+	$(LINK) -o maxpath maxpath.o $(OBJS) $(LIBS)
 
 gpgwww: gpgwww.o $(OBJS)
-	$(CC) -o gpgwww gpgwww.o $(OBJS) $(LIBS)
+	$(LINK) -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
-	$(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)
+lookup: lookup.o $(CORE_OBJS)
+	$(LINK) -o lookup lookup.o $(CORE_OBJS) $(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
-	$(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)
-
-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) $(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)
+add: add.o merge.o sendsync.o $(CORE_OBJS)
+	$(LINK) -o add add.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)
 
 clean:
 	rm -f $(PROGS) $(OBJS) Makefile.bak testparse maxpath *.core core \