more tweaks for dmeventd - not finished yet

diff --git a/Makefile.in b/Makefile.in
index fb2be62291d31ac24f00947f80b60d8c582deecf..0740f77c4d4471f4435e02ef7ad839c8ed1f6b15 100644 (file)
--- 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 9f24883c6b719ccb6e4dac302b71491a3b2e4ef6..adc9cab088e3496daa79f8e12457331382051347 100644 (file)
--- 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 1997fa9a7d3ed467e63fe8c9e654e0436f2af649..9516700616afcb8fb7e62df4098d3e5e0dee5400 100644 (file)
--- 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 652b54f62fe6b38147bb0497797f644a8df3bc7c..349d5ee74401678fe6595005f42bffae56c32939 100644 (file)
--- 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 0515145cd1be798fb2252710ea8f3e257d80d580..2650cf0c438fe1c9589eba361a0938ab90c2e163 100644 (file)
--- 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"