X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=Makefile.in;h=66a3b5c60a481e764cc24cbc17a38e71441c85b1;hb=3e3f47ec2fdbfaf0682d9790a99264a4e60e9bf1;hp=a6c12c5c3bd2e4318e009110438eb031e7e9b31a;hpb=5b3f77c7fbafb036d20a1577ed74f475e94ed821;p=onak.git

diff --git a/Makefile.in b/Makefile.in
index a6c12c5..66a3b5c 100644
--- 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 += keyd
+PROGS += keyd keydctl
 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
@@ -38,9 +38,9 @@ endif
 ifeq (x@DBTYPE@, xdynamic)
 LIBS += -ldl
 BACKENDS = $(foreach be,@BACKENDS@,libkeydb_$(be).so)
-PROGS += keyd
+PROGS += keyd keydctl
 PROGS_LDFLAGS_EXTRA = -rdynamic
-SRCS += keyd.c
+SRCS += keyd.c keydctl.c
 endif
 
 OBJS = stats.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
@@ -48,10 +48,32 @@ OBJS = stats.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
 all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys onak.conf \
 	$(BACKENDS)
 
+install: $(PROGS) onak.conf $(BACKENDS)
+	install -d $(DESTDIR)/@bindir@
+	install -d $(DESTDIR)/@libdir@/onak/backends
+	install -d $(DESTDIR)/@localstatedir@/lib/onak
+	install -d $(DESTDIR)/@mandir@/man1
+	install -d $(DESTDIR)/@mandir@/man8
+	install -d $(DESTDIR)/@sysconfdir@
+	install 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
+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)
 
+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)
 
@@ -61,9 +83,6 @@ libkeydb_pg.so: keydb_pg.o
 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)
@@ -104,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
 
+# 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
@@ -124,7 +148,7 @@ ifeq (x@KEYD@, xyes)
 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
 
 .depend: $(SRCS)