Make failure to load backend fatal.

[onak.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 896711cea1cc7779c776ebd3400d7aee1cfe530f..6a15a7fc90f004d80fadff803da4bb063a76b367 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,13 +3,14 @@
 #
 
 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@
 #
 LIBS = @LIBS@
 # 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@

+DB4LIBS = @DB4LIBS@

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


@@ -18,11 +19,12 @@ 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 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 \

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

 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
+       wordlist.c cleankey.c cleanup.c keyarray.c \
+       $(foreach be,@BACKENDS@,keydb_$(be).c)

 
 ifeq (x@KEYD@, xyes)
 PROGS += keyd
 
 ifeq (x@KEYD@, xyes)
 PROGS += keyd


@@ -32,13 +34,33 @@ else
 KEYDB_OBJ = keydb_$(DBTYPE).o
 endif
 
 KEYDB_OBJ = keydb_$(DBTYPE).o
 endif
 

-OBJS = stats.o sendsync.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
+ifeq (x@DBTYPE@, xdynamic)
+LIBS += -ldl
+BACKENDS = $(foreach be,@BACKENDS@,libkeydb_$(be).so)
+PROGS += keyd
+SRCS += keyd.c
+endif
+
+OBJS = stats.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)

 
 

-all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys onak.conf
+all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys onak.conf \
+       $(BACKENDS)

 
 keyd: keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o
        $(CC) $(LDFLAGS) -o keyd keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o $(LIBS)
 
 
 keyd: keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o
        $(CC) $(LDFLAGS) -o keyd keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o $(LIBS)
 

+libkeydb_db4.so: keydb_db4.o
+       $(CC) -shared $(DB4LIBS) -o libkeydb_db4.so keydb_db4.o $(CORE_OBJS)
+
+libkeydb_pg.so: keydb_pg.o
+       $(CC) -shared $(PQLIBS) -o libkeydb_pg.so keydb_pg.o $(CORE_OBJS)
+
+libkeydb_%.so: keydb_%.o
+       $(CC) -shared -o $@ $< $(CORE_OBJS)
+
+keydb_%.o: keydb_%.c
+       $(CC) -c -fPIC $(LDFLAGS) -o $@ $<
+

 splitkeys: splitkeys.o $(CORE_OBJS) $(KEYDB_OBJ)
        $(CC) $(LDFLAGS) -o splitkeys splitkeys.o $(CORE_OBJS) $(KEYDB_OBJ) \
                $(LIBS)
 splitkeys: splitkeys.o $(CORE_OBJS) $(KEYDB_OBJ)
        $(CC) $(LDFLAGS) -o splitkeys splitkeys.o $(CORE_OBJS) $(KEYDB_OBJ) \
                $(LIBS)


@@ -62,8 +84,8 @@ lookup: lookup.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
        $(CC) $(LDFLAGS) -o lookup lookup.o cleankey.o $(CORE_OBJS) \
                $(KEYDB_OBJ) $(LIBS)
 
        $(CC) $(LDFLAGS) -o lookup lookup.o cleankey.o $(CORE_OBJS) \
                $(KEYDB_OBJ) $(LIBS)
 

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

                $(CORE_OBJS) $(KEYDB_OBJ) $(LIBS)
 
 onak: onak.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
                $(CORE_OBJS) $(KEYDB_OBJ) $(LIBS)
 
 onak: onak.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)


@@ -83,9 +105,13 @@ onak.conf: onak.conf.in
                < onak.conf.in > onak.conf
 
 clean:
                < onak.conf.in > onak.conf
 
 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 onak.conf
+               sixdegrees.o splitkeys.o stripkey.o onak.conf keyd.o \
+               $(foreach be,@BACKENDS@,keydb_$(be).o) *.so
+ifeq (x@KEYD@, xyes)
+       $(RM) keyd.o keydb_$(DBTYPE).o
+endif

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