diff options
| author | Alasdair Kergon <agk@redhat.com> | 2009-10-02 19:10:31 +0000 |
|---|---|---|
| committer | Alasdair Kergon <agk@redhat.com> | 2009-10-02 19:10:31 +0000 |
| commit | db8b5af9d94f537b6e9c9483c2bde06ac9edb621 (patch) | |
| tree | 11cca90b013c731ba7060d0f608657127fb794dc | |
| parent | 1ae301590bbdebdcd7464e52fed7c49c12fa00bf (diff) | |
| download | lvm2-db8b5af9d94f537b6e9c9483c2bde06ac9edb621.tar.gz | |
Allow for a build directory separate from the source.
35 files changed, 175 insertions, 141 deletions
diff --git a/Makefile.in b/Makefile.in index a7b272173..556d1ff0d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,6 +14,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ VPATH = @srcdir@ SUBDIRS = doc include man scripts @@ -1,5 +1,6 @@ Version 2.02.54 - ===================================== + Allow for a build directory separate from the source. Update distclean target for rename clogd to cmirrord. (2.02.52) Only do lock conversions in clvmd if we are explicitly asked for one. Introduce percent_range_t and centralise snapshot full/mirror in-sync checks. @@ -15419,18 +15419,18 @@ fi $as_echo "$interface" >&6; } ################################################################################ -DM_LIB_VERSION="\"`cat VERSION_DM 2>/dev/null || echo Unknown`\"" +DM_LIB_VERSION="\"`cat "$srcdir"/VERSION_DM 2>/dev/null || echo Unknown`\"" cat >>confdefs.h <<_ACEOF #define DM_LIB_VERSION $DM_LIB_VERSION _ACEOF -DM_LIB_PATCHLEVEL=`cat VERSION_DM | $AWK -F '[-. ]' '{printf "%s.%s.%s",$1,$2,$3}'` +DM_LIB_PATCHLEVEL=`cat "$srcdir"/VERSION_DM | $AWK -F '[-. ]' '{printf "%s.%s.%s",$1,$2,$3}'` -LVM_VERSION="\"`cat VERSION 2>/dev/null || echo Unknown`\"" +LVM_VERSION="\"`cat "$srcdir"/VERSION 2>/dev/null || echo Unknown`\"" -VER=`cat VERSION` +VER=`cat "$srcdir"/VERSION` LVM_RELEASE_DATE="\"`echo $VER | $SED 's/.* (//;s/).*//'`\"" VER=`echo "$VER" | $AWK '{print $1}'` LVM_RELEASE="\"`echo "$VER" | $AWK -F '-' '{print $2}'`\"" @@ -15525,7 +15525,7 @@ LVM_LIBAPI=`echo "$VER" | $AWK -F '[()]' '{print $2}'` ################################################################################ -ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile doc/Makefile include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/misc/lvm-version.h lib/snapshot/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile scripts/clvmd_init_red_hat scripts/lvm2_monitoring_init_red_hat scripts/Makefile test/Makefile test/api/Makefile tools/Makefile udev/Makefile" +ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile doc/Makefile include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/misc/lvm-version.h lib/snapshot/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile scripts/clvmd_init_red_hat scripts/lvm2_monitoring_init_red_hat scripts/Makefile test/Makefile test/api/Makefile tools/Makefile udev/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -16135,6 +16135,7 @@ do "daemons/dmeventd/plugins/mirror/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/dmeventd/plugins/mirror/Makefile" ;; "daemons/dmeventd/plugins/snapshot/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/dmeventd/plugins/snapshot/Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; + "include/.symlinks") CONFIG_FILES="$CONFIG_FILES include/.symlinks" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; "lib/format1/Makefile") CONFIG_FILES="$CONFIG_FILES lib/format1/Makefile" ;; diff --git a/configure.in b/configure.in index 9cb48fb39..bf360ed14 100644 --- a/configure.in +++ b/configure.in @@ -1040,14 +1040,14 @@ fi AC_MSG_RESULT($interface) ################################################################################ -DM_LIB_VERSION="\"`cat VERSION_DM 2>/dev/null || echo Unknown`\"" +DM_LIB_VERSION="\"`cat "$srcdir"/VERSION_DM 2>/dev/null || echo Unknown`\"" AC_DEFINE_UNQUOTED(DM_LIB_VERSION, $DM_LIB_VERSION, [Library version]) -DM_LIB_PATCHLEVEL=`cat VERSION_DM | $AWK -F '[[-. ]]' '{printf "%s.%s.%s",$1,$2,$3}'` +DM_LIB_PATCHLEVEL=`cat "$srcdir"/VERSION_DM | $AWK -F '[[-. ]]' '{printf "%s.%s.%s",$1,$2,$3}'` -LVM_VERSION="\"`cat VERSION 2>/dev/null || echo Unknown`\"" +LVM_VERSION="\"`cat "$srcdir"/VERSION 2>/dev/null || echo Unknown`\"" -VER=`cat VERSION` +VER=`cat "$srcdir"/VERSION` LVM_RELEASE_DATE="\"`echo $VER | $SED 's/.* (//;s/).*//'`\"" VER=`echo "$VER" | $AWK '{print $1}'` LVM_RELEASE="\"`echo "$VER" | $AWK -F '-' '{print $2}'`\"" @@ -1156,6 +1156,7 @@ daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile doc/Makefile +include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile diff --git a/daemons/Makefile.in b/daemons/Makefile.in index ee4efe87a..92773bb67 100644 --- a/daemons/Makefile.in +++ b/daemons/Makefile.in @@ -13,6 +13,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ VPATH = @srcdir@ .PHONY: dmeventd clvmd cmirrord @@ -29,7 +30,7 @@ ifeq ("@BUILD_DMEVENTD@", "yes") SUBDIRS += dmeventd endif -include $(top_srcdir)/make.tmpl +include ../make.tmpl ifeq ("@BUILD_DMEVENTD@", "yes") device-mapper: dmeventd.device-mapper diff --git a/daemons/clvmd/Makefile.in b/daemons/clvmd/Makefile.in index c23b51eb2..109a8b0a3 100644 --- a/daemons/clvmd/Makefile.in +++ b/daemons/clvmd/Makefile.in @@ -13,6 +13,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ VPATH = @srcdir@ CCS_LIBS = @CCS_LIBS@ @@ -85,12 +86,12 @@ LVMLIBS += -ldevmapper DEFS += -D_REENTRANT CFLAGS += -fno-strict-aliasing -include $(top_srcdir)/make.tmpl +include ../../make.tmpl INSTALL_TARGETS = \ install_clvmd -clvmd: $(OBJECTS) $(top_srcdir)/lib/liblvm-internal.a +clvmd: $(OBJECTS) $(top_builddir)/lib/liblvm-internal.a $(CC) -o clvmd $(OBJECTS) $(CFLAGS) $(LDFLAGS) \ $(LVMLIBS) $(LMLIBS) $(LIBS) diff --git a/daemons/cmirrord/Makefile.in b/daemons/cmirrord/Makefile.in index add4d55bc..2bf1e3511 100644 --- a/daemons/cmirrord/Makefile.in +++ b/daemons/cmirrord/Makefile.in @@ -13,6 +13,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ VPATH = @srcdir@ CPG_LIBS = @CPG_LIBS@ @@ -24,13 +25,13 @@ SOURCES = clogd.c cluster.c functions.c link_mon.c local.c logging.c TARGETS = cmirrord -include $(top_srcdir)/make.tmpl +include ../../make.tmpl LIBS += -ldevmapper LMLIBS += $(CPG_LIBS) $(SACKPT_LIBS) CFLAGS += $(CPG_CFLAGS) $(SACKPT_CFLAGS) -cmirrord: $(OBJECTS) $(top_srcdir)/lib/liblvm-internal.a +cmirrord: $(OBJECTS) $(top_builddir)/lib/liblvm-internal.a $(CC) -o cmirrord $(OBJECTS) $(LDFLAGS) \ $(LVMLIBS) $(LMLIBS) $(LIBS) diff --git a/daemons/dmeventd/Makefile.in b/daemons/dmeventd/Makefile.in index 1e659e046..e16b14542 100644 --- a/daemons/dmeventd/Makefile.in +++ b/daemons/dmeventd/Makefile.in @@ -13,6 +13,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ VPATH = @srcdir@ SOURCES = libdevmapper-event.c @@ -36,7 +37,7 @@ ifneq ($(MAKECMDGOALS),device-mapper) SUBDIRS+=plugins endif -include $(top_srcdir)/make.tmpl +include ../../make.tmpl all: dmeventd device-mapper: dmeventd $(LIB_STATIC) @@ -66,7 +67,7 @@ install: $(INSTALL_TYPE) install_include install_dmeventd install_device-mapper: $(INSTALL_TYPE) install_include install_dmeventd install_include: - $(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper-event.h \ + $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/libdevmapper-event.h \ $(includedir)/libdevmapper-event.h install_dynamic: libdevmapper-event.$(LIB_SUFFIX) diff --git a/daemons/dmeventd/plugins/Makefile.in b/daemons/dmeventd/plugins/Makefile.in index 7fe9dc824..d6590410a 100644 --- a/daemons/dmeventd/plugins/Makefile.in +++ b/daemons/dmeventd/plugins/Makefile.in @@ -14,9 +14,10 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ VPATH = @srcdir@ SUBDIRS += mirror snapshot -include $(top_srcdir)/make.tmpl +include ../../../make.tmpl diff --git a/daemons/dmeventd/plugins/mirror/Makefile.in b/daemons/dmeventd/plugins/mirror/Makefile.in index 51eaba605..1bc586a3e 100644 --- a/daemons/dmeventd/plugins/mirror/Makefile.in +++ b/daemons/dmeventd/plugins/mirror/Makefile.in @@ -14,10 +14,11 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ VPATH = @srcdir@ INCLUDES += -I${top_srcdir}/tools -CLDFLAGS += -L${top_srcdir}/tools -ldevmapper @LVM2CMD_LIB@ +CLDFLAGS += -L${top_builddir}/tools -ldevmapper @LVM2CMD_LIB@ SOURCES = dmeventd_mirror.c @@ -29,7 +30,7 @@ endif LIB_VERSION = $(LIB_VERSION_LVM) -include $(top_srcdir)/make.tmpl +include $(top_builddir)/make.tmpl install_lvm2: libdevmapper-event-lvm2mirror.$(LIB_SUFFIX) $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ diff --git a/daemons/dmeventd/plugins/snapshot/Makefile.in b/daemons/dmeventd/plugins/snapshot/Makefile.in index 863838f10..27791542a 100644 --- a/daemons/dmeventd/plugins/snapshot/Makefile.in +++ b/daemons/dmeventd/plugins/snapshot/Makefile.in @@ -14,10 +14,11 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ VPATH = @srcdir@ INCLUDES += -I${top_srcdir}/tools -CLDFLAGS += -L${top_srcdir}/tools -ldevmapper @LVM2CMD_LIB@ +CLDFLAGS += -L${top_builddir}/tools -ldevmapper @LVM2CMD_LIB@ SOURCES = dmeventd_snapshot.c @@ -29,7 +30,7 @@ endif LIB_VERSION = $(LIB_VERSION_LVM) -include $(top_srcdir)/make.tmpl +include $(top_builddir)/make.tmpl install_lvm2: libdevmapper-event-lvm2snapshot.$(LIB_SUFFIX) $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ diff --git a/doc/Makefile.in b/doc/Makefile.in index b135b94a9..b4689af3d 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -13,17 +13,18 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ VPATH = @srcdir@ CONFSRC=example.conf CONFDEST=lvm.conf -include $(top_srcdir)/make.tmpl +include ../make.tmpl -install_lvm2: +install_lvm2: $(CONFSRC) @if [ ! -e $(confdir)/$(CONFDEST) ]; then \ echo "Installing $(CONFSRC) as $(confdir)/$(CONFDEST)"; \ - @INSTALL@ -D $(OWNER) $(GROUP) -m 644 $(CONFSRC) \ + @INSTALL@ -D $(OWNER) $(GROUP) -m 644 $< \ $(confdir)/$(CONFDEST); \ fi diff --git a/include/.symlinks b/include/.symlinks deleted file mode 100644 index 4a637d8bd..000000000 --- a/include/.symlinks +++ /dev/null @@ -1,61 +0,0 @@ -../daemons/clvmd/clvm.h -../daemons/dmeventd/libdevmapper-event.h -../liblvm/lvm2app.h -../lib/activate/activate.h -../lib/activate/targets.h -../lib/cache/lvmcache.h -../lib/commands/errors.h -../lib/commands/toolcontext.h -../lib/config/config.h -../lib/config/defaults.h -../lib/datastruct/btree.h -../lib/datastruct/lvm-types.h -../lib/datastruct/str_list.h -../lib/device/dev-cache.h -../lib/device/device.h -../lib/display/display.h -../lib/filters/filter-composite.h -../lib/filters/filter-md.h -../lib/filters/filter-persistent.h -../lib/filters/filter-regex.h -../lib/filters/filter-sysfs.h -../lib/filters/filter.h -../lib/format1/format1.h -../lib/format_pool/format_pool.h -../lib/format_text/archiver.h -../lib/format_text/format-text.h -../lib/format_text/text_export.h -../lib/format_text/text_import.h -../lib/label/label.h -../lib/locking/locking.h -../lib/log/log.h -../lib/log/lvm-logging.h -../lib/metadata/lv_alloc.h -../lib/metadata/metadata.h -../lib/metadata/metadata-exported.h -../lib/metadata/pv_alloc.h -../lib/metadata/segtype.h -../lib/mm/memlock.h -../lib/mm/xlate.h -../lib/misc/configure.h -../lib/misc/crc.h -../lib/misc/intl.h -../lib/misc/util.h -../lib/misc/last-path-component.h -../lib/misc/lib.h -../lib/misc/lvm-exec.h -../lib/misc/lvm-file.h -../lib/misc/lvm-globals.h -../lib/misc/lvm-string.h -../lib/misc/lvm-version.h -../lib/misc/lvm-wrappers.h -../lib/misc/sharedlib.h -../lib/report/report.h -../lib/uuid/uuid.h -../libdm/libdevmapper.h -../libdm/misc/dm-ioctl.h -../libdm/misc/dm-logging.h -../libdm/misc/dm-log-userspace.h -../libdm/misc/dmlib.h -../libdm/misc/kdev_t.h -../po/pogen.h diff --git a/include/.symlinks.in b/include/.symlinks.in new file mode 100644 index 000000000..39b7a776f --- /dev/null +++ b/include/.symlinks.in @@ -0,0 +1,61 @@ +@top_srcdir@/daemons/clvmd/clvm.h +@top_srcdir@/daemons/dmeventd/libdevmapper-event.h +@top_srcdir@/liblvm/lvm2app.h +@top_srcdir@/lib/activate/activate.h +@top_srcdir@/lib/activate/targets.h +@top_srcdir@/lib/cache/lvmcache.h +@top_srcdir@/lib/commands/errors.h +@top_srcdir@/lib/commands/toolcontext.h +@top_srcdir@/lib/config/config.h +@top_srcdir@/lib/config/defaults.h +@top_srcdir@/lib/datastruct/btree.h +@top_srcdir@/lib/datastruct/lvm-types.h +@top_srcdir@/lib/datastruct/str_list.h +@top_srcdir@/lib/device/dev-cache.h +@top_srcdir@/lib/device/device.h +@top_srcdir@/lib/display/display.h +@top_srcdir@/lib/filters/filter-composite.h +@top_srcdir@/lib/filters/filter-md.h +@top_srcdir@/lib/filters/filter-persistent.h +@top_srcdir@/lib/filters/filter-regex.h +@top_srcdir@/lib/filters/filter-sysfs.h +@top_srcdir@/lib/filters/filter.h +@top_srcdir@/lib/format1/format1.h +@top_srcdir@/lib/format_pool/format_pool.h +@top_srcdir@/lib/format_text/archiver.h +@top_srcdir@/lib/format_text/format-text.h +@top_srcdir@/lib/format_text/text_export.h +@top_srcdir@/lib/format_text/text_import.h +@top_srcdir@/lib/label/label.h +@top_srcdir@/lib/locking/locking.h +@top_srcdir@/lib/log/log.h +@top_srcdir@/lib/log/lvm-logging.h +@top_srcdir@/lib/metadata/lv_alloc.h +@top_srcdir@/lib/metadata/metadata.h +@top_srcdir@/lib/metadata/metadata-exported.h +@top_srcdir@/lib/metadata/pv_alloc.h +@top_srcdir@/lib/metadata/segtype.h +@top_srcdir@/lib/mm/memlock.h +@top_srcdir@/lib/mm/xlate.h +@top_builddir@/lib/misc/configure.h +@top_srcdir@/lib/misc/crc.h +@top_srcdir@/lib/misc/intl.h +@top_srcdir@/lib/misc/util.h +@top_srcdir@/lib/misc/last-path-component.h +@top_srcdir@/lib/misc/lib.h +@top_srcdir@/lib/misc/lvm-exec.h +@top_srcdir@/lib/misc/lvm-file.h +@top_srcdir@/lib/misc/lvm-globals.h +@top_srcdir@/lib/misc/lvm-string.h +@top_builddir@/lib/misc/lvm-version.h +@top_srcdir@/lib/misc/lvm-wrappers.h +@top_srcdir@/lib/misc/sharedlib.h +@top_srcdir@/lib/report/report.h +@top_srcdir@/lib/uuid/uuid.h +@top_srcdir@/libdm/libdevmapper.h +@top_srcdir@/libdm/misc/dm-ioctl.h +@top_srcdir@/libdm/misc/dm-logging.h +@top_srcdir@/libdm/misc/dm-log-userspace.h +@top_srcdir@/libdm/misc/dmlib.h +@top_srcdir@/libdm/misc/kdev_t.h +@top_srcdir@/po/pogen.h diff --git a/include/Makefile.in b/include/Makefile.in index 301290ef4..55add369e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -16,6 +16,7 @@ SHELL = /bin/sh srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ VPATH = @srcdir@ LN_S = @LN_S@ @@ -24,14 +25,14 @@ LN_S = @LN_S@ all: .symlinks_created -.symlinks_created: .symlinks +.symlinks_created: .symlinks find . -maxdepth 1 -type l -exec $(RM) \{\} \; - for i in `cat .symlinks`; do $(LN_S) $$i ; done + for i in `cat $<`; do $(LN_S) $$i ; done touch $@ distclean: find . -maxdepth 1 -type l -exec $(RM) \{\} \; - $(RM) Makefile .include_symlinks .symlinks_created + $(RM) Makefile .include_symlinks .symlinks_created .symlinks pofile: all diff --git a/lib/Makefile.in b/lib/Makefile.in index 0198fe279..9396fb2d0 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -14,6 +14,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ VPATH = @srcdir@ ifeq ("@LVM1@", "shared") @@ -145,7 +146,7 @@ LIB_STATIC = $(LIB_NAME).a CLEAN_TARGETS += $(LIB_NAME).cflow -include $(top_srcdir)/make.tmpl +include ../make.tmpl $(SUBDIRS): $(LIB_STATIC) diff --git a/lib/format1/Makefile.in b/lib/format1/Makefile.in index 3017cdf63..e12cc6f65 100644 --- a/lib/format1/Makefile.in +++ b/lib/format1/Makefile.in @@ -14,6 +14,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ VPATH = @srcdir@ SOURCES =\ @@ -28,7 +29,7 @@ SOURCES =\ LIB_SHARED = liblvm2format1.so LIB_VERSION = $(LIB_VERSION_LVM) -include $(top_srcdir)/make.tmpl +include ../../make.tmpl install: liblvm2format1.so $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ diff --git a/lib/format_pool/Makefile.in b/lib/format_pool/Makefile.in index 1c6bae581..d67c982d8 100644 --- a/lib/format_pool/Makefile.in +++ b/lib/format_pool/Makefile.in @@ -14,6 +14,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ VPATH = @srcdir@ SOURCES =\ @@ -25,7 +26,7 @@ SOURCES =\ LIB_SHARED = liblvm2formatpool.so LIB_VERSION = $(LIB_VERSION_LVM) -include $(top_srcdir)/make.tmpl +include ../../make.tmpl install: liblvm2formatpool.so $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ diff --git a/lib/locking/Makefile.in b/lib/locking/Makefile.in index b73e7ca23..584c8d67c 100644 --- a/lib/locking/Makefile.in +++ b/lib/locking/Makefile.in @@ -14,6 +14,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ VPATH = @srcdir@ SOURCES = cluster_locking.c @@ -21,7 +22,7 @@ SOURCES = cluster_locking.c LIB_SHARED = liblvm2clusterlock.so LIB_VERSION = $(LIB_VERSION_LVM) -include $(top_srcdir)/make.tmpl +include ../../make.tmpl install install_cluster: liblvm2clusterlock.so $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ diff --git a/lib/mirror/Makefile.in b/lib/mirror/Makefile.in index 24f0b60dd..d5b678b1b 100644 --- a/lib/mirror/Makefile.in +++ b/lib/mirror/Makefile.in @@ -14,6 +14,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ VPATH = @srcdir@ SOURCES = mirrored.c @@ -21,7 +22,7 @@ SOURCES = mirrored.c LIB_SHARED = liblvm2mirror.so LIB_VERSION = $(LIB_VERSION_LVM) -include $(top_srcdir)/make.tmpl +include ../../make.tmpl install: liblvm2mirror.so $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ diff --git a/lib/snapshot/Makefile.in b/lib/snapshot/Makefile.in index 36ef7e70c..3f960fb4b 100644 --- a/lib/snapshot/Makefile.in +++ b/lib/snapshot/Makefile.in @@ -14,6 +14,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ VPATH = @srcdir@ SOURCES = snapshot.c @@ -21,7 +22,7 @@ SOURCES = snapshot.c LIB_SHARED = liblvm2snapshot.so LIB_VERSION = $(LIB_VERSION_LVM) -include $(top_srcdir)/make.tmpl +include ../../make.tmpl install: liblvm2snapshot.so $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ diff --git a/libdm/Makefile.in b/libdm/Makefile.in index 4874ff1c7..6dd25ff11 100644 --- a/libdm/Makefile.in +++ b/libdm/Makefile.in @@ -14,6 +14,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ VPATH = @srcdir@ SOURCES =\ @@ -32,7 +33,7 @@ SOURCES =\ regex/ttree.c \ $(interface)/libdm-iface.c -INCLUDES = -I$(interface) -I. +INCLUDES = -I$(srcdir)/$(interface) -I$(srcdir) ifeq ("@STATIC_LINK@", "yes") LIB_STATIC = $(interface)/libdevmapper.a @@ -72,7 +73,7 @@ install: $(INSTALL_TYPE) install_include install_device-mapper: install install_include: - $(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.h \ + $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/libdevmapper.h \ $(includedir)/libdevmapper.h install_dynamic: install_@interface@ diff --git a/liblvm/Makefile.in b/liblvm/Makefile.in index e1d18f3bf..d9afc40e9 100644 --- a/liblvm/Makefile.in +++ b/liblvm/Makefile.in @@ -14,6 +14,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ VPATH = @srcdir@ SOURCES =\ @@ -38,7 +39,7 @@ endif CLEAN_TARGETS += liblvm.cflow -include $(top_srcdir)/make.tmpl +include ../make.tmpl LIBS += -ldevmapper -llvm-internal @@ -66,7 +67,7 @@ endif install: $(INSTALL_TYPE) install_include install_include: - $(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2app.h $(includedir)/lvm2app.h + $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2app.h $(includedir)/lvm2app.h install_dynamic: $(LIB_SHARED) $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ diff --git a/make.tmpl.in b/make.tmpl.in index 5fbd319bf..6d1292075 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -85,12 +85,12 @@ ifeq ("@INTL@", "yes") DEFS += -DINTL_PACKAGE=\"@INTL_PACKAGE@\" -DLOCALEDIR=\"@LOCALEDIR@\" endif -LDFLAGS += -L$(top_srcdir)/libdm -L$(top_srcdir)/lib -CLDFLAGS += -L$(top_srcdir)/libdm -L$(top_srcdir)/lib +LDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib +CLDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib ifeq ("@DMEVENTD@", "yes") - LDFLAGS += -L$(top_srcdir)/daemons/dmeventd - CLDFLAGS += -L$(top_srcdir)/daemons/dmeventd + LDFLAGS += -L$(top_builddir)/daemons/dmeventd + CLDFLAGS += -L$(top_builddir)/daemons/dmeventd endif ifeq ("@DM_COMPAT@", "yes") @@ -121,11 +121,12 @@ LIB_VERSION_DM := $(shell cat $(top_srcdir)/VERSION_DM | \ LIB_VERSION_APP := $(shell cat $(top_srcdir)/VERSION | \ awk -F '[(). ]' '{printf "%s.%s",$$1,$$4}') -INCLUDES += -I. -I$(top_srcdir)/include +INCLUDES += -I. -I$(top_builddir)/include -INC_LNS = $(top_srcdir)/include/.symlinks_created +INC_LNS = $(top_builddir)/include/.symlinks_created -DEPS = $(top_srcdir)/make.tmpl $(top_srcdir)/VERSION Makefile $(INC_LNS) +DEPS = $(top_builddir)/make.tmpl $(top_srcdir)/VERSION \ + $(top_builddir)/Makefile $(INC_LNS) OBJECTS = $(SOURCES:%.c=%.o) POTFILES = $(SOURCES:%.c=%.pot) @@ -227,11 +228,12 @@ $(LIB_STATIC): $(OBJECTS) $(AR) rs $@ $(OBJECTS) %.d: %.c + $(MKDIR_P) $(dir $@); \ set -e; \ FILE=`echo $@ | sed 's/\\//\\\\\\//g;s/\\.d//g'`; \ DEPS=`echo $(DEPS) | sed -e 's/\\//\\\\\\//g'`; \ - $(CC) -MM $(INCLUDES) $(DEFS) $(CFLAGS) $< | \ - sed "s/\(.*\)\.o[ :]*/$$FILE.o $$FILE.d $$FILE.pot: $$DEPS /g" > $@; \ + $(CC) -MM $(INCLUDES) $(DEFS) $(CFLAGS) -o $@ $<; \ + sed -i "s/\(.*\)\.o[ :]*/$$FILE.o $$FILE.d $$FILE.pot: $$DEPS /g" $@; \ [ -s $@ ] || $(RM) $@ %.mo: %.po diff --git a/man/Makefile.in b/man/Makefile.in index 4fde75b7b..f0c98fd49 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -14,6 +14,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ VPATH = @srcdir@ ifeq ("@FSADM@", "yes") @@ -38,7 +39,7 @@ MAN8DIR=${mandir}/man8 CLEAN_TARGETS=$(MAN5) $(MAN8) $(MAN8CLUSTER) $(FSADMMAN) $(MAN8DM) -include $(top_srcdir)/make.tmpl +include ../make.tmpl ifneq ("@CLVMD@", "none") install: install_cluster diff --git a/old-tests/device/Makefile.in b/old-tests/device/Makefile.in index 1e8c2005c..4bf15a9a2 100644 --- a/old-tests/device/Makefile.in +++ b/old-tests/device/Makefile.in @@ -14,6 +14,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ VPATH = @srcdir@ SOURCES=\ @@ -21,7 +22,7 @@ SOURCES=\ TARGETS=dev_cache_t -include $(top_srcdir)/make.tmpl +include ../../make.tmpl dev_cache_t: dev_cache_t.o $(top_srcdir)/lib/liblvm.a $(CC) -o dev_cache_t dev_cache_t.o -L$(top_srcdir)/lib -llvm diff --git a/old-tests/filters/Makefile.in b/old-tests/filters/Makefile.in index a1f752618..01de934b2 100644 --- a/old-tests/filters/Makefile.in +++ b/old-tests/filters/Makefile.in @@ -14,6 +14,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ VPATH = @srcdir@ SOURCES=\ @@ -24,7 +25,7 @@ TARGETS=\ rfilter_t \ pfilter_t -include $(top_srcdir)/make.tmpl +include ../../make.tmpl rfilter_t: rfilter_t.o $(top_srcdir)/lib/liblvm.a $(CC) -o rfilter_t rfilter_t.o -L$(top_srcdir)/lib -llvm diff --git a/old-tests/format1/Makefile.in b/old-tests/format1/Makefile.in index 2eed61389..1ccb56d82 100644 --- a/old-tests/format1/Makefile.in +++ b/old-tests/format1/Makefile.in @@ -14,6 +14,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ VPATH = @srcdir@ SOURCES=\ @@ -31,7 +32,7 @@ TARGETS=\ read_pv_t \ get_vgs_t -include $(top_srcdir)/make.tmpl +include ../../make.tmpl read_vg_t: read_vg_t.o pretty_print.o $(top_srcdir)/lib/liblvm.a $(CC) -o read_vg_t read_vg_t.o pretty_print.o -L$(top_srcdir)/lib -llvm diff --git a/old-tests/mm/Makefile.in b/old-tests/mm/Makefile.in index 6285bd655..997f0d341 100644 --- a/old-tests/mm/Makefile.in +++ b/old-tests/mm/Makefile.in @@ -14,6 +14,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ VPATH = @srcdir@ SOURCES=\ @@ -21,7 +22,7 @@ SOURCES=\ TARGETS=dbg_malloc_t -include $(top_srcdir)/make.tmpl +include ../../make.tmpl dbg_malloc_t: dbg_malloc_t.o $(CC) $(CFLAGS) -o dbg_malloc_t dbg_malloc_t.o \ diff --git a/old-tests/regex/Makefile.in b/old-tests/regex/Makefile.in index bcb7c62c2..28783ae10 100644 --- a/old-tests/regex/Makefile.in +++ b/old-tests/regex/Makefile.in @@ -14,6 +14,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ VPATH = @srcdir@ SOURCES=\ @@ -24,7 +25,7 @@ TARGETS=\ parse_t \ matcher_t -include $(top_srcdir)/make.tmpl +include ../../make.tmpl parse_t: parse_t.o $(top_srcdir)/lib/liblvm.a $(CC) -o parse_t parse_t.o -L$(top_srcdir)/lib -llvm diff --git a/po/Makefile.in b/po/Makefile.in index 64e882fdf..c9f8400d8 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -13,6 +13,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ VPATH = @srcdir@ LANGS=de @@ -24,7 +25,7 @@ DM_POSOURCES = $(top_srcdir)/dmsetup/*.pot $(top_srcdir)/libdm/*.pot \ LVM_POSOURCES = $(top_srcdir)/tools/*.pot $(top_srcdir)/lib/*/*.pot -include $(top_srcdir)/make.tmpl +include ../make.tmpl lvm2.po: Makefile $(LVM_POSOURCES) @echo Compiling string table diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 1b5cc66ab..33a10c172 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -13,17 +13,18 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ VPATH = @srcdir@ -include $(top_srcdir)/make.tmpl +include ../make.tmpl install: - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm_dump.sh \ + $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(srcdir)/lvm_dump.sh \ $(sbindir)/lvmdump - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) vgimportclone.sh \ + $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(srcdir)/vgimportclone.sh \ $(sbindir)/vgimportclone ifeq ("@FSADM@", "yes") - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) fsadm.sh \ + $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(srcdir)/fsadm.sh \ $(sbindir)/fsadm endif diff --git a/test/api/Makefile.in b/test/api/Makefile.in index 0c784bd85..29dbbdc22 100644 --- a/test/api/Makefile.in +++ b/test/api/Makefile.in @@ -13,6 +13,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ VPATH = @srcdir@ ifeq ("@DEBUG@", "yes") @@ -22,7 +23,7 @@ endif TARGETS = vgtest test_SOURCES = test.c vgtest_SOURCES = vgtest.c -INCLUDES += -I${top_srcdir}/include +INCLUDES += -I../../include LVMLIBS = @LVM2APP_LIB@ -ldevmapper DEPLIBS = $(top_srcdir)/liblvm/liblvm2app.so $(top_srcdir)/libdm/libdevmapper.so diff --git a/tools/Makefile.in b/tools/Makefile.in index 08106112a..7d8e68628 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -14,6 +14,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ VPATH = @srcdir@ SOURCES =\ @@ -104,13 +105,13 @@ LVMLIBS += -ldevmapper DEFS += -DLVM_SHARED_PATH=\"$(exec_prefix)/sbin/lvm\" -include $(top_srcdir)/make.tmpl +include ../make.tmpl device-mapper: $(TARGETS_DM) -dmsetup: dmsetup.o $(top_srcdir)/libdm/libdevmapper.$(LIB_SUFFIX) +dmsetup: dmsetup.o $(top_builddir)/libdm/libdevmapper.$(LIB_SUFFIX) $(CC) -o $@ dmsetup.o $(CFLAGS) $(LDFLAGS) \ - -L$(top_srcdir)/libdm -ldevmapper $(LIBS) + -L$(top_builddir)/libdm -ldevmapper $(LIBS) dmsetup.static: dmsetup.o $(interfacedir)/libdevmapper.a $(CC) -o $@ dmsetup.o $(CFLAGS) $(LDFLAGS) -static \ @@ -119,27 +120,27 @@ dmsetup.static: dmsetup.o $(interfacedir)/libdevmapper.a all: device-mapper -lvm: $(OBJECTS) lvm.o $(top_srcdir)/lib/liblvm-internal.a +lvm: $(OBJECTS) lvm.o $(top_builddir)/lib/liblvm-internal.a $(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm.o \ $(LDFLAGS) $(LVMLIBS) $(LIBS) -rdynamic LIB_PTHREAD = @LIB_PTHREAD@ -lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm-internal.a $(interfacedir)/libdevmapper.a +lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a $(interfacedir)/libdevmapper.a $(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm-static.o -static \ -L$(interfacedir) $(LDFLAGS) $(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic -liblvm2cmd.a: $(top_srcdir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o - cat $(top_srcdir)/lib/liblvm-internal.a > $@ +liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o + cat $(top_builddir)/lib/liblvm-internal.a > $@ $(AR) rs $@ $(OBJECTS) lvmcmdlib.o lvm2cmd.o -liblvm2cmd-static.a: $(top_srcdir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd-static.o - cat $(top_srcdir)/lib/liblvm-internal.a > $@ +liblvm2cmd-static.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd-static.o + cat $(top_builddir)/lib/liblvm-internal.a > $@ $(AR) rs $@ $(OBJECTS) lvmcmdlib.o lvm2cmd-static.o liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS) .commands: commands.h cmdnames.h Makefile - $(CC) -E -P cmdnames.h 2> /dev/null | \ + $(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 \ @@ -163,17 +164,17 @@ cflow: lvm.cflow lvm.xref lvm.tree lvm.rtree lvm.rxref endif install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX) - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.$(LIB_SUFFIX) \ + $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ $(libdir)/liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION) $(LN_S) -f liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION) $(libdir)/liblvm2cmd.$(LIB_SUFFIX) - $(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \ + $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \ $(includedir)/lvm2cmd.h install_cmdlib_static: liblvm2cmd-static.a - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd-static.a \ + $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ $(libdir)/liblvm2cmd.a.$(LIB_VERSION) $(LN_S) -f liblvm2cmd.a.$(LIB_VERSION) $(libdir)/liblvm2cmd.a - $(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \ + $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \ $(includedir)/lvm2cmd.h install_tools_dynamic: lvm .commands @@ -181,14 +182,14 @@ install_tools_dynamic: lvm .commands $(sbindir)/lvm @echo Creating symbolic links for individual commands in $(sbindir) @( \ - for v in `cat .commands`; do \ + for v in `cat $(srcdir)/.commands`; do \ cd $(sbindir); \ $(LN_S) -f lvm $$v; \ done; \ ) install_tools_static: lvm.static - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \ + $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ $(staticdir)/lvm.static install_dmsetup_dynamic: dmsetup diff --git a/udev/Makefile.in b/udev/Makefile.in index 73a43195d..341479f03 100644 --- a/udev/Makefile.in +++ b/udev/Makefile.in @@ -11,9 +11,10 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -srcdir = . -top_srcdir = .. - +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ +VPATH = @srcdir@ DM_RULES=10-dm.rules 12-dm-disk.rules 95-dm-notify.rules LVM_RULES=11-lvm.rules @@ -21,7 +22,7 @@ DM_DIR=$(shell grep "\#define DM_DIR" $(top_srcdir)/libdm/misc/dm-ioctl.h | awk CLEAN_TARGETS=10-dm.rules -include $(top_srcdir)/make.tmpl +include ../make.tmpl %: %.in $(SED) -e "s/(DM_DIR)/$(DM_DIR)/" $< >$@ @@ -31,7 +32,7 @@ install_lvm2: $(LVM_RULES) @for f in $(LVM_RULES); \ do \ $(RM) $(udevdir)/$$f; \ - $(INSTALL) -c -D $(OWNER) $(GROUP) -m 644 $$f $(udevdir)/$$f; \ + $(INSTALL) -c -D $(OWNER) $(GROUP) -m 644 $(srcdir)/$$f $(udevdir)/$$f; \ done install_device-mapper: $(DM_RULES) @@ -39,7 +40,7 @@ install_device-mapper: $(DM_RULES) @for f in $(DM_RULES); \ do \ $(RM) $(udevdir)/$$f; \ - $(INSTALL) -c -D $(OWNER) $(GROUP) -m 644 $$f $(udevdir)/$$f; \ + $(INSTALL) -c -D $(OWNER) $(GROUP) -m 644 $(srcdir)/$$f $(udevdir)/$$f; \ done install: install_lvm2 install_device-mapper |