From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-1884-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 14714 invoked by alias); 11 May 2009 10:13:28 -0000
Received: (qmail 14695 invoked by uid 9664); 11 May 2009 10:13:28 -0000
Date: Mon, 11 May 2009 10:13:00 -0000
Message-ID: <20090511101328.14693.qmail@sourceware.org>
From: mbroz@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/tools Makefile.in
Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <lvm2-cvs.sourceware.org>
List-Subscribe: <mailto:lvm2-cvs-subscribe@sourceware.org>
List-Post: <mailto:lvm2-cvs@sourceware.org>
List-Help: <mailto:lvm2-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: lvm2-cvs-owner@sourceware.org
X-SW-Source: 2009-05/txt/msg00010.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mbroz@sourceware.org	2009-05-11 10:13:28

Modified files:
	tools          : Makefile.in 

Log message:
	Fix device-mapper static build targets.
	
	dmsetup.static is not built and cleaned properly
	if running only device-mapper install/build.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/Makefile.in.diff?cvsroot=lvm2&r1=1.95&r2=1.96

--- LVM2/tools/Makefile.in	2009/04/15 14:42:27	1.95
+++ LVM2/tools/Makefile.in	2009/05/11 10:13:28	1.96
@@ -66,12 +66,15 @@
 	.commands \
 	lvm
 
+TARGETS_DM = dmsetup
+
 INSTALL_LVM_TARGETS = install_tools_dynamic
 INSTALL_DMSETUP_TARGETS = install_dmsetup_dynamic
 INSTALL_CMDLIB_TARGETS = install_cmdlib_dynamic
 
 ifeq ("@STATIC_LINK@", "yes")
-  TARGETS += lvm.static dmsetup.static
+  TARGETS += lvm.static
+  TARGETS_DM += dmsetup.static
   INSTALL_LVM_TARGETS += install_tools_static
   INSTALL_DMSETUP_TARGETS += install_dmsetup_static
   INSTALL_CMDLIB_TARGETS += install_cmdlib_static
@@ -82,7 +85,7 @@
 CLEAN_TARGETS = liblvm2cmd.$(LIB_SUFFIX) liblvm2cmd.a liblvm2cmd-static.a lvm lvm.o \
 		lvm2cmd.o lvm2cmd-static.o lvm2cmdlib.o lvm.static \
 		lvm.cflow lvm.xref lvm.tree lvm.rxref lvm.rtree \
-		lvmcmdlib.o lvm-static.o dmsetup.o dmsetup
+		lvmcmdlib.o lvm-static.o dmsetup.o $(TARGETS_DM)
 
 ifeq ("@CMDLIB@", "yes")
 	TARGETS += liblvm2cmd.$(LIB_SUFFIX)
@@ -99,7 +102,7 @@
 
 include $(top_srcdir)/make.tmpl
 
-device-mapper: dmsetup
+device-mapper: $(TARGETS_DM)
 
 dmsetup: dmsetup.o $(top_srcdir)/libdm/libdevmapper.$(LIB_SUFFIX)
 	$(CC) -o $@ dmsetup.o $(CFLAGS) $(LDFLAGS) \