diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2011-09-19 00:29:11 +0000 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2011-09-19 00:29:11 +0000 |
| commit | 11dd5cf2aaae3d3b3d06cd30be06340c6c616ec3 (patch) | |
| tree | 281dd84b0090c3069acef58964c78ce9a43195fd | |
| parent | de154812a9fb915a6ae8de787785563f33d34739 (diff) | |
| download | lvm2-11dd5cf2aaae3d3b3d06cd30be06340c6c616ec3.tar.gz lvm2-11dd5cf2aaae3d3b3d06cd30be06340c6c616ec3.tar.xz lvm2-11dd5cf2aaae3d3b3d06cd30be06340c6c616ec3.zip | |
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.
| -rw-r--r-- | daemons/Makefile.in | 11 | ||||
| -rw-r--r-- | daemons/lvmetad/Makefile.in | 3 |
2 files changed, 9 insertions, 5 deletions
diff --git a/daemons/Makefile.in b/daemons/Makefile.in index 914352b3..c1f5b6f0 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 5480d70f..bf963572 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 \ |