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

diff --git a/Makefile.in b/Makefile.in
index 710c9a0cc0618c516e50b75ad923a84ab76dc5e7..609dcd2d6130cc862e7e7f91b7879e98c8e975f5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,7 +15,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 SUBDIRS = doc include man scripts
 

diff --git a/WHATS_NEW b/WHATS_NEW
index 06a2449ea45549ad658a78a6e9b238c63f6a1323..257ace5a30004262896db2644a23f86d454581f9 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -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.

diff --git a/daemons/Makefile.in b/daemons/Makefile.in
index 2f5837a83fbe596d1bbcb633fcb84513b719b5aa..ce400d78a01b4dcf949282146ed1eebb65ca18a0 100644 (file)
--- a/daemons/Makefile.in
+++ b/daemons/Makefile.in
@@ -14,7 +14,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 .PHONY: dmeventd clvmd cmirrord
 

diff --git a/daemons/clvmd/Makefile.in b/daemons/clvmd/Makefile.in
index e3f70d5a83232cf5a9c335b047791fa47a1f10a3..773c3689dc20161b8194e15d12d438ebd2079261 100644 (file)
--- a/daemons/clvmd/Makefile.in
+++ b/daemons/clvmd/Makefile.in
@@ -14,7 +14,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 CCS_LIBS = @CCS_LIBS@
 CCS_CFLAGS = @CCS_CFLAGS@

diff --git a/daemons/cmirrord/Makefile.in b/daemons/cmirrord/Makefile.in
index b8928c749f509c4197ee9e7d695e861f3db49f07..583c4549d88f73b33a3dad22cae938c8c1066571 100644 (file)
--- a/daemons/cmirrord/Makefile.in
+++ b/daemons/cmirrord/Makefile.in
@@ -14,7 +14,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 CPG_LIBS = @CPG_LIBS@
 CPG_CFLAGS = @CPG_CFLAGS@

diff --git a/daemons/dmeventd/Makefile.in b/daemons/dmeventd/Makefile.in
index cd2a4d36e31e54af092cff513a62f35029c8262b..e0a634950316c83b7645b0e814c246ffd18d8c3c 100644 (file)
--- a/daemons/dmeventd/Makefile.in
+++ b/daemons/dmeventd/Makefile.in
@@ -14,7 +14,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 SOURCES = libdevmapper-event.c
 SOURCES2 = dmeventd.c

diff --git a/daemons/dmeventd/plugins/Makefile.in b/daemons/dmeventd/plugins/Makefile.in
index 6b25235daf9fa7fd7c46891242b8c44e9b045d5a..45176ad7f33fa8989792dcc626d0712208202081 100644 (file)
--- a/daemons/dmeventd/plugins/Makefile.in
+++ b/daemons/dmeventd/plugins/Makefile.in
@@ -15,7 +15,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 SUBDIRS += lvm2 mirror snapshot
 

diff --git a/daemons/dmeventd/plugins/lvm2/Makefile.in b/daemons/dmeventd/plugins/lvm2/Makefile.in
index 0f23c84509c9e081d06d3ce9cc7b6c87286e395b..f44a5626dac63d1f77037fab67cbbb95927e5b93 100644 (file)
--- a/daemons/dmeventd/plugins/lvm2/Makefile.in
+++ b/daemons/dmeventd/plugins/lvm2/Makefile.in
@@ -14,7 +14,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 CLDFLAGS += -L$(top_builddir)/tools
 

diff --git a/daemons/dmeventd/plugins/mirror/Makefile.in b/daemons/dmeventd/plugins/mirror/Makefile.in
index 02c4e2496a422511392bb3e0c79911f36f79fd2d..3dfc3a225cf841766bd3f289f651b53294993227 100644 (file)
--- a/daemons/dmeventd/plugins/mirror/Makefile.in
+++ b/daemons/dmeventd/plugins/mirror/Makefile.in
@@ -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

diff --git a/daemons/dmeventd/plugins/snapshot/Makefile.in b/daemons/dmeventd/plugins/snapshot/Makefile.in
index 793fd38857d01bf94a849b92965cd8c4adddf0d6..0f202b386646209d24b2282383b0cab58c64175b 100644 (file)
--- a/daemons/dmeventd/plugins/snapshot/Makefile.in
+++ b/daemons/dmeventd/plugins/snapshot/Makefile.in
@@ -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

diff --git a/doc/Makefile.in b/doc/Makefile.in
index ce662094aa915d12e7dfebef4524ce5f5d5c54d3..61b32e94d5614df2dca92d16c1ec1496e67c2324 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -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

diff --git a/lib/Makefile.in b/lib/Makefile.in
index acfb23ed12428a088627f4b6ff0eaebdf27d00b6..9662120a79f1680cb984b06ed195c6a9826efdbc 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -15,7 +15,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 ifeq ("@LVM1@", "shared")
   SUBDIRS = format1

diff --git a/lib/format1/Makefile.in b/lib/format1/Makefile.in
index f62ab7c519b672bda5aa8b22dec4bda1739ddb13..327a1c223dc35284320dce6f1d4e3497c071ea2c 100644 (file)
--- a/lib/format1/Makefile.in
+++ b/lib/format1/Makefile.in
@@ -15,7 +15,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 SOURCES =\
        disk-rep.c \

diff --git a/lib/format_pool/Makefile.in b/lib/format_pool/Makefile.in
index b0ebc361e8572259f13eb26d65b442d2f57a3019..d9cedf06dc42ffa005ce75fe55481a988db66307 100644 (file)
--- a/lib/format_pool/Makefile.in
+++ b/lib/format_pool/Makefile.in
@@ -15,7 +15,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 SOURCES =\
        disk_rep.c \

diff --git a/lib/locking/Makefile.in b/lib/locking/Makefile.in
index 399b0afeccc5f8f1d34aa32ae6c068985e551d3a..99cc206c1a8cb9c57abd7c1033fe2c5debc7335b 100644 (file)
--- a/lib/locking/Makefile.in
+++ b/lib/locking/Makefile.in
@@ -15,7 +15,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 SOURCES = cluster_locking.c
 

diff --git a/lib/mirror/Makefile.in b/lib/mirror/Makefile.in
index 038399abb8224a4930e4e238f4de4ea635f42bc5..233fa96f005638e4bc9ad1aa386a7007c0b395ca 100644 (file)
--- a/lib/mirror/Makefile.in
+++ b/lib/mirror/Makefile.in
@@ -15,7 +15,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 SOURCES = mirrored.c
 

diff --git a/lib/snapshot/Makefile.in b/lib/snapshot/Makefile.in
index 80728c7bc4e2a24f4e662281a70bc207df3b81ea..e2c2b10e08a467a576b4358bab2ee82825bbf88e 100644 (file)
--- a/lib/snapshot/Makefile.in
+++ b/lib/snapshot/Makefile.in
@@ -15,7 +15,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 SOURCES = snapshot.c
 

diff --git a/libdm/Makefile.in b/libdm/Makefile.in
index 63e6603f901fe223bcda82d738f54081fe2e14b0..1e9284a1c3624cd86bad4e19bd30a57a43457dbe 100644 (file)
--- a/libdm/Makefile.in
+++ b/libdm/Makefile.in
@@ -15,7 +15,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 SOURCES =\
        datastruct/bitset.c \

diff --git a/liblvm/Makefile.in b/liblvm/Makefile.in
index 1b2b474533a988b991a4a111da949ae0c9cfacd7..165ce46ffa1dfac21a3c02a373e9475e9f0ecf35 100644 (file)
--- a/liblvm/Makefile.in
+++ b/liblvm/Makefile.in
@@ -15,7 +15,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 SOURCES =\
        lvm_misc.c \

diff --git a/make.tmpl.in b/make.tmpl.in
index 58774a1eef48c6b31aa1ee13e3742530d70cc7a1..6a79551089a56e9ae34d3ea0788d00558a7fe2ee 100644 (file)
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -63,6 +63,12 @@ localedir = $(DESTDIR)@LOCALEDIR@
 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)
 

diff --git a/man/Makefile.in b/man/Makefile.in
index 446bbe6c63f118b7fa2a2c0c1d9ed1e8daac87de..f34014ea54a8d6260e7e2b88b7c6a81afbd6c984 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -15,7 +15,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 ifeq ("@FSADM@", "yes")
 FSADMMAN = fsadm.8

diff --git a/po/Makefile.in b/po/Makefile.in
index 22184f110437b31cf3f11639779d0a79a9db8985..79bd3400509e5ce6692d80e3a4d7c166ba032c6a 100644 (file)
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -14,7 +14,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 LANGS=de
 

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index b79d3120fbe09bc75ae27fe28e9798d8507881d2..4b1ab7f33727f8e007a77505087463373861190a 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -14,7 +14,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 include $(top_builddir)/make.tmpl
 

diff --git a/test/api/Makefile.in b/test/api/Makefile.in
index 605da33c81db9e67ca515fadef8d589208fc0d49..d373ff8412b6b4723a832357af5031744cbef294 100644 (file)
--- a/test/api/Makefile.in
+++ b/test/api/Makefile.in
@@ -14,7 +14,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 ifeq ("@DEBUG@", "yes")
        DEFS += -DDEBUG

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 8cab5c4aafd42dcc45b75fea7790523ff5217989..b048fad946bae80f9b78386fc4325dfe41f0ccfb 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -15,7 +15,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-VPATH = @srcdir@
 
 SOURCES =\
        dumpconfig.c \
@@ -146,7 +145,7 @@ liblvm2cmd-static.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.
 
 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
 

diff --git a/udev/Makefile.in b/udev/Makefile.in
index 0d9e2ec68202fd3ab61899c518825f53be057d73..2511cf8a8edcfb99304faf4d9a5870508d18862e 100644 (file)
--- a/udev/Makefile.in
+++ b/udev/Makefile.in
@@ -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 @@ CLEAN_TARGETS=10-dm.rules
 
 include $(top_builddir)/make.tmpl
 
+vpath %.rules $(srcdir)
+
 %: %.in
        $(SED) -e "s/(DM_DIR)/$(DM_DIR)/" $< >$@