Add ctags/cscope files to .gitignore + clean rule

[onak.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 4ec39dad8fbbc4b71da02ba3191010ee8f6b9638..b5b8a55ed27c4df350618e63c5ecd13ceeddfe67 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,21 +9,24 @@ LDFLAGS += @LDFLAGS@
 # Can be "pg" for Postgresql, "file" for flat files or "db2" for pksd db2 style.
 DBTYPE = @DBTYPE@
 #
 # Can be "pg" for Postgresql, "file" for flat files or "db2" for pksd db2 style.
 DBTYPE = @DBTYPE@
 #

-LIBS = @LIBS@
+LIBS = @LIBS@ @NETTLE_LIBS@

 DB4LIBS = @DB4LIBS@
 #MAKEDEPEND = makedepend -f- -- 
 MAKEDEPEND = $(CC) -MM
 prefix ?= @prefix@
 exec_prefix ?= @exec_prefix@
 
 DB4LIBS = @DB4LIBS@
 #MAKEDEPEND = makedepend -f- -- 
 MAKEDEPEND = $(CC) -MM
 prefix ?= @prefix@
 exec_prefix ?= @exec_prefix@
 

-PROGS = add lookup gpgwww onak splitkeys onak-mail.pl stripkey
-CORE_OBJS = armor.o charfuncs.o decodekey.o getcgi.o hash.o \
-       keyid.o keyindex.o ll.o mem.o onak-conf.o parsekey.o sha1.o md5.o \
+PROGS = add lookup hashquery gpgwww onak splitkeys onak-mail.pl stripkey
+CORE_OBJS = armor.o charfuncs.o decodekey.o getcgi.o hash.o marshal.o \
+       keyid.o keyindex.o ll.o mem.o onak-conf.o parsekey.o sigcheck.o \

        log.o photoid.o wordlist.o cleanup.o merge.o sendsync.o keyarray.o
        log.o photoid.o wordlist.o cleanup.o merge.o sendsync.o keyarray.o

+ifeq (x@NETTLE_LIBS@, x)
+CORE_OBJS += md5.o sha1.o
+endif

 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 \
 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 cleanup.c keyarray.c \
+       gpgwww.c onak-conf.c charfuncs.c sendsync.c log.c photoid.c sigcheck.c \
+       wordlist.c cleankey.c cleanup.c keyarray.c hashquery.c marshal.c \

        $(foreach be,@BACKENDS@,keydb_$(be).c)
 PROGS_LDFLAGS_EXTRA =
 
        $(foreach be,@BACKENDS@,keydb_$(be).c)
 PROGS_LDFLAGS_EXTRA =
 


@@ -48,6 +51,9 @@ OBJS = stats.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
 all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys onak.conf \
        $(BACKENDS)
 
 all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys onak.conf \
        $(BACKENDS)
 

+test: onak $(BACKENDS)
+       @./runtests
+

 install: $(PROGS) onak.conf $(BACKENDS)
        install -d $(DESTDIR)/@bindir@
        install -d $(DESTDIR)/@libdir@/onak/backends
 install: $(PROGS) onak.conf $(BACKENDS)
        install -d $(DESTDIR)/@bindir@
        install -d $(DESTDIR)/@libdir@/onak/backends


@@ -74,13 +80,13 @@ keydctl: keydctl.o onak-conf.o ll.o log.o
        $(CC) $(LDFLAGS) $(PROGS_LDFLAGS_EXTRA) \
                -o keydctl keydctl.o onak-conf.o ll.o log.o $(LIBS)
 
        $(CC) $(LDFLAGS) $(PROGS_LDFLAGS_EXTRA) \
                -o keydctl keydctl.o onak-conf.o ll.o log.o $(LIBS)
 

-libkeydb_db4.so: keydb_db4.o
+libkeydb_db4.so: keydb_db4.o $(CORE_OBJS)

        $(CC) -shared $(DB4LIBS) -o libkeydb_db4.so keydb_db4.o $(CORE_OBJS)
 
        $(CC) -shared $(DB4LIBS) -o libkeydb_db4.so keydb_db4.o $(CORE_OBJS)
 

-libkeydb_pg.so: keydb_pg.o
+libkeydb_pg.so: keydb_pg.o $(CORE_OBJS)

        $(CC) -shared $(PQLIBS) -o libkeydb_pg.so keydb_pg.o $(CORE_OBJS)
 
        $(CC) -shared $(PQLIBS) -o libkeydb_pg.so keydb_pg.o $(CORE_OBJS)
 

-libkeydb_%.so: keydb_%.o
+libkeydb_%.so: keydb_%.o $(CORE_OBJS)

        $(CC) -shared -o $@ $< $(CORE_OBJS)
 
 splitkeys: splitkeys.o $(CORE_OBJS) $(KEYDB_OBJ)
        $(CC) -shared -o $@ $< $(CORE_OBJS)
 
 splitkeys: splitkeys.o $(CORE_OBJS) $(KEYDB_OBJ)


@@ -107,6 +113,10 @@ gpgwww: gpgwww.o $(OBJS)
        $(CC) $(LDFLAGS) -o gpgwww gpgwww.o $(OBJS) $(LIBS) \
                $(PROGS_LDFLAGS_EXTRA)
 
        $(CC) $(LDFLAGS) -o gpgwww gpgwww.o $(OBJS) $(LIBS) \
                $(PROGS_LDFLAGS_EXTRA)
 

+hashquery: hashquery.o $(CORE_OBJS) $(KEYDB_OBJ)
+       $(CC) $(LDFLAGS) -o hashquery hashquery.o $(CORE_OBJS) \
+               $(KEYDB_OBJ) $(LIBS) $(PROGS_LDFLAGS_EXTRA)
+

 lookup: lookup.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
        $(CC) $(LDFLAGS) -o lookup lookup.o cleankey.o $(CORE_OBJS) \
                $(KEYDB_OBJ) $(LIBS) $(PROGS_LDFLAGS_EXTRA)
 lookup: lookup.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
        $(CC) $(LDFLAGS) -o lookup lookup.o cleankey.o $(CORE_OBJS) \
                $(KEYDB_OBJ) $(LIBS) $(PROGS_LDFLAGS_EXTRA)


@@ -142,7 +152,8 @@ clean:
        $(RM) $(PROGS) $(OBJS) Makefile.bak testparse maxpath *.core core \
                gpgwww.o add.o lookup.o main.o maxpath.o onak.o sixdegrees \
                sixdegrees.o splitkeys.o stripkey.o onak.conf keyd.o \
        $(RM) $(PROGS) $(OBJS) Makefile.bak testparse maxpath *.core core \
                gpgwww.o add.o lookup.o main.o maxpath.o onak.o sixdegrees \
                sixdegrees.o splitkeys.o stripkey.o onak.conf keyd.o \

-               keydctl.o version.h \
+               keydctl.o hashquery.o version.h \
+               TAGS cscope.out cscope.files \

                $(foreach be,@BACKENDS@,keydb_$(be).o) *.so
 ifeq (x@KEYD@, xyes)
        $(RM) keyd.o keydb_$(DBTYPE).o
                $(foreach be,@BACKENDS@,keydb_$(be).o) *.so
 ifeq (x@KEYD@, xyes)
        $(RM) keyd.o keydb_$(DBTYPE).o


@@ -152,6 +163,9 @@ distclean: clean
        $(RM) -f Makefile .depend config.log config.status config.h
        $(RM) -r autom4te.cache
 
        $(RM) -f Makefile .depend config.log config.status config.h
        $(RM) -r autom4te.cache
 

+doxygen-docs: *.c *.h Doxyfile
+       doxygen
+

 version.h:
        @echo '#include "config.h"' > version.h
        @if [ -e .bzr ]; then \
 version.h:
        @echo '#include "config.h"' > version.h
        @if [ -e .bzr ]; then \