From fa6b41848e859045842138e13e1ec770cf8aa4d5 Mon Sep 17 00:00:00 2001
From: Zdenek Kabelac <zkabelac@redhat.com>
Date: Mon, 19 Sep 2011 00:29:11 +0000
Subject: [PATCH] Few more updates to lvmetad build deps

It seem lvmetad deps must be expressed after the include.
Also adding lvmetad deps to device-mapper target in daemons dir.
---
 daemons/Makefile.in         | 11 ++++++++---
 daemons/lvmetad/Makefile.in |  3 +--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/daemons/Makefile.in b/daemons/Makefile.in
index 914352b3e..c1f5b6f01 100644
--- a/daemons/Makefile.in
+++ b/daemons/Makefile.in
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved.
 #
 # This file is part of LVM2.
 #
@@ -20,13 +20,12 @@ ifeq ("@BUILD_LVMETAD@", "yes")
 
 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
 
 ifneq ("@CLVMD@", "none")
-  SUBDIRS = clvmd
+  SUBDIRS += clvmd
 endif
 
 ifeq ("@BUILD_CMIRRORD@", "yes")
@@ -49,3 +48,9 @@ include $(top_builddir)/make.tmpl
 ifeq ("@BUILD_DMEVENTD@", "yes")
 device-mapper: dmeventd.device-mapper
 endif
+
+ifeq ("@BUILD_LVMETAD@", "yes")
+device-mapper: lvmetad.device-mapper
+lvmetad.device-mapper: $(LIB_STATIC)
+endif
+
diff --git a/daemons/lvmetad/Makefile.in b/daemons/lvmetad/Makefile.in
index 5480d70ff..bf9635720 100644
--- a/daemons/lvmetad/Makefile.in
+++ b/daemons/lvmetad/Makefile.in
@@ -31,10 +31,9 @@ CFLOW_TARGET = lvmetad
 
 include $(top_builddir)/make.tmpl
 
-all: device-mapper
 device-mapper: $(TARGETS)
 
-LIBS += -ldevmapper -ldaemon -lpthread
+LIBS += -ldevmapper -ldaemon $(PTHREAD_LIBS)
 
 lvmetad: lvmetad-core.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -L$(top_builddir)/daemons -o $@ lvmetad-core.o \
-- 
2.43.5