shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

Few more updates to lvmetad build deps

Browse Source 
It seem lvmetad deps must be expressed after the include.
Also adding lvmetad deps to device-mapper target in daemons dir.
This commit is contained in:
Zdenek Kabelac 2011-09-19 00:29:11 +00:00
parent de154812a9
commit 11dd5cf2aa
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
daemons/Makefile.in
View File

@ -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

3
daemons/lvmetad/Makefile.in
View File

@ -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 \