From: zkabelac@sourceware.org <zkabelac@sourceware.org>
To: lvm-devel@redhat.com
Subject: LVM2/daemons Makefile.in lvmetad/Makefile.in
Date: 17 Sep 2011 14:50:24 -0000 [thread overview]
Message-ID: <20110917145024.20030.qmail@sourceware.org> (raw)
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: zkabelac at sourceware.org 2011-09-17 14:50:23
Modified files:
daemons : Makefile.in
daemons/lvmetad: Makefile.in
Log message:
Build fixes for lvmetad
Should now be giving better build order and install lvmetad.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/Makefile.in.diff?cvsroot=lvm2&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/lvmetad/Makefile.in.diff?cvsroot=lvm2&r1=1.1&r2=1.2
--- LVM2/daemons/Makefile.in 2011/09/02 14:49:00 1.19
+++ LVM2/daemons/Makefile.in 2011/09/17 14:50:22 1.20
@@ -16,8 +16,11 @@
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 @@
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)", "")
--- LVM2/daemons/lvmetad/Makefile.in 2011/08/31 11:31:58 1.1
+++ LVM2/daemons/lvmetad/Makefile.in 2011/09/17 14:50:23 1.2
@@ -19,11 +19,9 @@
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 @@
#-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
next reply other threads:[~2011-09-17 14:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-17 14:50 zkabelac [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-09-19 0:29 LVM2/daemons Makefile.in lvmetad/Makefile.in zkabelac
2011-09-19 1:01 ` Alasdair G Kergon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110917145024.20030.qmail@sourceware.org \
--to=zkabelac@sourceware.org \
--cc=lvm-devel@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.