From: agk@sourceware.org <agk@sourceware.org>
To: lvm-devel@redhat.com
Subject: LVM2 ./make.tmpl.in daemons/dmeventd/Makefile. ...
Date: 19 Jan 2010 01:10:48 -0000 [thread overview]
Message-ID: <20100119011048.6469.qmail@sourceware.org> (raw)
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: agk at sourceware.org 2010-01-19 01:10:47
Modified files:
. : make.tmpl.in
daemons/dmeventd: Makefile.in
libdm/misc : dm-log-userspace.h
tools : Makefile.in
Log message:
more build fixes
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/make.tmpl.in.diff?cvsroot=lvm2&r1=1.73&r2=1.74
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/dmeventd/Makefile.in.diff?cvsroot=lvm2&r1=1.30&r2=1.31
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/misc/dm-log-userspace.h.diff?cvsroot=lvm2&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/Makefile.in.diff?cvsroot=lvm2&r1=1.102&r2=1.103
--- LVM2/make.tmpl.in 2009/10/09 15:55:31 1.73
+++ LVM2/make.tmpl.in 2010/01/19 01:10:46 1.74
@@ -54,7 +54,7 @@
udevdir = $(DESTDIR)@udevdir@
interface = @interface@
-interfacedir = $(top_srcdir)/libdm/$(interface)
+interfacebuilddir = $(top_builddir)/libdm/$(interface)
# setup misc variables
# define the ownership variables for the binaries and man pages
--- LVM2/daemons/dmeventd/Makefile.in 2009/11/13 12:48:01 1.30
+++ LVM2/daemons/dmeventd/Makefile.in 2010/01/19 01:10:47 1.31
@@ -64,8 +64,8 @@
$(CC) $(CFLAGS) $(LDFLAGS) -L. -o $@ dmeventd.o \
$(LVMLIBS) $(LIBS) -rdynamic
-dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacedir)/libdevmapper.a
- $(CC) $(CFLAGS) $(LDFLAGS) -static -L. -L$(interfacedir) -o $@ \
+dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a
+ $(CC) $(CFLAGS) $(LDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
dmeventd.o $(LVMLIBS) $(LIBS) -rdynamic
ifeq ("@PKGCONFIG@", "yes")
--- LVM2/libdm/misc/dm-log-userspace.h 2009/08/13 20:51:41 1.1
+++ LVM2/libdm/misc/dm-log-userspace.h 2010/01/19 01:10:47 1.2
@@ -7,7 +7,7 @@
#ifndef __DM_LOG_USERSPACE_H__
#define __DM_LOG_USERSPACE_H__
-#include <linux/dm-ioctl.h> /* For DM_UUID_LEN */
+#include "dm-ioctl.h" /* For DM_UUID_LEN */
/*
* The device-mapper userspace log module consists of a kernel component and
--- LVM2/tools/Makefile.in 2009/10/13 01:31:10 1.102
+++ LVM2/tools/Makefile.in 2010/01/19 01:10:47 1.103
@@ -115,8 +115,8 @@
$(CC) $(CFLAGS) $(LDFLAGS) -L$(top_builddir)/libdm \
-o $@ dmsetup.o -ldevmapper $(LIBS) $(LIB_PTHREAD)
-dmsetup.static: dmsetup.o $(interfacedir)/libdevmapper.a
- $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacedir) \
+dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
+ $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
-o $@ dmsetup.o -ldevmapper $(LIBS) $(LIB_PTHREAD)
all: device-mapper
@@ -125,8 +125,8 @@
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) lvm.o \
$(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic
-lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a $(interfacedir)/libdevmapper.a
- $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacedir) -o $@ \
+lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a $(interfacebuilddir)/libdevmapper.a
+ $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
$(OBJECTS) lvm-static.o $(LVMLIBS) $(LIBS) $(LIB_PTHREAD) \
-rdynamic
next reply other threads:[~2010-01-19 1:10 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-19 1:10 agk [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-11-04 17:25 LVM2 ./make.tmpl.in daemons/dmeventd/Makefile. agk
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=20100119011048.6469.qmail@sourceware.org \
--to=agk@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.