public inbox for lvm2-cvs@sourceware.org
help / color / mirror / Atom feed
* LVM2/tools Makefile.in
@ 2010-10-15  9:41 zkabelac
  0 siblings, 0 replies; 6+ messages in thread
From: zkabelac @ 2010-10-15  9:41 UTC (permalink / raw)
  To: lvm-devel, lvm2-cvs

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 1018 bytes --]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2010-10-15 09:41:21

Modified files:
	tools          : Makefile.in 

Log message:
	Fix linking order for liblvm2cmd
	
	Reorder linked libraries so we better support --as-needed linker flag used
	by some distributions (i.e. Gentoo).
	
	Patch suggested by Diego Elio Pettenò <flameeyes <at> gmail.com>

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

--- LVM2/tools/Makefile.in	2010/08/03 13:00:46	1.121
+++ LVM2/tools/Makefile.in	2010/10/15 09:41:21	1.122
@@ -149,8 +149,9 @@
 
 liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS)
 	$(CC) -shared -Wl,-soname,$@.$(LIB_VERSION) \
-	$(CFLAGS) $(CLDFLAGS) -o $@ $(LVMLIBS) $(LIBS) \
-		@CLDWHOLEARCHIVE@ liblvm2cmd.a @CLDNOWHOLEARCHIVE@
+		$(CFLAGS) $(CLDFLAGS) -o $@ \
+		@CLDWHOLEARCHIVE@ liblvm2cmd.a @CLDNOWHOLEARCHIVE@ \
+		$(LVMLIBS) $(LIBS)
 
 liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): liblvm2cmd.$(LIB_SUFFIX)
 	$(LN_S) -f $< $@


^ permalink raw reply	[flat|nested] 6+ messages in thread

* LVM2/tools Makefile.in
@ 2010-03-31  7:37 zkabelac
  0 siblings, 0 replies; 6+ messages in thread
From: zkabelac @ 2010-03-31  7:37 UTC (permalink / raw)
  To: lvm-devel, lvm2-cvs

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2010-03-31 07:37:16

Modified files:
	tools          : Makefile.in 

Log message:
	Use .commands created in builddir for symlink installation.

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

--- LVM2/tools/Makefile.in	2010/03/29 14:18:01	1.113
+++ LVM2/tools/Makefile.in	2010/03/31 07:37:16	1.114
@@ -179,7 +179,7 @@
 		$(sbindir)/lvm
 	@echo Creating symbolic links for individual commands in $(sbindir)
 	@( \
-		for v in `cat $(srcdir)/.commands`; do \
+		for v in `cat .commands`; do \
 			cd $(sbindir); \
 			$(LN_S) -f lvm $$v; \
 		done; \


^ permalink raw reply	[flat|nested] 6+ messages in thread

* LVM2/tools Makefile.in
@ 2009-05-11 10:13 mbroz
  0 siblings, 0 replies; 6+ messages in thread
From: mbroz @ 2009-05-11 10:13 UTC (permalink / raw)
  To: lvm-devel, lvm2-cvs

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) \


^ permalink raw reply	[flat|nested] 6+ messages in thread

* LVM2/tools Makefile.in
@ 2009-04-15 14:42 mbroz
  0 siblings, 0 replies; 6+ messages in thread
From: mbroz @ 2009-04-15 14:42 UTC (permalink / raw)
  To: lvm-devel, lvm2-cvs

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mbroz@sourceware.org	2009-04-15 14:42:28

Modified files:
	tools          : Makefile.in 

Log message:
	Fix dmsetup.static build.

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

--- LVM2/tools/Makefile.in	2009/04/08 14:08:05	1.94
+++ LVM2/tools/Makefile.in	2009/04/15 14:42:27	1.95
@@ -71,7 +71,7 @@
 INSTALL_CMDLIB_TARGETS = install_cmdlib_dynamic
 
 ifeq ("@STATIC_LINK@", "yes")
-  TARGETS += lvm.static
+  TARGETS += lvm.static dmsetup.static
   INSTALL_LVM_TARGETS += install_tools_static
   INSTALL_DMSETUP_TARGETS += install_dmsetup_static
   INSTALL_CMDLIB_TARGETS += install_cmdlib_static


^ permalink raw reply	[flat|nested] 6+ messages in thread

* LVM2/tools Makefile.in
@ 2009-02-17 11:08 mbroz
  0 siblings, 0 replies; 6+ messages in thread
From: mbroz @ 2009-02-17 11:08 UTC (permalink / raw)
  To: lvm-devel, lvm2-cvs

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mbroz@sourceware.org	2009-02-17 11:08:00

Modified files:
	tools          : Makefile.in 

Log message:
	Fix lvm.static build dependence (to properly propagate changes in libdevmapper).

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

--- LVM2/tools/Makefile.in	2008/11/14 20:59:57	1.90
+++ LVM2/tools/Makefile.in	2009/02/17 11:07:59	1.91
@@ -117,7 +117,7 @@
 		$(LDFLAGS) $(LVMLIBS) $(LIBS) -rdynamic
 
 LIB_PTHREAD = @LIB_PTHREAD@
-lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm.a
+lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm.a  $(interfacedir)/libdevmapper.a
 	$(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm-static.o -static \
 		-L$(interfacedir) $(LDFLAGS) $(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic
 


^ permalink raw reply	[flat|nested] 6+ messages in thread

* LVM2/tools Makefile.in
@ 2008-11-10 13:41 mbroz
  0 siblings, 0 replies; 6+ messages in thread
From: mbroz @ 2008-11-10 13:41 UTC (permalink / raw)
  To: lvm-devel, lvm2-cvs

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mbroz@sourceware.org	2008-11-10 13:41:44

Modified files:
	tools          : Makefile.in 

Log message:
	Fix lvm2.static build.

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

--- LVM2/tools/Makefile.in	2008/11/04 17:25:32	1.88
+++ LVM2/tools/Makefile.in	2008/11/10 13:41:43	1.89
@@ -119,7 +119,7 @@
 LIB_PTHREAD = @LIB_PTHREAD@
 lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm.a
 	$(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm-static.o -static \
-		$(LDFLAGS) $(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic
+		-L$(interfacedir) $(LDFLAGS) $(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic
 
 liblvm2cmd.a: $(top_srcdir)/lib/liblvm.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
 	cat $(top_srcdir)/lib/liblvm.a > $@


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2010-10-15  9:41 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-10-15  9:41 LVM2/tools Makefile.in zkabelac
  -- strict thread matches above, loose matches on Subject: below --
2010-03-31  7:37 zkabelac
2009-05-11 10:13 mbroz
2009-04-15 14:42 mbroz
2009-02-17 11:08 mbroz
2008-11-10 13:41 mbroz

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).