public inbox for lvm2-cvs@sourceware.org
help / color / mirror / Atom feed
* LVM2/daemons Makefile.in lvmetad/Makefile.in
@ 2011-09-17 14:50 zkabelac
0 siblings, 0 replies; 2+ messages in thread
From: zkabelac @ 2011-09-17 14:50 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: zkabelac@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
^ permalink raw reply [flat|nested] 2+ messages in thread
* LVM2/daemons Makefile.in lvmetad/Makefile.in
@ 2011-09-19 0:29 zkabelac
0 siblings, 0 replies; 2+ messages in thread
From: zkabelac @ 2011-09-19 0:29 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: zkabelac@sourceware.org 2011-09-19 00:29:12
Modified files:
daemons : Makefile.in
daemons/lvmetad: Makefile.in
Log message:
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.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/Makefile.in.diff?cvsroot=lvm2&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/lvmetad/Makefile.in.diff?cvsroot=lvm2&r1=1.2&r2=1.3
--- LVM2/daemons/Makefile.in 2011/09/17 14:50:22 1.20
+++ LVM2/daemons/Makefile.in 2011/09/19 00:29:11 1.21
@@ -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 @@
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 @@
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
+
--- LVM2/daemons/lvmetad/Makefile.in 2011/09/17 14:50:23 1.2
+++ LVM2/daemons/lvmetad/Makefile.in 2011/09/19 00:29:12 1.3
@@ -31,10 +31,9 @@
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 \
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-09-19 0:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-17 14:50 LVM2/daemons Makefile.in lvmetad/Makefile.in zkabelac
2011-09-19 0:29 zkabelac
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).