Fix compilation breakage introduced in last commit

[onak.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 76d7fc463b1aa7be6be664ac167c141b38a6ffca..08a06bfc90ea9a93d1ec889506c3c0d600d48fd7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -65,7 +65,7 @@ install: $(PROGS) onak.conf $(BACKENDS)
        install -d $(DESTDIR)/@mandir@/man1
        install -d $(DESTDIR)/@mandir@/man8
        install -d $(DESTDIR)/@sysconfdir@
-       install onak-mail.pl $(DESTDIR)/@libdir@/onak
+       install -m 755 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
@@ -78,20 +78,21 @@ endif
 
 keyd: keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o
        $(CC) $(LDFLAGS) $(PROGS_LDFLAGS_EXTRA) \
-               -o keyd keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o $(LIBS)
+               -o keyd keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o $(LIBS) \
+               @SYSTEMD_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) $(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)
@@ -149,15 +150,14 @@ onak-conf.o: onak-conf.c onak-conf.h
 keydctl.o: keydctl.c keyd.h
        $(CC) $(CFLAGS) -DDBINIT=keydb_@DBTYPE@_init -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.conf: onak.conf.in
+%: %.in
        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' \
-               < onak.conf.in > onak.conf
+               < $< > $@
 
 clean:
        $(RM) $(PROGS) $(OBJS) Makefile.bak testparse maxpath *.core core \
@@ -177,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; \