cscvs to tla changeset 59

[onak.git] / Makefile

diff --git a/Makefile b/Makefile
index 4eb0ad7e818f16baa4ee85f320f94be9465b0143..fb2eab480a11fd91059162b9d9f5fa48199174da 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 # Makefile for onak.
 
 CC = gcc
 # 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.
 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,44 +11,40 @@ DBTYPE = db3
 LIBS = -L/usr/local/lib -ldb3
 
 PROGS = add lookup gpgwww onak
 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 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 log.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 \
 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 log.c

 
 

-all: $(PROGS) testparse maxpath
+all: $(PROGS) testparse maxpath sixdegrees

 
 testparse: main.o $(OBJS)
 
 testparse: main.o $(OBJS)

-       $(CC) -o testparse main.o $(OBJS) $(LIBS)
+       $(LINK) -o testparse main.o $(OBJS) $(LIBS)

 
 maxpath: maxpath.o $(OBJS)
 
 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)
+sixdegrees: sixdegrees.o $(OBJS)
+       $(LINK) -o sixdegrees sixdegrees.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)
+gpgwww: gpgwww.o $(OBJS)
+       $(LINK) -o gpgwww gpgwww.o $(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)
+lookup: lookup.o $(CORE_OBJS)
+       $(LINK) -o lookup lookup.o $(CORE_OBJS) $(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 \
 
 clean:
        rm -f $(PROGS) $(OBJS) Makefile.bak testparse maxpath *.core core \

-               gpgwww.o add.o lookup.o main.o maxpath.o onak.o
+               gpgwww.o add.o lookup.o main.o maxpath.o onak.o sixdegrees \
+               sixdegrees.o

 
 depend:
        makedepend $(SRCS)
 
 depend:
        makedepend $(SRCS)