Use nettle for hashing when available rather than internal MD5/SHA1 routines

[onak.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 5cb723f45660165a42386f9d7f60383f29a41f8e..447894b0a6f9faf17e53a4d4c4ac8026cd9ae488 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,76 +3,177 @@
 #
 
 CC = @CC@
 #
 
 CC = @CC@

-CFLAGS += @CFLAGS@ -Wall -pedantic
+CFLAGS += @CFLAGS@ -Wall -pedantic -fPIC

 # Uncomment to enable profiling.
 LDFLAGS += @LDFLAGS@
 # Can be "pg" for Postgresql, "file" for flat files or "db2" for pksd db2 style.
 DBTYPE = @DBTYPE@
 #
 # Uncomment to enable profiling.
 LDFLAGS += @LDFLAGS@
 # 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@
 prefix ?= @prefix@

-
-PROGS = add lookup gpgwww onak splitkeys onak-mail.pl stripkey
-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 sha1.o md5.o \
-       log.o photoid.o wordlist.o cleanup.o
-OBJS = merge.o stats.o sendsync.o cleankey.o $(CORE_OBJS)
+exec_prefix ?= @exec_prefix@
+
+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 \
+       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 \
        gpgwww.c onak-conf.c charfuncs.c sendsync.c log.c photoid.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
-
-all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys
-
-splitkeys: splitkeys.o $(CORE_OBJS)
-       $(CC) $(LDFLAGS) -o splitkeys splitkeys.o $(CORE_OBJS) $(LIBS)
+       wordlist.c cleankey.c cleanup.c keyarray.c hashquery.c marshal.c \
+       $(foreach be,@BACKENDS@,keydb_$(be).c)
+PROGS_LDFLAGS_EXTRA =
+
+ifeq (x@KEYD@, xyes)
+PROGS += keyd keydctl
+KEYDB_OBJ = keydb_keyd.o
+SRCS += keyd.c keydb_keyd.c keydctl.c
+else
+KEYDB_OBJ = keydb_$(DBTYPE).o
+endif
+
+ifeq (x@DBTYPE@, xdynamic)
+LIBS += -ldl
+BACKENDS = $(foreach be,@BACKENDS@,libkeydb_$(be).so)
+PROGS += keyd keydctl
+PROGS_LDFLAGS_EXTRA = -rdynamic
+SRCS += keyd.c keydctl.c
+endif
+
+OBJS = stats.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
+
+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 -d $(DESTDIR)/@localstatedir@/lib/onak
+       install -d $(DESTDIR)/@mandir@/man1
+       install -d $(DESTDIR)/@mandir@/man8
+       install -d $(DESTDIR)/@sysconfdir@
+       install onak-mail.pl $(DESTDIR)/@libdir@/onak
+       install onak splitkeys $(DESTDIR)/@bindir@
+       install onak.1 splitkeys.1 $(DESTDIR)/@mandir@/man1
+       install keyd.8 keydctl.8 onak-mail.pl.8 $(DESTDIR)/@mandir@/man8
+ifeq (x@DBTYPE@, xdynamic)
+       install $(BACKENDS) $(DESTDIR)/@libdir@/onak/backends
+       install -d $(DESTDIR)/@sbindir@
+       install keyd $(DESTDIR)/@sbindir@
+       install keydctl $(DESTDIR)/@bindir@
+endif
+
+keyd: keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o
+       $(CC) $(LDFLAGS) $(PROGS_LDFLAGS_EXTRA) \
+               -o keyd keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o $(LIBS)
+
+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)
+
+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 $(CORE_OBJS)
+       $(CC) -shared $(PQLIBS) -o libkeydb_pg.so keydb_pg.o $(CORE_OBJS)
+
+libkeydb_%.so: keydb_%.o $(CORE_OBJS)
+       $(CC) -shared -o $@ $< $(CORE_OBJS)
+
+splitkeys: splitkeys.o $(CORE_OBJS) $(KEYDB_OBJ)
+       $(CC) $(LDFLAGS) -o splitkeys splitkeys.o $(CORE_OBJS) $(KEYDB_OBJ) \
+               $(LIBS) $(PROGS_LDFLAGS_EXTRA)

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

-       $(CC) $(LDFLAGS) -o testparse main.o $(OBJS) $(LIBS)
+       $(CC) $(LDFLAGS) -o testparse main.o $(OBJS) $(LIBS) \
+               $(PROGS_LDFLAGS_EXTRA)

 
 maxpath: maxpath.o $(OBJS)
 
 maxpath: maxpath.o $(OBJS)

-       $(CC) $(LDFLAGS) -o maxpath maxpath.o $(OBJS) $(LIBS)
+       $(CC) $(LDFLAGS) -o maxpath maxpath.o $(OBJS) $(LIBS) \
+               $(PROGS_LDFLAGS_EXTRA)

 
 sixdegrees: sixdegrees.o $(OBJS)
 
 sixdegrees: sixdegrees.o $(OBJS)

-       $(CC) $(LDFLAGS) -o sixdegrees sixdegrees.o $(OBJS) $(LIBS)
+       $(CC) $(LDFLAGS) -o sixdegrees sixdegrees.o $(OBJS) $(LIBS) \
+               $(PROGS_LDFLAGS_EXTRA)

 
 stripkey: stripkey.o $(OBJS)
 
 stripkey: stripkey.o $(OBJS)

-       $(CC) $(LDFLAGS) -o stripkey stripkey.o $(OBJS) $(LIBS)
+       $(CC) $(LDFLAGS) -o stripkey stripkey.o $(OBJS) $(LIBS) \
+               $(PROGS_LDFLAGS_EXTRA)

 
 gpgwww: gpgwww.o $(OBJS)
 
 gpgwww: gpgwww.o $(OBJS)

-       $(CC) $(LDFLAGS) -o gpgwww gpgwww.o $(OBJS) $(LIBS)
+       $(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 merge.o $(CORE_OBJS)
-       $(CC) $(LDFLAGS) -o lookup lookup.o cleankey.o merge.o $(CORE_OBJS) \
-               $(LIBS)
+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)

 
 

-add: add.o cleankey.o merge.o sendsync.o $(CORE_OBJS)
-       $(CC) $(LDFLAGS) -o add add.o cleankey.o merge.o sendsync.o \
-               $(CORE_OBJS) $(LIBS)
+add: add.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
+       $(CC) $(LDFLAGS) -o add add.o cleankey.o \
+               $(CORE_OBJS) $(KEYDB_OBJ) $(LIBS) $(PROGS_LDFLAGS_EXTRA)

 
 

-onak: onak.o merge.o cleankey.o $(CORE_OBJS)
-       $(CC) $(LDFLAGS) -o onak onak.o merge.o cleankey.o \
-               $(CORE_OBJS) $(LIBS)
+onak: onak.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
+       $(CC) $(LDFLAGS) -o onak onak.o cleankey.o \
+               $(CORE_OBJS) $(KEYDB_OBJ) $(LIBS) $(PROGS_LDFLAGS_EXTRA)

 
 onak-conf.o: onak-conf.c onak-conf.h
 
 onak-conf.o: onak-conf.c onak-conf.h

-       $(CC) $(CFLAGS) -DCONFIGFILE=\"@sysconfdir@/onak.conf\" -c onak-conf.c
+       $(CC) $(CFLAGS) -DCONFIGFILE=\"@sysconfdir@/onak.conf\" \
+               -DDBFUNCS=keydb_@DBTYPE@_funcs -c onak-conf.c
+
+# HACK: onak-conf.o needs to be able to see keydb_@DBTYPE@_funcs, but
+# keydctl doesn't want to link against the DB stuff. To be fixed more cleanly.
+keydctl.o: keydctl.c keyd.h
+       $(CC) $(CFLAGS) -DDBFUNCS=keydb_@DBTYPE@_funcs -c keydctl.c

 
 onak-mail.pl: onak-mail.pl.in
        sed 's:@CONFIG@:@sysconfdir@/onak.conf:g' < onak-mail.pl.in > onak-mail.pl
        chmod +x onak-mail.pl
 
 
 onak-mail.pl: onak-mail.pl.in
        sed 's:@CONFIG@:@sysconfdir@/onak.conf:g' < onak-mail.pl.in > onak-mail.pl
        chmod +x onak-mail.pl
 

+onak.conf: onak.conf.in
+       sed -e 's:@BINDIR@:@bindir@:g' \
+               -e 's:@LIBDIR@:@libdir@:g' \
+               -e 's:@STATEDIR@:@localstatedir@:g' \
+               < onak.conf.in > onak.conf
+

 clean:
 clean:

-       $(RM) -f $(PROGS) $(OBJS) Makefile.bak testparse maxpath *.core core \
+       $(RM) $(PROGS) $(OBJS) Makefile.bak testparse maxpath *.core core \

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

-               sixdegrees.o splitkeys.o stripkey.o
+               sixdegrees.o splitkeys.o stripkey.o onak.conf keyd.o \
+               keydctl.o version.h \
+               $(foreach be,@BACKENDS@,keydb_$(be).o) *.so
+ifeq (x@KEYD@, xyes)
+       $(RM) keyd.o keydb_$(DBTYPE).o
+endif

 
 distclean: clean
 
 distclean: clean

-       $(RM) -f Makefile .depend config.{log,status,h}
+       $(RM) -f Makefile .depend config.log config.status config.h

        $(RM) -r autom4te.cache
 
        $(RM) -r autom4te.cache
 

-.depend: $(SRCS)
+version.h:
+       @echo '#include "config.h"' > version.h
+       @if [ -e .bzr ]; then \
+               echo "#define ONAK_VERSION PACKAGE_VERSION \"+bzr`bzr revno`\"" \
+               >> version.h; \
+       else \
+               echo "#define ONAK_VERSION PACKAGE_VERSION" >> version.h; \
+       fi
+
+.depend: $(SRCS) version.h

        rm -f .depend
        rm -f .depend

-       makedepend -f- -- $(CFLAGS) -- $(SRCS) > .depend
+       $(MAKEDEPEND) $(CFLAGS) $(SRCS) > .depend

 
 include .depend
 
 
 include .depend