Build fixes for lvmetad

Should now be giving better build order and install lvmetad.

diff --git a/daemons/Makefile.in b/daemons/Makefile.in
index 70cec8cf631ef843df0e1088ed3d99c1728b49bf..914352b3ebd04486c3f599e926cbea8b02437da6 100644 (file)
--- a/daemons/Makefile.in
+++ b/daemons/Makefile.in
@@ -16,8 +16,11 @@ top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
 
 ifeq ("@BUILD_LVMETAD@", "yes")
-LIB_STATIC=libdaemon.a
+  SUBDIRS += lvmetad
+
+LIB_STATIC = libdaemon.a
 SOURCES = common/daemon-shared.c common/daemon-server.c common/daemon-client.c
+lvmetad.device-mapper: $(LIB_STATIC)
 endif
 
 .PHONY: dmeventd clvmd cmirrord lvmetad
@@ -30,12 +33,6 @@ ifeq ("@BUILD_CMIRRORD@", "yes")
   SUBDIRS += cmirrord
 endif
 
-ifeq ("@BUILD_LVMETAD@", "yes")
-  SUBDIRS += lvmetad
-# FIXME: build dependency order needs rule fixing, using hack
-all: libdaemon.a
-endif
-
 ifeq ("@BUILD_DMEVENTD@", "yes")
   SUBDIRS += dmeventd
 ifneq ("$(CFLOW_CMD)", "")

diff --git a/daemons/lvmetad/Makefile.in b/daemons/lvmetad/Makefile.in
index 001d5d98317a85df25bdd6494a0ad9c530597f76..5480d70ff67b7ea51b37ea6963b7be955ad9cdc4 100644 (file)
--- a/daemons/lvmetad/Makefile.in
+++ b/daemons/lvmetad/Makefile.in
@@ -19,11 +19,9 @@ SOURCES2 = testclient.c
 
 TARGETS = lvmetad lvmetad-testclient
 
-.PHONY: install_lib_dynamic install_lib_static install_include \
-       install_pkgconfig install_dmeventd_dynamic install_dmeventd_static \
-       install_lib install_dmeventd
+.PHONY: install_lvmetad
 
-INCLUDES += -I$(top_srcdir)/daemons/common/
+INCLUDES += -I$(top_srcdir)/daemons/common
 INSTALL_LVMETAD_TARGETS = install_lvmetad
 CLEAN_TARGETS = lvmetad lvmetad-testclient
 
@@ -52,7 +50,8 @@ lvmetad: lvmetad-core.o
 #-include $(top_builddir)/daemons/dmeventd/plugins/mirror/$(LIB_NAME)-lvm2mirror.cflow
 #endif
 
-install_lvmetad: $(INSTALL_DMEVENTD_TARGETS)
+install_lvmetad: lvmetad
+       $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)
 
 install: install_lvmetad