Fix up dynamic loading; we export a structure of functions now from

[onak.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 6a15a7fc90f004d80fadff803da4bb063a76b367..a6c12c5c3bd2e4318e009110438eb031e7e9b31a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -25,6 +25,7 @@ SRCS = armor.c parsekey.c merge.c keyid.c md5.c sha1.c main.c getcgi.c mem.c \
        gpgwww.c onak-conf.c charfuncs.c sendsync.c log.c photoid.c \
        wordlist.c cleankey.c cleanup.c keyarray.c \
        $(foreach be,@BACKENDS@,keydb_$(be).c)
        gpgwww.c onak-conf.c charfuncs.c sendsync.c log.c photoid.c \
        wordlist.c cleankey.c cleanup.c keyarray.c \
        $(foreach be,@BACKENDS@,keydb_$(be).c)

+PROGS_LDFLAGS_EXTRA =

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


@@ -38,6 +39,7 @@ ifeq (x@DBTYPE@, xdynamic)
 LIBS += -ldl
 BACKENDS = $(foreach be,@BACKENDS@,libkeydb_$(be).so)
 PROGS += keyd
 LIBS += -ldl
 BACKENDS = $(foreach be,@BACKENDS@,libkeydb_$(be).so)
 PROGS += keyd

+PROGS_LDFLAGS_EXTRA = -rdynamic

 SRCS += keyd.c
 endif
 
 SRCS += keyd.c
 endif
 


@@ -47,7 +49,8 @@ all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys onak.conf \
        $(BACKENDS)
 
 keyd: keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o
        $(BACKENDS)
 
 keyd: keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o

-       $(CC) $(LDFLAGS) -o keyd keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o $(LIBS)
+       $(CC) $(LDFLAGS) $(PROGS_LDFLAGS_EXTRA) \
+               -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_db4.so: keydb_db4.o
        $(CC) -shared $(DB4LIBS) -o libkeydb_db4.so keydb_db4.o $(CORE_OBJS)


@@ -63,37 +66,43 @@ keydb_%.o: keydb_%.c
 
 splitkeys: splitkeys.o $(CORE_OBJS) $(KEYDB_OBJ)
        $(CC) $(LDFLAGS) -o splitkeys splitkeys.o $(CORE_OBJS) $(KEYDB_OBJ) \
 
 splitkeys: splitkeys.o $(CORE_OBJS) $(KEYDB_OBJ)
        $(CC) $(LDFLAGS) -o splitkeys splitkeys.o $(CORE_OBJS) $(KEYDB_OBJ) \

-               $(LIBS)
+               $(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)

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

-               $(KEYDB_OBJ) $(LIBS)
+               $(KEYDB_OBJ) $(LIBS) $(PROGS_LDFLAGS_EXTRA)

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

-               $(CORE_OBJS) $(KEYDB_OBJ) $(LIBS)
+               $(CORE_OBJS) $(KEYDB_OBJ) $(LIBS) $(PROGS_LDFLAGS_EXTRA)

 
 onak: onak.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
        $(CC) $(LDFLAGS) -o onak onak.o cleankey.o \
 
 onak: onak.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
        $(CC) $(LDFLAGS) -o onak onak.o cleankey.o \

-               $(CORE_OBJS) $(KEYDB_OBJ) $(LIBS)
+               $(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

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


@@ -101,6 +110,7 @@ onak-mail.pl: onak-mail.pl.in
 
 onak.conf: onak.conf.in
        sed -e 's:@BINDIR@:@bindir@:g' \
 
 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
 
                -e 's:@STATEDIR@:@localstatedir@:g' \
                < onak.conf.in > onak.conf