From 6e5b15819a125240c19a44db59894a04eeee7b41 Mon Sep 17 00:00:00 2001 From: Jonathan McDowell Date: Mon, 31 May 2004 23:47:13 +0000 Subject: [PATCH] cscvs to tla changeset 36 Author: noodles Date: 2002/11/16 12:04:55 Tidy up object specifications. Add use of LINK variable to ease debugging. --- Makefile | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index f48b710..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,9 +11,9 @@ 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 charfuncs.o \ - sendsync.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 charfuncs.c sendsync.c @@ -20,31 +21,22 @@ SRCS = armor.c parsekey.c merge.c keyid.c md5.c sha.c main.c getcgi.c stats.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) - -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 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 \ - 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 charfuncs.o sendsync.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 \ - charfuncs.o sendsync.o $(LIBS) - -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 charfuncs.o onak-conf.o $(LIBS) + $(LINK) -o gpgwww gpgwww.o $(OBJS) $(LIBS) + +lookup: lookup.o $(CORE_OBJS) + $(LINK) -o lookup lookup.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) + +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 \ -- 2.39.2