shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-22 17:35:59 +03:00
Code Releases Activity

Build fixes for lvmetad

Browse Source 
Should now be giving better build order and install lvmetad.
This commit is contained in:
Zdenek Kabelac 2011-09-17 14:50:22 +00:00
parent 6a9d54829f
commit 48f57c1cf0
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
daemons/Makefile.in
View File

@ -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)", "")

9
daemons/lvmetad/Makefile.in
View File

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