From d4b9af444cf5341ff8425d8a9385ae6948f5f12c Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@redhat.com>
Date: Mon, 3 Nov 2008 23:01:21 +0000
Subject: [PATCH] more tweaks for dmeventd - not finished yet

---
 Makefile.in                           | 3 ++-
 daemons/Makefile.in                   | 4 +++-
 daemons/dmeventd/Makefile.in          | 9 ++++++++-
 daemons/dmeventd/dmeventd.c           | 2 +-
 daemons/dmeventd/libdevmapper-event.c | 2 +-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index fb2be6229..0740f77c4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -47,8 +47,9 @@ tools: lib
 po: tools daemons
 
 libdm.device-mapper: include.device-mapper
+daemons.device-mapper: libdm.device-mapper
 tools.device-mapper: libdm.device-mapper
-device-mapper: tools.device-mapper
+device-mapper: tools.device-mapper daemons.device-mapper
 
 ifeq ("@INTL@", "yes")
 lib.pofile: include.pofile
diff --git a/daemons/Makefile.in b/daemons/Makefile.in
index 9f24883c6..adc9cab08 100644
--- a/daemons/Makefile.in
+++ b/daemons/Makefile.in
@@ -20,8 +20,10 @@ ifneq ("@CLVMD@", "none")
 endif
 
 ifeq ("@DMEVENTD@", "yes")
-  SUBDIRS += dmeventd/plugins
+  SUBDIRS += dmeventd
 endif
 
+device-mapper: dmeventd
+
 include $(top_srcdir)/make.tmpl
 
diff --git a/daemons/dmeventd/Makefile.in b/daemons/dmeventd/Makefile.in
index 1997fa9a7..951670061 100644
--- a/daemons/dmeventd/Makefile.in
+++ b/daemons/dmeventd/Makefile.in
@@ -18,6 +18,7 @@ VPATH = @srcdir@
 SOURCES = libdevmapper-event.c
 
 LIB_STATIC = libdevmapper-event.a
+LIB_VERSION = $(LIB_VERSION_DM)
 
 ifeq ("@LIB_SUFFIX@","dylib")
   LIB_SHARED = libdevmapper-event.dylib
@@ -29,7 +30,13 @@ endif
 TARGETS = dmeventd
 CLEAN_TARGETS = dmeventd.o
 
-include ../make.tmpl
+ifneq ($(MAKECMDGOALS),device-mapper)
+  SUBDIRS+=plugins
+endif
+
+include $(top_srcdir)/make.tmpl
+
+all: dmeventd
 
 LDFLAGS += -ldl -ldevmapper -lpthread
 CLDFLAGS += -ldl -ldevmapper -lpthread
diff --git a/daemons/dmeventd/dmeventd.c b/daemons/dmeventd/dmeventd.c
index 652b54f62..349d5ee74 100644
--- a/daemons/dmeventd/dmeventd.c
+++ b/daemons/dmeventd/dmeventd.c
@@ -25,7 +25,7 @@
 #include "list.h"
 #include "dmeventd.h"
 //#include "libmultilog.h"
-#include "log.h"
+#include "dm-logging.h"
 
 #include <dlfcn.h>
 #include <errno.h>
diff --git a/daemons/dmeventd/libdevmapper-event.c b/daemons/dmeventd/libdevmapper-event.c
index 0515145cd..2650cf0c4 100644
--- a/daemons/dmeventd/libdevmapper-event.c
+++ b/daemons/dmeventd/libdevmapper-event.c
@@ -12,7 +12,7 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "lib.h"
+#include "dmlib.h"
 #include "libdevmapper-event.h"
 //#include "libmultilog.h"
 #include "dmeventd.h"