Fix compilation breakage with PostgreSQL backend

[onak.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index c5725935e50ca98387bc59f20d7c80d6407dabf4..28e93c9d6829b033fea4e36a7d7d23e33497277b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -52,13 +52,13 @@ 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.ini \
        wotsap $(BACKENDS)
 
 test: onak $(BACKENDS)
        @./runtests
 
-install: $(PROGS) onak.conf $(BACKENDS)
+install: $(PROGS) onak.ini $(BACKENDS)
        install -d $(DESTDIR)/@bindir@
        install -d $(DESTDIR)/@libdir@/onak/backends
        install -d $(DESTDIR)/@localstatedir@/lib/onak
@@ -86,13 +86,13 @@ keydctl: keydctl.o onak-conf.o ll.o log.o
                -o keydctl keydctl.o onak-conf.o ll.o log.o $(LIBS)
 
 libkeydb_db4.so: keydb_db4.o $(CORE_OBJS)
-       $(CC) $(LDFLAGS) -shared $(DB4LIBS) -o libkeydb_db4.so keydb_db4.o $(CORE_OBJS)
+       $(CC) $(LDFLAGS) -shared -o libkeydb_db4.so keydb_db4.o $(DB4LIBS) $(CORE_OBJS)
 
 libkeydb_hkp.so: keydb_hkp.o $(CORE_OBJS)
-       $(CC) $(LDFLAGS) -shared $(CURLLIBS) -o libkeydb_hkp.so keydb_hkp.o $(CORE_OBJS)
+       $(CC) $(LDFLAGS) -shared -o libkeydb_hkp.so keydb_hkp.o $(CURLLIBS) $(CORE_OBJS)
 
 libkeydb_pg.so: keydb_pg.o $(CORE_OBJS)
-       $(CC) $(LDFLAGS) -shared $(PQLIBS) -o libkeydb_pg.so keydb_pg.o $(CORE_OBJS)
+       $(CC) $(LDFLAGS) -shared -o libkeydb_pg.so keydb_pg.o $(PQLIBS) $(CORE_OBJS)
 
 libkeydb_%.so: keydb_%.o $(CORE_OBJS)
        $(CC) $(LDFLAGS) -shared -o $@ $< $(CORE_OBJS)
@@ -142,7 +142,7 @@ onak: onak.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
                $(CORE_OBJS) $(KEYDB_OBJ) $(LIBS) $(PROGS_LDFLAGS_EXTRA)
 
 onak-conf.o: onak-conf.c onak-conf.h
-       $(CC) $(CFLAGS) -DCONFIGFILE=\"@sysconfdir@/onak.conf\" \
+       $(CC) $(CFLAGS) -DCONFIGDIR=\"@sysconfdir@\" \
                -DDBINIT=keydb_@DBTYPE@_init -c onak-conf.c
 
 # HACK: onak-conf.o needs to be able to see keydb_@DBTYPE@_funcs, but
@@ -152,8 +152,10 @@ keydctl.o: keydctl.c keyd.h
 
 %: %.in
        sed -e 's:@BINDIR@:@bindir@:g' \
-               -e 's:@CONFIG@:@sysconfdir@/onak.conf:g' \
+               -e 's:@CONFIG@:@sysconfdir@/onak.ini:g' \
+               -e 's:@CONFIGOLD@:@sysconfdir@/onak.conf:g' \
                -e 's:@LIBDIR@:@libdir@:g' \
+               -e 's:@RUNDIR@:@runstatedir@:g' \
                -e 's:@SBINDIR@:@sbindir@:g' \
                -e 's:@STATEDIR@:@localstatedir@:g' \
                < $< > $@
@@ -161,7 +163,7 @@ keydctl.o: keydctl.c keyd.h
 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 \
+               sixdegrees.o splitkeys.o stripkey.o onak.ini keyd.o \
                keydctl.o hashquery.o wotsap.o version.h \
                TAGS cscope.out cscope.files \
                $(foreach be,@BACKENDS@,keydb_$(be).o) *.so
@@ -176,10 +178,10 @@ distclean: clean
 doxygen-docs: *.c *.h Doxyfile
        doxygen
 
-version.h:
+version.h: $(SRCS)
        @echo '#include "config.h"' > version.h
-       @if [ -e .bzr ]; then \
-               echo "#define ONAK_VERSION PACKAGE_VERSION \"+bzr`bzr revno`\"" \
+       @if [ -e .git ]; then \
+               echo "#define ONAK_VERSION \"`git describe --tags --dirty | cut -d - -f 2-`\"" \
                >> version.h; \
        else \
                echo "#define ONAK_VERSION PACKAGE_VERSION" >> version.h; \