LVM2 ./WHATS_NEW ./make.tmpl.in tools/Makefile.in

public inbox for lvm2-cvs@sourceware.org
help / color / mirror / Atom feed

* LVM2 ./WHATS_NEW ./make.tmpl.in tools/Makefile.in
@ 2006-02-02 19:16 agk
  0 siblings, 0 replies; 4+ messages in thread
From: agk @ 2006-02-02 19:16 UTC (permalink / raw)
  To: lvm2-cvs

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2006-02-02 19:16:47

Modified files:
	.              : WHATS_NEW make.tmpl.in 
	tools          : Makefile.in 

Log message:
	Add %.so: %.a make template rule.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.342&r2=1.343
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/make.tmpl.in.diff?cvsroot=lvm2&r1=1.41&r2=1.42
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/Makefile.in.diff?cvsroot=lvm2&r1=1.71&r2=1.72


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

* LVM2 ./WHATS_NEW ./make.tmpl.in tools/Makefile.in
@ 2010-05-11  8:34 zkabelac
  0 siblings, 0 replies; 4+ messages in thread
From: zkabelac @ 2010-05-11  8:34 UTC (permalink / raw)
  To: lvm-devel, lvm2-cvs

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2010-05-11 08:34:39

Modified files:
	.              : WHATS_NEW make.tmpl.in 
	tools          : Makefile.in 

Log message:
	Link liblvm2cmd.so with devmapper-event and devmapper libs.
	and remove generic %.so: %.a target.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1550&r2=1.1551
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/make.tmpl.in.diff?cvsroot=lvm2&r1=1.94&r2=1.95
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/Makefile.in.diff?cvsroot=lvm2&r1=1.117&r2=1.118

--- LVM2/WHATS_NEW	2010/05/07 15:24:17	1.1550
+++ LVM2/WHATS_NEW	2010/05/11 08:34:38	1.1551
@@ -1,5 +1,6 @@
 Version 2.02.65 - 
 =================================
+  Link liblvm2cmd.so with devmapper-event and devmapper libs.
   Fix truncated total size displayed by pvscan.
   Add new --sysinit option for vgchange and lvchange.
   Suppress duplicate error messages about read failures and missing devices.
--- LVM2/make.tmpl.in	2010/05/06 10:07:46	1.94
+++ LVM2/make.tmpl.in	2010/05/11 08:34:38	1.95
@@ -320,11 +320,6 @@
 	$(LN_S) -f $(<F) $(libdir)/$(<F).$(LIB_VERSION)
 endif
 
-%.so: %.a
-	$(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
-	$(CFLAGS) $(CLDFLAGS) $(LIBS) -o $@ \
-	@CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@
-
 $(LIB_STATIC): $(OBJECTS)
 	$(RM) $@
 	$(AR) rs $@ $(OBJECTS)
--- LVM2/tools/Makefile.in	2010/04/15 15:12:20	1.117
+++ LVM2/tools/Makefile.in	2010/05/11 08:34:38	1.118
@@ -145,6 +145,9 @@
 	$(AR) rs $@ $(OBJECTS) lvmcmdlib.o lvm2cmd-static.o
 
 liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS)
+	$(CC) -shared -Wl,-soname,$@.$(LIB_VERSION) \
+	$(CFLAGS) $(CLDFLAGS) -o $@ $(LVMLIBS) $(LIBS) \
+		@CLDWHOLEARCHIVE@ liblvm2cmd.a @CLDNOWHOLEARCHIVE@
 
 liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): liblvm2cmd.$(LIB_SUFFIX)
 	$(LN_S) -f $< $@


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

* LVM2 ./WHATS_NEW ./make.tmpl.in tools/Makefile.in
@ 2010-04-15 15:12 zkabelac
  0 siblings, 0 replies; 4+ messages in thread
From: zkabelac @ 2010-04-15 15:12 UTC (permalink / raw)
  To: lvm-devel, lvm2-cvs

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2010-04-15 15:12:20

Modified files:
	.              : WHATS_NEW make.tmpl.in 
	tools          : Makefile.in 

Log message:
	Install symbolic .so links with relative paths between usrlibdir and libdir.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1527&r2=1.1528
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/make.tmpl.in.diff?cvsroot=lvm2&r1=1.91&r2=1.92
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/Makefile.in.diff?cvsroot=lvm2&r1=1.116&r2=1.117

--- LVM2/WHATS_NEW	2010/04/15 15:09:35	1.1527
+++ LVM2/WHATS_NEW	2010/04/15 15:12:20	1.1528
@@ -2,6 +2,7 @@
 =================================
   Added awk script relpath.awk to calculate relative paths.
   Fix double DESTDIR usage for infodir and mandir.
+  Install symbolic .so links with relative paths between usrlibdir and libdir.
 
 Version 2.02.63 - 14th April 2010
 =================================
--- LVM2/make.tmpl.in	2010/04/15 15:09:35	1.91
+++ LVM2/make.tmpl.in	2010/04/15 15:12:20	1.92
@@ -62,6 +62,8 @@
 localedir = $(DESTDIR)@LOCALEDIR@
 staticdir = $(DESTDIR)@STATICDIR@
 udevdir = $(DESTDIR)@udevdir@
+USRLIB_RELPATH = $(shell echo $(abspath $(usrlibdir) $(libdir)) | \
+  awk -f $(top_srcdir)/scripts/relpath.awk)
 
 # Setup vpath search paths for some suffixes
 vpath %.c $(srcdir)
@@ -301,7 +303,7 @@
 install_lib_shared: $(LIB_SHARED)
 	$(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION)
 	$(INSTALL) -d $(usrlibdir)
-	$(LN_S) -f $(libdir)/$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
+	$(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
 
 # FIXME: plugins are currently installed with .so suffix only
 install_lib_shared_plugin: $(LIB_SHARED)
--- LVM2/tools/Makefile.in	2010/04/09 21:42:51	1.116
+++ LVM2/tools/Makefile.in	2010/04/15 15:12:20	1.117
@@ -169,7 +169,7 @@
 install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX)
 	$(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION)
 	$(INSTALL) -d $(usrlibdir)
-	$(LN_S) -f $(libdir)/$<.$(LIB_VERSION) $(usrlibdir)/$(<F)
+	$(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
 
 install_cmdlib_static: liblvm2cmd-static.a
 	$(INSTALL_DATA) -D $< $(usrlibdir)/liblvm2cmd.a


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

* LVM2 ./WHATS_NEW ./make.tmpl.in tools/Makefile.in
@ 2010-03-04  9:53 zkabelac
  0 siblings, 0 replies; 4+ messages in thread
From: zkabelac @ 2010-03-04  9:53 UTC (permalink / raw)
  To: lvm-devel, lvm2-cvs

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2010-03-04 09:53:08

Modified files:
	.              : WHATS_NEW make.tmpl.in 
	tools          : Makefile.in 

Log message:
	Replace CFLOW_CMD only in make.tmpl and use it as variable elsewhere.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1445&r2=1.1446
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/make.tmpl.in.diff?cvsroot=lvm2&r1=1.76&r2=1.77
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/Makefile.in.diff?cvsroot=lvm2&r1=1.104&r2=1.105

--- LVM2/WHATS_NEW	2010/03/04 09:51:37	1.1445
+++ LVM2/WHATS_NEW	2010/03/04 09:53:08	1.1446
@@ -1,5 +1,6 @@
 Version 2.02.62 -
 ====================================
+  Replace CFLOW_CMD only in make.tmpl and use it as variable elsewhere.
   Use $(top_builddir) for inclusion of make.tmpl in Makefiles.
   Fix autoconf warning about ignored datarootdir.
   Increase AC_PREREQ version to 2.61 (for AC_PROC_SED, AC_PROG_MKDIR_P).
--- LVM2/make.tmpl.in	2010/03/04 09:48:19	1.76
+++ LVM2/make.tmpl.in	2010/03/04 09:53:08	1.77
@@ -27,6 +27,7 @@
 GENHTML = @GENHTML@
 LN_S = @LN_S@
 SED = @SED@
+CFLOW_CMD = @CFLOW_CMD@
 
 LIBS = @LIBS@
 DEFS += @DEFS@
--- LVM2/tools/Makefile.in	2010/03/04 09:51:42	1.104
+++ LVM2/tools/Makefile.in	2010/03/04 09:53:08	1.105
@@ -147,20 +147,20 @@
 .PHONY: install_cmdlib_dynamic install_cmdlib_static \
 	install_tools_dynamic install_tools_static
 
-ifneq ("@CFLOW_CMD@", "")
+ifneq ("$(CFLOW_CMD)", "")
 CFLOW_FLAGS += --cpp="$(CC) -E"
 .PHONY: lvm.cflow
 -include $(top_srcdir)/lib/liblvm-internal.cflow
 lvm.cflow: $(SOURCES)
-	@CFLOW_CMD@ -o$@ $(CFLOW_FLAGS) $(INCLUDES) $(DEFS) $(SOURCES)
+	$(CFLOW_CMD) -o$@ $(CFLOW_FLAGS) $(INCLUDES) $(DEFS) $(SOURCES)
 lvm.rxref: $(SOURCES)
-	@CFLOW_CMD@ -o$@ --cpp="$(CC) -E" -r --omit-arguments -x $(INCLUDES) $(DEFS) $(SOURCES)
+	$(CFLOW_CMD) -o$@ --cpp="$(CC) -E" -r --omit-arguments -x $(INCLUDES) $(DEFS) $(SOURCES)
 lvm.xref: $(SOURCES)
-	@CFLOW_CMD@ -o$@ --cpp="$(CC) -E" --omit-arguments -x $(INCLUDES) $(DEFS) $(SOURCES)
+	$(CFLOW_CMD) -o$@ --cpp="$(CC) -E" --omit-arguments -x $(INCLUDES) $(DEFS) $(SOURCES)
 lvm.rtree: $(SOURCES)
-	@CFLOW_CMD@ -o$@ --cpp="$(CC) -E" -r --omit-arguments -T -b $(INCLUDES) $(DEFS) $(SOURCES)
+	$(CFLOW_CMD) -o$@ --cpp="$(CC) -E" -r --omit-arguments -T -b $(INCLUDES) $(DEFS) $(SOURCES)
 lvm.tree: $(SOURCES)
-	@CFLOW_CMD@ -o$@ --cpp="$(CC) -E" --omit-arguments -T -b $(INCLUDES) $(DEFS) $(SOURCES)
+	$(CFLOW_CMD) -o$@ --cpp="$(CC) -E" --omit-arguments -T -b $(INCLUDES) $(DEFS) $(SOURCES)
 cflow: lvm.cflow lvm.xref lvm.tree lvm.rtree lvm.rxref
 endif
 


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

end of thread, other threads:[~2010-05-11  8:34 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-02-02 19:16 LVM2 ./WHATS_NEW ./make.tmpl.in tools/Makefile.in agk
2010-03-04  9:53 zkabelac
2010-04-15 15:12 zkabelac
2010-05-11  8:34 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).