Remove keydctl.o in clean rule

[onak.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index a7a5c08e48a5ef2377f9e4529c02d05a8185d568..4ec39dad8fbbc4b71da02ba3191010ee8f6b9638 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -28,9 +28,9 @@ SRCS = armor.c parsekey.c merge.c keyid.c md5.c sha1.c main.c getcgi.c mem.c \
 PROGS_LDFLAGS_EXTRA =
 
 ifeq (x@KEYD@, xyes)
 PROGS_LDFLAGS_EXTRA =
 
 ifeq (x@KEYD@, xyes)

-PROGS += keyd
+PROGS += keyd keydctl

 KEYDB_OBJ = keydb_keyd.o
 KEYDB_OBJ = keydb_keyd.o

-SRCS += keyd.c keydb_keyd.c
+SRCS += keyd.c keydb_keyd.c keydctl.c

 else
 KEYDB_OBJ = keydb_$(DBTYPE).o
 endif
 else
 KEYDB_OBJ = keydb_$(DBTYPE).o
 endif


@@ -38,9 +38,9 @@ endif
 ifeq (x@DBTYPE@, xdynamic)
 LIBS += -ldl
 BACKENDS = $(foreach be,@BACKENDS@,libkeydb_$(be).so)
 ifeq (x@DBTYPE@, xdynamic)
 LIBS += -ldl
 BACKENDS = $(foreach be,@BACKENDS@,libkeydb_$(be).so)

-PROGS += keyd
+PROGS += keyd keydctl

 PROGS_LDFLAGS_EXTRA = -rdynamic
 PROGS_LDFLAGS_EXTRA = -rdynamic

-SRCS += keyd.c
+SRCS += keyd.c keydctl.c

 endif
 
 OBJS = stats.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
 endif
 
 OBJS = stats.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)


@@ -58,17 +58,22 @@ install: $(PROGS) onak.conf $(BACKENDS)
        install onak-mail.pl $(DESTDIR)/@libdir@/onak
        install onak splitkeys $(DESTDIR)/@bindir@
        install onak.1 splitkeys.1 $(DESTDIR)/@mandir@/man1
        install onak-mail.pl $(DESTDIR)/@libdir@/onak
        install onak splitkeys $(DESTDIR)/@bindir@
        install onak.1 splitkeys.1 $(DESTDIR)/@mandir@/man1

-       install keyd.8 onak-mail.pl.8 $(DESTDIR)/@mandir@/man8
+       install keyd.8 keydctl.8 onak-mail.pl.8 $(DESTDIR)/@mandir@/man8

 ifeq (x@DBTYPE@, xdynamic)
        install $(BACKENDS) $(DESTDIR)/@libdir@/onak/backends
        install -d $(DESTDIR)/@sbindir@
        install keyd $(DESTDIR)/@sbindir@
 ifeq (x@DBTYPE@, xdynamic)
        install $(BACKENDS) $(DESTDIR)/@libdir@/onak/backends
        install -d $(DESTDIR)/@sbindir@
        install keyd $(DESTDIR)/@sbindir@

+       install keydctl $(DESTDIR)/@bindir@

 endif
 
 keyd: keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o
        $(CC) $(LDFLAGS) $(PROGS_LDFLAGS_EXTRA) \
                -o keyd keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o $(LIBS)
 
 endif
 
 keyd: keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o
        $(CC) $(LDFLAGS) $(PROGS_LDFLAGS_EXTRA) \
                -o keyd keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o $(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
        $(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)
 


@@ -78,9 +83,6 @@ libkeydb_pg.so: keydb_pg.o
 libkeydb_%.so: keydb_%.o
        $(CC) -shared -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) $(PROGS_LDFLAGS_EXTRA)
 splitkeys: splitkeys.o $(CORE_OBJS) $(KEYDB_OBJ)
        $(CC) $(LDFLAGS) -o splitkeys splitkeys.o $(CORE_OBJS) $(KEYDB_OBJ) \
                $(LIBS) $(PROGS_LDFLAGS_EXTRA)


@@ -121,6 +123,11 @@ onak-conf.o: onak-conf.c onak-conf.h
        $(CC) $(CFLAGS) -DCONFIGFILE=\"@sysconfdir@/onak.conf\" \
                -DDBFUNCS=keydb_@DBTYPE@_funcs -c onak-conf.c
 
        $(CC) $(CFLAGS) -DCONFIGFILE=\"@sysconfdir@/onak.conf\" \
                -DDBFUNCS=keydb_@DBTYPE@_funcs -c onak-conf.c
 

+# HACK: onak-conf.o needs to be able to see keydb_@DBTYPE@_funcs, but
+# keydctl doesn't want to link against the DB stuff. To be fixed more cleanly.
+keydctl.o: keydctl.c keyd.h
+       $(CC) $(CFLAGS) -DDBFUNCS=keydb_@DBTYPE@_funcs -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-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


@@ -135,16 +142,26 @@ 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 \
        $(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 \

+               keydctl.o version.h \

                $(foreach be,@BACKENDS@,keydb_$(be).o) *.so
 ifeq (x@KEYD@, xyes)
        $(RM) keyd.o keydb_$(DBTYPE).o
 endif
 
 distclean: clean
                $(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}
+       $(RM) -f Makefile .depend config.log config.status config.h

        $(RM) -r autom4te.cache
 
        $(RM) -r autom4te.cache
 

-.depend: $(SRCS)
+version.h:
+       @echo '#include "config.h"' > version.h
+       @if [ -e .bzr ]; then \
+               echo "#define ONAK_VERSION PACKAGE_VERSION \"+bzr`bzr revno`\"" \
+               >> version.h; \
+       else \
+               echo "#define ONAK_VERSION PACKAGE_VERSION" >> version.h; \
+       fi
+
+.depend: $(SRCS) version.h

        rm -f .depend
        $(MAKEDEPEND) $(CFLAGS) $(SRCS) > .depend
 
        rm -f .depend
        $(MAKEDEPEND) $(CFLAGS) $(SRCS) > .depend