Fix compilation breakage introduced in last commit

[onak.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index c5725935e50ca98387bc59f20d7c80d6407dabf4..08a06bfc90ea9a93d1ec889506c3c0d600d48fd7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -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)
@@ -154,6 +154,7 @@ keydctl.o: keydctl.c keyd.h
        sed -e 's:@BINDIR@:@bindir@:g' \
                -e 's:@CONFIG@:@sysconfdir@/onak.conf:g' \
                -e 's:@LIBDIR@:@libdir@:g' \
+               -e 's:@RUNDIR@:@runstatedir@:g' \
                -e 's:@SBINDIR@:@sbindir@:g' \
                -e 's:@STATEDIR@:@localstatedir@:g' \
                < $< > $@
@@ -176,10 +177,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; \