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

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

* LVM2 ./Makefile.in ./WHATS_NEW ./make.tmpl.in  ...
@ 2010-05-20 14:45 agk
  0 siblings, 0 replies; 5+ messages in thread
From: agk @ 2010-05-20 14:45 UTC (permalink / raw)
  To: lvm-devel, lvm2-cvs

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2010-05-20 14:45:17

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

Log message:
	Add make install_initscripts

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/Makefile.in.diff?cvsroot=lvm2&r1=1.53&r2=1.54
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1570&r2=1.1571
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/make.tmpl.in.diff?cvsroot=lvm2&r1=1.100&r2=1.101
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/scripts/Makefile.in.diff?cvsroot=lvm2&r1=1.17&r2=1.18

--- LVM2/Makefile.in	2010/05/20 13:47:21	1.53
+++ LVM2/Makefile.in	2010/05/20 14:45:14	1.54
@@ -86,6 +86,9 @@
 	$(INSTALL_ROOT_DIR) $(DESTDIR)$(DEFAULT_LOCK_DIR)
 	$(INSTALL_ROOT_DATA) /dev/null $(DESTDIR)$(DEFAULT_CACHE_DIR)/.cache
 
+install_initscripts: 
+	$(MAKE) -C scripts install_initscripts
+
 LCOV_TRACES = libdm.info lib.info tools.info \
 	daemons/dmeventd.info daemons/clvmd.info
 CLEAN_TARGETS += $(LCOV_TRACES)
--- LVM2/WHATS_NEW	2010/05/20 13:47:21	1.1570
+++ LVM2/WHATS_NEW	2010/05/20 14:45:14	1.1571
@@ -1,6 +1,6 @@
 Version 2.02.66 - 
 ===============================
-  Add install_system_dirs makefile target.
+  Add install_system_dirs and install_initscripts makefile targets.
   Add configure options for system and locking directories.
   Generate example.conf so default lvm.conf contents can be configured.
   Install lvmconf script by default.
--- LVM2/make.tmpl.in	2010/05/20 13:47:21	1.100
+++ LVM2/make.tmpl.in	2010/05/20 14:45:14	1.101
@@ -90,7 +90,7 @@
 # Handle installation of files
 ifeq ("@WRITE_INSTALL@", "yes")
 # leaving defaults
-M_INSTALL_PROGRAM =
+M_INSTALL_SCRIPT =
 M_INSTALL_DATA = -m 644
 else
 M_INSTALL_PROGRAM = -m 555
@@ -100,8 +100,10 @@
 INSTALL_DATA = $(INSTALL) -p $(M_INSTALL_DATA)
 INSTALL_WDATA = $(INSTALL) -p -m 644
 
+INSTALL_DIR = $(INSTALL) -m 0755 -d
 INSTALL_ROOT_DIR = $(INSTALL) -m 0700 -d
 INSTALL_ROOT_DATA = $(INSTALL) -m 0600
+INSTALL_SCRIPT = $(INSTALL) -p -m $(M_INSTALL_PROGRAM)
 
 .SUFFIXES: .c .d .o .so .a .po .pot .mo .dylib
 
--- LVM2/scripts/Makefile.in	2010/05/20 11:20:38	1.17
+++ LVM2/scripts/Makefile.in	2010/05/20 14:45:17	1.18
@@ -31,4 +31,15 @@
 
 install: install_lvm2
 
+# FIXME Customise for other distributions
+install_initscripts:
+	$(INSTALL_DIR) $(DESTDIR)/etc/rc.d/init.d
+	$(INSTALL_SCRIPT) lvm2_monitoring_init_red_hat $(DESTDIR)/etc/rc.d/init.d/lvm2-monitor
+ifneq ("@CLVMD@", "none")
+	$(INSTALL_SCRIPT) clvmd_init_red_hat $(DESTDIR)/etc/rc.d/init.d/clvmd
+endif
+ifeq ("@BUILD_CMIRRORD@", "yes")
+	$(INSTALL_SCRIPT) cmirrord_init_red_hat $(DESTDIR)/etc/rc.d/init.d/cmirrord
+endif
+
 DISTCLEAN_TARGETS += clvmd_init_red_hat cmirrord_init_red_hat lvm2_monitoring_init_red_hat


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

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

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2010-04-09 21:34:32

Modified files:
	.              : Makefile.in WHATS_NEW make.tmpl.in 
	daemons        : Makefile.in 
	daemons/clvmd  : Makefile.in 
	daemons/cmirrord: Makefile.in 
	daemons/dmeventd: Makefile.in 
	daemons/dmeventd/plugins: Makefile.in 
	daemons/dmeventd/plugins/lvm2: Makefile.in 
	daemons/dmeventd/plugins/mirror: Makefile.in 
	daemons/dmeventd/plugins/snapshot: Makefile.in 
	doc            : Makefile.in 
	lib            : Makefile.in 
	lib/format1    : Makefile.in 
	lib/format_pool: Makefile.in 
	lib/locking    : Makefile.in 
	lib/mirror     : Makefile.in 
	lib/snapshot   : Makefile.in 
	libdm          : Makefile.in 
	liblvm         : Makefile.in 
	man            : Makefile.in 
	po             : Makefile.in 
	scripts        : Makefile.in 
	test/api       : Makefile.in 
	tools          : Makefile.in 
	udev           : Makefile.in 

Log message:
	Use vpath instead of VPATH.
	
	Usage of VPATH makes troubles when used within $(builddir).
	Not only source files are being found through VPATH,
	but targets as well. (make --debug=v)
	
	Thus if user builds the code in $(srcdir) and also in some $(builddir)
	he gets mangled results as some generated files (i.e. .export.sym)
	are 'reused' from $(srcdir) instead of $(builddir).
	
	This patch switches to use vpath were we could explicitly name
	suffixes that should be looked via vpath - we must take care,
	we do not generate files with these suffixes:
	.c, .in, .po, .exported_symbols

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/Makefile.in.diff?cvsroot=lvm2&r1=1.50&r2=1.51
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1507&r2=1.1508
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/make.tmpl.in.diff?cvsroot=lvm2&r1=1.88&r2=1.89
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/Makefile.in.diff?cvsroot=lvm2&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/Makefile.in.diff?cvsroot=lvm2&r1=1.38&r2=1.39
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/cmirrord/Makefile.in.diff?cvsroot=lvm2&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/dmeventd/Makefile.in.diff?cvsroot=lvm2&r1=1.39&r2=1.40
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/dmeventd/plugins/Makefile.in.diff?cvsroot=lvm2&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/dmeventd/plugins/lvm2/Makefile.in.diff?cvsroot=lvm2&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/dmeventd/plugins/mirror/Makefile.in.diff?cvsroot=lvm2&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/dmeventd/plugins/snapshot/Makefile.in.diff?cvsroot=lvm2&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/doc/Makefile.in.diff?cvsroot=lvm2&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/Makefile.in.diff?cvsroot=lvm2&r1=1.100&r2=1.101
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/format1/Makefile.in.diff?cvsroot=lvm2&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/format_pool/Makefile.in.diff?cvsroot=lvm2&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/locking/Makefile.in.diff?cvsroot=lvm2&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/mirror/Makefile.in.diff?cvsroot=lvm2&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/snapshot/Makefile.in.diff?cvsroot=lvm2&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/Makefile.in.diff?cvsroot=lvm2&r1=1.52&r2=1.53
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/liblvm/Makefile.in.diff?cvsroot=lvm2&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/man/Makefile.in.diff?cvsroot=lvm2&r1=1.34&r2=1.35
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/po/Makefile.in.diff?cvsroot=lvm2&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/scripts/Makefile.in.diff?cvsroot=lvm2&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/api/Makefile.in.diff?cvsroot=lvm2&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/Makefile.in.diff?cvsroot=lvm2&r1=1.114&r2=1.115
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/udev/Makefile.in.diff?cvsroot=lvm2&r1=1.6&r2=1.7

--- LVM2/Makefile.in	2010/04/06 11:53:53	1.50
+++ LVM2/Makefile.in	2010/04/09 21:34:25	1.51
@@ -15,7 +15,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 SUBDIRS = doc include man scripts
 
--- LVM2/WHATS_NEW	2010/04/09 01:00:10	1.1507
+++ LVM2/WHATS_NEW	2010/04/09 21:34:25	1.1508
@@ -1,5 +1,6 @@
 Version 2.02.63 -  
 ================================
+  Switch from using VPATH  to vpath in Makefiles.
   Permit mimage LVs to be striped in lvcreate and lvresize.
   Fix pvmove allocation to take existing parallel stripes into account.
   Add pvmove_source_seg to struct lv_segment.
--- LVM2/make.tmpl.in	2010/04/08 09:15:37	1.88
+++ LVM2/make.tmpl.in	2010/04/09 21:34:25	1.89
@@ -63,6 +63,12 @@
 staticdir = $(DESTDIR)@STATICDIR@
 udevdir = $(DESTDIR)@udevdir@
 
+# Setup vpath search paths for some suffixes
+vpath %.c $(srcdir)
+vpath %.in $(srcdir)
+vpath %.po $(srcdir)
+vpath %.exported_symbols $(srcdir)
+
 interface = @interface@
 interfacebuilddir = $(top_builddir)/libdm/$(interface)
 
--- LVM2/daemons/Makefile.in	2010/03/29 14:11:17	1.15
+++ LVM2/daemons/Makefile.in	2010/04/09 21:34:25	1.16
@@ -14,7 +14,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 .PHONY: dmeventd clvmd cmirrord
 
--- LVM2/daemons/clvmd/Makefile.in	2010/03/29 14:18:00	1.38
+++ LVM2/daemons/clvmd/Makefile.in	2010/04/09 21:34:26	1.39
@@ -14,7 +14,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 CCS_LIBS = @CCS_LIBS@
 CCS_CFLAGS = @CCS_CFLAGS@
--- LVM2/daemons/cmirrord/Makefile.in	2010/03/04 09:51:38	1.7
+++ LVM2/daemons/cmirrord/Makefile.in	2010/04/09 21:34:26	1.8
@@ -14,7 +14,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 CPG_LIBS = @CPG_LIBS@
 CPG_CFLAGS = @CPG_CFLAGS@
--- LVM2/daemons/dmeventd/Makefile.in	2010/03/29 14:18:00	1.39
+++ LVM2/daemons/dmeventd/Makefile.in	2010/04/09 21:34:26	1.40
@@ -14,7 +14,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 SOURCES = libdevmapper-event.c
 SOURCES2 = dmeventd.c
--- LVM2/daemons/dmeventd/plugins/Makefile.in	2010/03/04 09:51:38	1.7
+++ LVM2/daemons/dmeventd/plugins/Makefile.in	2010/04/09 21:34:27	1.8
@@ -15,7 +15,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 SUBDIRS += lvm2 mirror snapshot
 
--- LVM2/daemons/dmeventd/plugins/lvm2/Makefile.in	2010/03/04 11:21:05	1.3
+++ LVM2/daemons/dmeventd/plugins/lvm2/Makefile.in	2010/04/09 21:34:27	1.4
@@ -14,7 +14,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 CLDFLAGS += -L$(top_builddir)/tools
 
--- LVM2/daemons/dmeventd/plugins/mirror/Makefile.in	2010/03/29 14:11:18	1.17
+++ LVM2/daemons/dmeventd/plugins/mirror/Makefile.in	2010/04/09 21:34:27	1.18
@@ -15,7 +15,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 INCLUDES += -I$(top_srcdir)/tools -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2
 CLDFLAGS += -L$(top_builddir)/tools -L$(top_builddir)/daemons/dmeventd/plugins/lvm2
--- LVM2/daemons/dmeventd/plugins/snapshot/Makefile.in	2010/03/04 11:21:06	1.12
+++ LVM2/daemons/dmeventd/plugins/snapshot/Makefile.in	2010/04/09 21:34:27	1.13
@@ -15,7 +15,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 INCLUDES += -I$(top_srcdir)/tools -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2
 CLDFLAGS += -L$(top_builddir)/tools -L$(top_builddir)/daemons/dmeventd/plugins/lvm2
--- LVM2/doc/Makefile.in	2010/03/04 09:51:38	1.7
+++ LVM2/doc/Makefile.in	2010/04/09 21:34:28	1.8
@@ -14,9 +14,8 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
-CONFSRC=example.conf
+CONFSRC=$(srcdir)/example.conf
 CONFDEST=lvm.conf
 
 include $(top_builddir)/make.tmpl
--- LVM2/lib/Makefile.in	2010/03/29 14:18:00	1.100
+++ LVM2/lib/Makefile.in	2010/04/09 21:34:28	1.101
@@ -15,7 +15,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 ifeq ("@LVM1@", "shared")
   SUBDIRS = format1
--- LVM2/lib/format1/Makefile.in	2010/03/04 09:51:39	1.12
+++ LVM2/lib/format1/Makefile.in	2010/04/09 21:34:29	1.13
@@ -15,7 +15,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 SOURCES =\
 	disk-rep.c \
--- LVM2/lib/format_pool/Makefile.in	2010/03/04 09:51:39	1.8
+++ LVM2/lib/format_pool/Makefile.in	2010/04/09 21:34:29	1.9
@@ -15,7 +15,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 SOURCES =\
 	disk_rep.c \
--- LVM2/lib/locking/Makefile.in	2010/03/04 09:51:39	1.6
+++ LVM2/lib/locking/Makefile.in	2010/04/09 21:34:29	1.7
@@ -15,7 +15,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 SOURCES = cluster_locking.c
 
--- LVM2/lib/mirror/Makefile.in	2010/03/04 09:51:39	1.7
+++ LVM2/lib/mirror/Makefile.in	2010/04/09 21:34:29	1.8
@@ -15,7 +15,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 SOURCES = mirrored.c
 
--- LVM2/lib/snapshot/Makefile.in	2010/03/04 09:51:40	1.7
+++ LVM2/lib/snapshot/Makefile.in	2010/04/09 21:34:30	1.8
@@ -15,7 +15,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 SOURCES = snapshot.c
 
--- LVM2/libdm/Makefile.in	2010/03/29 14:18:01	1.52
+++ LVM2/libdm/Makefile.in	2010/04/09 21:34:30	1.53
@@ -15,7 +15,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 SOURCES =\
 	datastruct/bitset.c \
--- LVM2/liblvm/Makefile.in	2010/03/04 11:12:40	1.20
+++ LVM2/liblvm/Makefile.in	2010/04/09 21:34:30	1.21
@@ -15,7 +15,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 SOURCES =\
 	lvm_misc.c \
--- LVM2/man/Makefile.in	2010/03/29 14:22:00	1.34
+++ LVM2/man/Makefile.in	2010/04/09 21:34:30	1.35
@@ -15,7 +15,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 ifeq ("@FSADM@", "yes")
 FSADMMAN = fsadm.8
--- LVM2/po/Makefile.in	2010/03/04 09:51:41	1.8
+++ LVM2/po/Makefile.in	2010/04/09 21:34:31	1.9
@@ -14,7 +14,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 LANGS=de
 
--- LVM2/scripts/Makefile.in	2010/03/04 09:51:41	1.13
+++ LVM2/scripts/Makefile.in	2010/04/09 21:34:31	1.14
@@ -14,7 +14,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 include $(top_builddir)/make.tmpl
 
--- LVM2/test/api/Makefile.in	2010/03/04 11:21:06	1.12
+++ LVM2/test/api/Makefile.in	2010/04/09 21:34:31	1.13
@@ -14,7 +14,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 ifeq ("@DEBUG@", "yes")
 	DEFS += -DDEBUG
--- LVM2/tools/Makefile.in	2010/03/31 07:37:16	1.114
+++ LVM2/tools/Makefile.in	2010/04/09 21:34:32	1.115
@@ -15,7 +15,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 SOURCES =\
 	dumpconfig.c \
@@ -146,7 +145,7 @@
 
 liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS)
 
-.commands: commands.h cmdnames.h Makefile
+.commands: $(srcdir)/commands.h $(srcdir)/cmdnames.h Makefile
 	$(CC) -E -P $(srcdir)/cmdnames.h 2> /dev/null | \
 		egrep -v '^ *(|#.*|dumpconfig|formats|help|pvdata|segtypes|version) *$$' > .commands
 
--- LVM2/udev/Makefile.in	2010/03/31 07:40:20	1.6
+++ LVM2/udev/Makefile.in	2010/04/09 21:34:32	1.7
@@ -14,7 +14,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 DM_RULES=10-dm.rules 13-dm-disk.rules 95-dm-notify.rules
 LVM_RULES=11-dm-lvm.rules
@@ -24,6 +23,8 @@
 
 include $(top_builddir)/make.tmpl
 
+vpath %.rules $(srcdir)
+
 %: %.in
 	$(SED) -e "s/(DM_DIR)/$(DM_DIR)/" $< >$@
 


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

* LVM2 ./Makefile.in ./WHATS_NEW ./make.tmpl.in  ...
@ 2010-03-29 14:18 zkabelac
  0 siblings, 0 replies; 5+ messages in thread
From: zkabelac @ 2010-03-29 14:18 UTC (permalink / raw)
  To: lvm-devel, lvm2-cvs

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2010-03-29 14:18:01

Modified files:
	.              : Makefile.in WHATS_NEW make.tmpl.in 
	daemons/clvmd  : Makefile.in 
	daemons/dmeventd: Makefile.in 
	lib            : Makefile.in 
	libdm          : Makefile.in 
	man            : Makefile.in 
	test           : Makefile.in 
	tools          : Makefile.in 

Log message:
	Fixing another set of distclean problems where we left some generated files
	in clvmd, dmevend, man, tests.
	
	Don't include dependency files for clow and cscope.out targets
	
	Improve dependency tracking for dmeventd and liblvm2cmd sources.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/Makefile.in.diff?cvsroot=lvm2&r1=1.46&r2=1.47
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1485&r2=1.1486
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/make.tmpl.in.diff?cvsroot=lvm2&r1=1.85&r2=1.86
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/Makefile.in.diff?cvsroot=lvm2&r1=1.37&r2=1.38
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/dmeventd/Makefile.in.diff?cvsroot=lvm2&r1=1.38&r2=1.39
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/Makefile.in.diff?cvsroot=lvm2&r1=1.99&r2=1.100
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/Makefile.in.diff?cvsroot=lvm2&r1=1.51&r2=1.52
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/man/Makefile.in.diff?cvsroot=lvm2&r1=1.32&r2=1.33
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.28&r2=1.29
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/Makefile.in.diff?cvsroot=lvm2&r1=1.112&r2=1.113

--- LVM2/Makefile.in	2010/03/29 14:11:17	1.46
+++ LVM2/Makefile.in	2010/03/29 14:17:59	1.47
@@ -34,12 +34,9 @@
 endif
 
 ifeq ($(MAKECMDGOALS),distclean)
-  SUBDIRS += liblvm \
-	     udev \
-	     test/api \
-	     test \
-	     po
-  DISTCLEAN_TARGETS += lib/misc/configure.h lib/misc/lvm-version.h
+  SUBDIRS = doc include man scripts \
+    lib tools daemons libdm \
+    udev po liblvm test/api test
   DISTCLEAN_DIRS += lcov_reports*
 endif
 
--- LVM2/WHATS_NEW	2010/03/26 22:15:43	1.1485
+++ LVM2/WHATS_NEW	2010/03/29 14:17:59	1.1486
@@ -1,5 +1,7 @@
 Version 2.02.63 -  
 ================================
+  Improved dependency tracking for dmeventd and liblvm2cmd sources.
+  Improved Makefile rules for distclean and cflow targets.
   Add ability to create mirrored logs for mirror LVs.
   Use a real socket for singlenode clvmd to fix clvmd's high cpu load.
   Fix clvmd cluster propagation of dmeventd monitoring mode.
--- LVM2/make.tmpl.in	2010/03/29 14:11:17	1.85
+++ LVM2/make.tmpl.in	2010/03/29 14:18:00	1.86
@@ -301,12 +301,12 @@
 	$(MSGFMT) -o $@ $<
 
 clean: $(SUBDIRS.clean)
-	$(RM) $(OBJECTS) $(TARGETS) $(CLEAN_TARGETS) $(SOURCES:%.c=%.d) \
-	      $(SOURCES2:%.c=%.d) $(SOURCES:%.c=%.pot) $(SOURCES:%.c=%.gcno) \
-	      $(SOURCES:%.c=%.gcda) $(LDDEPS) $(CLEAN_CFLOW)
+	$(RM) $(OBJECTS) $(TARGETS) $(CLEAN_TARGETS) $(CLEAN_CFLOW) $(LDDEPS) \
+	$(POTFILES) $(SOURCES:%.c=%.d) $(SOURCES:%.c=%.gcno) $(SOURCES:%.c=%.gcda) \
+	$(SOURCES2:%.c=%.o) $(SOURCES2:%.c=%.d) $(SOURCES2:%.c=%.gcno) $(SOURCES2:%.c=%.gcda)
 
 distclean: clean $(SUBDIRS.distclean)
-	$(RM) -rf $(DISTCLEAN_DIRS)
+	$(RM) -r $(DISTCLEAN_DIRS)
 	$(RM) $(DISTCLEAN_TARGETS)  \
 	      config.cache config.log config.status \
 	      Makefile make.tmpl core \
@@ -317,15 +317,11 @@
 		 sed "s/^/		/;s/$$/;/" < $<; \
 		 echo "	local:"; echo "		*;"; echo "};") > $@
 
-ifneq ($(MAKECMDGOALS),cflow)
-ifneq ($(MAKECMDGOALS),clean)
-  ifneq ($(MAKECMDGOALS),distclean)
+ifeq (,$(findstring $(MAKECMDGOALS),cscope.out cflow clean distclean))
     ifdef SOURCES
        -include $(SOURCES:.c=.d)
     endif
     ifdef SOURCES2
        -include $(SOURCES2:.c=.d)
     endif
-  endif
-endif
 endif
--- LVM2/daemons/clvmd/Makefile.in	2010/03/18 09:19:31	1.37
+++ LVM2/daemons/clvmd/Makefile.in	2010/03/29 14:18:00	1.38
@@ -76,6 +76,14 @@
 	DEFS += -DUSE_SINGLENODE
 endif
 
+ifeq ($(MAKECMDGOALS),distclean)
+	SOURCES += clvmd-gulm.c tcp-comms.c
+	SOURCES += clvmd-cman.c
+	SOURCES += clvmd-openais.c
+	SOURCES += clvmd-corosync.c
+	SOURCES += clvmd-singlenode.c
+endif
+
 TARGETS = \
 	clvmd
 
@@ -109,4 +117,3 @@
 install: $(INSTALL_TARGETS)
 
 install_cluster: $(INSTALL_TARGETS)
-
--- LVM2/daemons/dmeventd/Makefile.in	2010/03/29 14:11:17	1.38
+++ LVM2/daemons/dmeventd/Makefile.in	2010/03/29 14:18:00	1.39
@@ -17,6 +17,8 @@
 VPATH = @srcdir@
 
 SOURCES = libdevmapper-event.c
+SOURCES2 = dmeventd.c
+
 TARGETS = dmeventd
 
 .PHONY: install_lib_dynamic install_lib_static install_include \
@@ -118,10 +120,9 @@
 
 install_device-mapper: install_include install_lib install_dmeventd
 
-.PHONY: distclean_lib distclean
+.PHONY: distclean_lib
 
 distclean_lib: 
 	$(RM) libdevmapper-event.pc
 
 distclean: distclean_lib
-
--- LVM2/lib/Makefile.in	2010/03/29 14:11:18	1.99
+++ LVM2/lib/Makefile.in	2010/03/29 14:18:00	1.100
@@ -165,3 +165,5 @@
 include $(top_builddir)/make.tmpl
 
 $(SUBDIRS): $(LIB_STATIC)
+
+DISTCLEAN_TARGETS += misc/configure.h misc/lvm-version.h
--- LVM2/libdm/Makefile.in	2010/03/29 14:11:18	1.51
+++ LVM2/libdm/Makefile.in	2010/03/29 14:18:01	1.52
@@ -106,9 +106,9 @@
 	rm -f libdevmapper.$(LIB_SUFFIX)
 	$(LN_S) $< libdevmapper.$(LIB_SUFFIX)
 
-CLEAN_TARGETS += libdevmapper.$(LIB_SUFFIX)
+CLEAN_TARGETS += libdevmapper.$(LIB_SUFFIX) ioctl/libdevmapper.a
 
-.PHONY: distclean_lib distclean
+.PHONY: distclean_lib
 
 distclean_lib:
 	$(RM) libdevmapper.pc
--- LVM2/man/Makefile.in	2010/03/04 09:56:01	1.32
+++ LVM2/man/Makefile.in	2010/03/29 14:18:01	1.33
@@ -47,6 +47,7 @@
 MAN8DIR=$(mandir)/man8
 
 CLEAN_TARGETS=$(MAN5) $(MAN8) $(MAN8CLUSTER) $(FSADMMAN) $(MAN8DM)
+DISTCLEAN_TARGETS=fsadm.8 clvmd.8 cmirrord.8
 
 include $(top_builddir)/make.tmpl
 
--- LVM2/test/Makefile.in	2010/03/18 09:28:42	1.28
+++ LVM2/test/Makefile.in	2010/03/29 14:18:01	1.29
@@ -28,14 +28,16 @@
 # Shell quote;
 SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
 
-T = $(wildcard $(srcdir)/t-*.sh)
+SCRIPTS := $(wildcard $(srcdir)/t-*.sh) \
+ $(srcdir)/test-utils.sh \
+ $(srcdir)/test-lib.sh
 
 ifeq ("@UDEV_SYNC@", "yes")
 dm_udev_synchronisation = 1
 endif
 
 ifeq ("@APPLIB@", "yes")
-T += $(srcdir)/lvm2app.sh
+SCRIPTS += $(srcdir)/lvm2app.sh
 all: api/vgtest
 api/vgtest:
 	$(MAKE) -C api vgtest
@@ -66,9 +68,7 @@
 	echo 'export DM_UDEV_SYNCHRONISATION=$(dm_udev_synchronisation)' >> $@-t
 	chmod a-w $@-t
 	mv $@-t $@
-	if test "$(srcdir)" != "."; then cp $(srcdir)/test-utils.sh \
-	                                    $(srcdir)/test-lib.sh \
-	                                    $(T) .; fi
+	test "$(srcdir)" != . && cp $(SCRIPTS) .
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
@@ -95,9 +95,9 @@
 
 clean:
 	rm -rf init.sh lvm-wrapper bin .bin-dir-stamp
+	test "$(srcdir)" != . && rm -f $(subst $(srcdir)/, ,$(SCRIPTS)) lvm2app.sh
 
 distclean: clean
 	rm -f Makefile
 
-.PHONY: clean distclean
 .NOTPARALLEL:
--- LVM2/tools/Makefile.in	2010/03/29 14:11:18	1.112
+++ LVM2/tools/Makefile.in	2010/03/29 14:18:01	1.113
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
-# Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved.
 #
 # This file is part of LVM2.
 #
@@ -64,10 +64,15 @@
 	vgsplit.c
 
 SOURCES2 =\
-	dmsetup.c
+	dmsetup.c \
+	lvm.c \
+	lvm2cmd-static.c \
+	lvm2cmd.c \
+	lvmcmdlib.c
 
 TARGETS =\
 	.commands \
+	liblvm2cmd.a \
 	lvm
 
 TARGETS_DM = dmsetup
@@ -87,9 +92,8 @@
 LVMLIBS = $(LVMINTERNAL_LIBS)
 LIB_VERSION = $(LIB_VERSION_LVM)
 
-CLEAN_TARGETS = liblvm2cmd.$(LIB_SUFFIX) liblvm2cmd.a liblvm2cmd-static.a lvm lvm.o \
-		lvm2cmd.o lvm2cmd-static.o lvm2cmdlib.o lvm.static \
-		lvmcmdlib.o lvm-static.o dmsetup.o $(TARGETS_DM)
+CLEAN_TARGETS = liblvm2cmd.$(LIB_SUFFIX) $(TARGETS_DM) \
+	liblvm2cmd-static.a dmsetup.static lvm.static
 
 ifeq ("@CMDLIB@", "yes")
 	TARGETS += liblvm2cmd.$(LIB_SUFFIX)
@@ -146,15 +150,16 @@
 	$(CC) -E -P $(srcdir)/cmdnames.h 2> /dev/null | \
 		egrep -v '^ *(|#.*|dumpconfig|formats|help|pvdata|segtypes|version) *$$' > .commands
 
-.PHONY: install_cmdlib_dynamic install_cmdlib_static \
-	install_tools_dynamic install_tools_static
-
 ifneq ("$(CFLOW_CMD)", "")
 CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES))
 -include $(top_builddir)/libdm/libdevmapper.cflow
 -include $(top_builddir)/lib/liblvm-internal.cflow
 endif
 
+.PHONY: install_cmdlib_dynamic install_cmdlib_static \
+	install_tools_dynamic install_tools_static \
+	install_dmsetup_dynamic install_dmsetup_static
+
 install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX)
 	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
 		$(libdir)/liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION)


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

* LVM2 ./Makefile.in ./WHATS_NEW ./make.tmpl.in  ...
@ 2009-09-01 18:11 fabbione
  0 siblings, 0 replies; 5+ messages in thread
From: fabbione @ 2009-09-01 18:11 UTC (permalink / raw)
  To: lvm-devel, lvm2-cvs

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	fabbione@sourceware.org	2009-09-01 18:11:15

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

Log message:
	Remove unwanted Makefiles and don't purge lvm2.po that's
	under RCS.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/Makefile.in.diff?cvsroot=lvm2&r1=1.35&r2=1.36
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1247&r2=1.1248
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/make.tmpl.in.diff?cvsroot=lvm2&r1=1.69&r2=1.70
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/liblvm/Makefile.in.diff?cvsroot=lvm2&r1=1.13&r2=1.14

--- LVM2/Makefile.in	2009/08/13 16:34:07	1.35
+++ LVM2/Makefile.in	2009/09/01 18:11:14	1.36
@@ -42,6 +42,8 @@
 	     lib/locking \
 	     lib/mirror \
 	     lib/snapshot \
+	     liblvm \
+	     udev \
 	     test/api \
 	     test \
 	     po
--- LVM2/WHATS_NEW	2009/09/01 09:48:01	1.1247
+++ LVM2/WHATS_NEW	2009/09/01 18:11:14	1.1248
@@ -1,5 +1,6 @@
 Version 2.02.52 -
 =================================
+  Fix Makefile distclean target.
   Make clvmd check corosync to see what cluster interface it should use.
   Rewrite clvmd configuration code to cope with all combinations of libs.
   Fix global locking in PV reporting commands (2.02.49).
--- LVM2/make.tmpl.in	2009/07/31 11:49:53	1.69
+++ LVM2/make.tmpl.in	2009/09/01 18:11:14	1.70
@@ -250,7 +250,7 @@
 	      $(SOURCES:%.c=%.gcda) $(LDDEPS) \
 	      config.cache config.log config.status \
 	      Makefile make.tmpl core \
-	      lvm-version.h lvm2.po
+	      lvm-version.h
 
 .export.sym: .exported_symbols
 	set -e; (echo "Base {"; echo "	global:"; \
--- LVM2/liblvm/Makefile.in	2009/07/29 19:24:11	1.13
+++ LVM2/liblvm/Makefile.in	2009/09/01 18:11:14	1.14
@@ -93,3 +93,4 @@
 	$(RM) $(LIB_NAME).pc
 
 distclean: distclean_lib
+	$(RM) -f Makefile


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

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

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2006-05-16 20:53:13

Modified files:
	.              : Makefile.in WHATS_NEW make.tmpl.in 
	lib/activate   : dev_manager.c 
	lib/format_text: export.c 
	lib/metadata   : segtype.h 
	lib/snapshot   : snapshot.c 

Log message:
	Add DISTCLEAN_TARGETS to make template for configure.h.
	More fixes to error paths.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/Makefile.in.diff?cvsroot=lvm2&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.390&r2=1.391
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/make.tmpl.in.diff?cvsroot=lvm2&r1=1.44&r2=1.45
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/activate/dev_manager.c.diff?cvsroot=lvm2&r1=1.110&r2=1.111
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/format_text/export.c.diff?cvsroot=lvm2&r1=1.50&r2=1.51
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/segtype.h.diff?cvsroot=lvm2&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/snapshot/snapshot.c.diff?cvsroot=lvm2&r1=1.16&r2=1.17


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

end of thread, other threads:[~2010-05-20 14:45 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-05-20 14:45 LVM2 ./Makefile.in ./WHATS_NEW ./make.tmpl.in agk
  -- strict thread matches above, loose matches on Subject: below --
2010-04-09 21:34 zkabelac
2010-03-29 14:18 zkabelac
2009-09-01 18:11 fabbione
2006-05-16 20:53 agk

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