Support parallel build trees (VPATH builds)

Build products from an out of tree build should be written relative to the build directory. Sources should be referred to by their locations in the source directory. This is accomplished by adding the 'src' and 'obj' variables for the module Makefile.am, using relative paths to reference source files, and by setting VPATH when source files are not co-located with the Makefile. This enables the following: $ mkdir build $ cd build $ ../configure \ --with-spl=$HOME/src/git/spl/ \ --with-spl-obj=$HOME/src/git/spl/build $ make -s This change also has the advantage of resolving the following warning which is generated by modern versions of automake. Makefile.am:00: warning: source file 'xxx' is in a subdirectory, Makefile.am:00: but option 'subdir-objects' is disabled Signed-off-by: Turbo Fredriksson <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes openzfs#1082
inkdot7 · Jul 17, 2015 · 47a4a6f · 47a4a6f
1 parent 2a53e2d
commit 47a4a6f
Show file tree

Hide file tree

Showing 42 changed files with 476 additions and 388 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -1,9 +1,8 @@
-
 ACLOCAL_AMFLAGS = -I config
 
-include $(top_srcdir)/config/rpm.am
-include $(top_srcdir)/config/deb.am
-include $(top_srcdir)/config/tgz.am
+include config/rpm.am
+include config/deb.am
+include config/tgz.am
 
 SUBDIRS = include rpm
 if CONFIG_USER
@@ -57,11 +56,11 @@ shellcheck:
 	 fi
 
 ctags:
-	$(RM) $(top_srcdir)/tags
+	$(RM) tags
 	find $(top_srcdir) -name .git -prune -o -name '*.[hc]' | xargs ctags
 
 etags:
-	$(RM) $(top_srcdir)/TAGS
+	$(RM) TAGS
 	find $(top_srcdir) -name .pc -prune -o -name '*.[hc]' | xargs etags -a
 
 tags: ctags etags

diff --git a/cmd/arc_summary/Makefile.am b/cmd/arc_summary/Makefile.am
@@ -1,2 +1 @@
-bin_SCRIPTS = arc_summary.py
-EXTRA_DIST = $(bin_SCRIPTS)
+dist_bin_SCRIPTS = arc_summary.py
diff --git a/cmd/arcstat/Makefile.am b/cmd/arcstat/Makefile.am
@@ -1,2 +1 @@
-bin_SCRIPTS = arcstat.py
-EXTRA_DIST = $(bin_SCRIPTS)
+dist_bin_SCRIPTS = arcstat.py
diff --git a/cmd/dbufstat/Makefile.am b/cmd/dbufstat/Makefile.am
@@ -1,2 +1 @@
-bin_SCRIPTS = dbufstat.py
-EXTRA_DIST = $(bin_SCRIPTS)
+dist_bin_SCRIPTS = dbufstat.py
diff --git a/cmd/mount_zfs/Makefile.am b/cmd/mount_zfs/Makefile.am
@@ -12,7 +12,7 @@ sbindir=$(mounthelperdir)
 sbin_PROGRAMS = mount.zfs
 
 mount_zfs_SOURCES = \
-	$(top_srcdir)/cmd/mount_zfs/mount_zfs.c
+	mount_zfs.c
 
 mount_zfs_LDADD = \
 	$(top_builddir)/lib/libnvpair/libnvpair.la \

diff --git a/cmd/zdb/Makefile.am b/cmd/zdb/Makefile.am
@@ -7,8 +7,8 @@ DEFAULT_INCLUDES += \
 sbin_PROGRAMS = zdb
 
 zdb_SOURCES = \
-	$(top_srcdir)/cmd/zdb/zdb.c \
-	$(top_srcdir)/cmd/zdb/zdb_il.c
+	zdb.c \
+	zdb_il.c
 
 zdb_LDADD = \
 	$(top_builddir)/lib/libnvpair/libnvpair.la \

diff --git a/cmd/zed/Makefile.am b/cmd/zed/Makefile.am
@@ -4,25 +4,25 @@ DEFAULT_INCLUDES += \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/lib/libspl/include
 
-EXTRA_DIST = $(top_srcdir)/cmd/zed/zed.d/README
+EXTRA_DIST = zed.d/README
 
 sbin_PROGRAMS = zed
 
 zed_SOURCES = \
-	$(top_srcdir)/cmd/zed/zed.c \
-	$(top_srcdir)/cmd/zed/zed.h \
-	$(top_srcdir)/cmd/zed/zed_conf.c \
-	$(top_srcdir)/cmd/zed/zed_conf.h \
-	$(top_srcdir)/cmd/zed/zed_event.c \
-	$(top_srcdir)/cmd/zed/zed_event.h \
-	$(top_srcdir)/cmd/zed/zed_exec.c \
-	$(top_srcdir)/cmd/zed/zed_exec.h \
-	$(top_srcdir)/cmd/zed/zed_file.c \
-	$(top_srcdir)/cmd/zed/zed_file.h \
-	$(top_srcdir)/cmd/zed/zed_log.c \
-	$(top_srcdir)/cmd/zed/zed_log.h \
-	$(top_srcdir)/cmd/zed/zed_strings.c \
-	$(top_srcdir)/cmd/zed/zed_strings.h
+	zed.c \
+	zed.h \
+	zed_conf.c \
+	zed_conf.h \
+	zed_event.c \
+	zed_event.h \
+	zed_exec.c \
+	zed_exec.h \
+	zed_file.c \
+	zed_file.h \
+	zed_log.c \
+	zed_log.h \
+	zed_strings.c \
+	zed_strings.h
 
 zed_LDADD = \
 	$(top_builddir)/lib/libavl/libavl.la \
@@ -35,22 +35,22 @@ zed_LDADD = \
 zedconfdir = $(sysconfdir)/zfs/zed.d
 
 dist_zedconf_DATA = \
-	$(top_srcdir)/cmd/zed/zed.d/zed-functions.sh \
-	$(top_srcdir)/cmd/zed/zed.d/zed.rc
+	zed.d/zed-functions.sh \
+	zed.d/zed.rc
 
 zedexecdir = $(libexecdir)/zfs/zed.d
 
 dist_zedexec_SCRIPTS = \
-	$(top_srcdir)/cmd/zed/zed.d/all-debug.sh \
-	$(top_srcdir)/cmd/zed/zed.d/all-syslog.sh \
-	$(top_srcdir)/cmd/zed/zed.d/checksum-notify.sh \
-	$(top_srcdir)/cmd/zed/zed.d/checksum-spare.sh \
-	$(top_srcdir)/cmd/zed/zed.d/data-notify.sh \
-	$(top_srcdir)/cmd/zed/zed.d/generic-notify.sh \
-	$(top_srcdir)/cmd/zed/zed.d/io-notify.sh \
-	$(top_srcdir)/cmd/zed/zed.d/io-spare.sh \
-	$(top_srcdir)/cmd/zed/zed.d/resilver.finish-notify.sh \
-	$(top_srcdir)/cmd/zed/zed.d/scrub.finish-notify.sh
+	zed.d/all-debug.sh \
+	zed.d/all-syslog.sh \
+	zed.d/checksum-notify.sh \
+	zed.d/checksum-spare.sh \
+	zed.d/data-notify.sh \
+	zed.d/generic-notify.sh \
+	zed.d/io-notify.sh \
+	zed.d/io-spare.sh \
+	zed.d/resilver.finish-notify.sh \
+	zed.d/scrub.finish-notify.sh
 
 zedconfdefaults = \
 	all-syslog.sh \

diff --git a/cmd/zfs/Makefile.am b/cmd/zfs/Makefile.am
@@ -7,10 +7,10 @@ DEFAULT_INCLUDES += \
 sbin_PROGRAMS = zfs
 
 zfs_SOURCES = \
-	$(top_srcdir)/cmd/zfs/zfs_iter.c \
-	$(top_srcdir)/cmd/zfs/zfs_iter.h \
-	$(top_srcdir)/cmd/zfs/zfs_main.c \
-	$(top_srcdir)/cmd/zfs/zfs_util.h
+	zfs_iter.c \
+	zfs_iter.h \
+	zfs_main.c \
+	zfs_util.h
 
 zfs_LDADD = \
 	$(top_builddir)/lib/libnvpair/libnvpair.la \

diff --git a/cmd/zhack/Makefile.am b/cmd/zhack/Makefile.am
@@ -7,7 +7,7 @@ DEFAULT_INCLUDES += \
 sbin_PROGRAMS = zhack
 
 zhack_SOURCES = \
-	$(top_srcdir)/cmd/zhack/zhack.c
+	zhack.c
 
 zhack_LDADD = \
 	$(top_builddir)/lib/libnvpair/libnvpair.la \

diff --git a/cmd/zinject/Makefile.am b/cmd/zinject/Makefile.am
@@ -7,9 +7,9 @@ DEFAULT_INCLUDES += \
 sbin_PROGRAMS = zinject
 
 zinject_SOURCES = \
-	$(top_srcdir)/cmd/zinject/translate.c \
-	$(top_srcdir)/cmd/zinject/zinject.c \
-	$(top_srcdir)/cmd/zinject/zinject.h
+	translate.c \
+	zinject.c \
+	zinject.h
 
 zinject_LDADD = \
 	$(top_builddir)/lib/libnvpair/libnvpair.la \

diff --git a/cmd/zpios/Makefile.am b/cmd/zpios/Makefile.am
@@ -6,7 +6,6 @@ DEFAULT_INCLUDES += \
 sbin_PROGRAMS = zpios
 
 zpios_SOURCES = \
-	$(top_srcdir)/cmd/zpios/zpios_main.c \
-	$(top_srcdir)/cmd/zpios/zpios_util.c \
-	$(top_srcdir)/cmd/zpios/zpios.h
-
+	zpios_main.c \
+	zpios_util.c \
+	zpios.h
diff --git a/cmd/zpool/Makefile.am b/cmd/zpool/Makefile.am
@@ -7,11 +7,11 @@ DEFAULT_INCLUDES += \
 sbin_PROGRAMS = zpool
 
 zpool_SOURCES = \
-	$(top_srcdir)/cmd/zpool/zpool_iter.c \
-	$(top_srcdir)/cmd/zpool/zpool_main.c \
-	$(top_srcdir)/cmd/zpool/zpool_util.c \
-	$(top_srcdir)/cmd/zpool/zpool_util.h \
-	$(top_srcdir)/cmd/zpool/zpool_vdev.c
+	zpool_iter.c \
+	zpool_main.c \
+	zpool_util.c \
+	zpool_util.h \
+	zpool_vdev.c
 
 zpool_LDADD = \
 	$(top_builddir)/lib/libnvpair/libnvpair.la \

diff --git a/cmd/zstreamdump/Makefile.am b/cmd/zstreamdump/Makefile.am
@@ -7,7 +7,7 @@ DEFAULT_INCLUDES += \
 sbin_PROGRAMS = zstreamdump
 
 zstreamdump_SOURCES = \
-	$(top_srcdir)/cmd/zstreamdump/zstreamdump.c
+	zstreamdump.c
 
 zstreamdump_LDADD = \
 	$(top_builddir)/lib/libnvpair/libnvpair.la \

diff --git a/cmd/ztest/Makefile.am b/cmd/ztest/Makefile.am
@@ -9,7 +9,7 @@ DEFAULT_INCLUDES += \
 sbin_PROGRAMS = ztest
 
 ztest_SOURCES = \
-	$(top_srcdir)/cmd/ztest/ztest.c
+	ztest.c
 
 ztest_LDADD = \
 	$(top_builddir)/lib/libnvpair/libnvpair.la \

diff --git a/cmd/zvol_id/Makefile.am b/cmd/zvol_id/Makefile.am
@@ -11,4 +11,4 @@ DEFAULT_INCLUDES += \
 udev_PROGRAMS = zvol_id
 
 zvol_id_SOURCES = \
-	$(top_srcdir)/cmd/zvol_id/zvol_id_main.c
+	zvol_id_main.c
diff --git a/config/kernel.m4 b/config/kernel.m4
@@ -338,6 +338,8 @@ AC_DEFUN([ZFS_AC_SPL], [
 				splbuild="${splsrc}/${LINUX_VERSION}"
 			], [ test -e "${splsrc}/spl_config.h" ], [
 				splbuild="${splsrc}"
+			], [ find -L "${splsrc}" -name spl_config.h 2> /dev/null | grep -wq spl_config.h ], [
+				splbuild=$(find -L "${splsrc}" -name spl_config.h | sed 's,/spl_config.h,,')
 			], [
 				splbuild="[Not found]"
 			])

diff --git a/config/rpm.am b/config/rpm.am
@@ -51,7 +51,7 @@ rpm-local:
 	mkdir -p $(rpmbuild)/SPECS && \
 	cp ${RPM_SPEC_DIR}/$(rpmspec) $(rpmbuild)/SPECS && \
 	mkdir -p $(rpmbuild)/SOURCES && \
-	cp scripts/kmodtool $(rpmbuild)/SOURCES && \
+	cp $(top_srcdir)/scripts/kmodtool $(rpmbuild)/SOURCES && \
 	cp $(distdir).tar.gz $(rpmbuild)/SOURCES)
 
 srpm-common: dist

diff --git a/contrib/dracut/90zfs/Makefile.am b/contrib/dracut/90zfs/Makefile.am
@@ -1,10 +1,10 @@
 pkgdracutdir = $(dracutdir)/modules.d/90zfs
 pkgdracut_SCRIPTS = \
-	$(top_srcdir)/contrib/dracut/90zfs/export-zfs.sh \
-	$(top_srcdir)/contrib/dracut/90zfs/module-setup.sh \
-	$(top_srcdir)/contrib/dracut/90zfs/mount-zfs.sh \
-	$(top_srcdir)/contrib/dracut/90zfs/parse-zfs.sh \
-	$(top_srcdir)/contrib/dracut/90zfs/zfs-lib.sh
+	export-zfs.sh \
+	module-setup.sh \
+	mount-zfs.sh \
+	parse-zfs.sh \
+	zfs-lib.sh
 
 EXTRA_DIST = \
 	$(top_srcdir)/contrib/dracut/90zfs/export-zfs.sh.in \
@@ -19,7 +19,7 @@ $(pkgdracut_SCRIPTS):
 		-e 's,@udevdir\@,$(udevdir),g' \
 		-e 's,@udevruledir\@,$(udevruledir),g' \
 		-e 's,@sysconfdir\@,$(sysconfdir),g' \
-		'$@.in' >'$@'
+		"$(top_srcdir)/contrib/dracut/90zfs/$@.in" >'$@'
 
 distclean-local::
 	-$(RM) $(pkgdracut_SCRIPTS)
diff --git a/etc/init.d/Makefile.am b/etc/init.d/Makefile.am
@@ -36,7 +36,7 @@ $(init_SCRIPTS) $(initconf_SCRIPTS) $(initcommon_SCRIPTS): $(EXTRA_DIST)
 		 -e 's,@runstatedir\@,$(runstatedir),g' \
 		 -e "s,@SHELL\@,$$SHELL,g" \
 		 -e "s,@NFS_SRV\@,$$NFS_SRV,g" \
-		 '$@.in' >'$@'; \
+		 "$(top_srcdir)/etc/init.d/$@.in" >'$@'; \
 	  [ '$@' = 'zfs-functions' -o '$@' = 'zfs' ] || \
 		chmod +x '$@')
 

diff --git a/etc/modules-load.d/Makefile.am b/etc/modules-load.d/Makefile.am
@@ -1,13 +1,13 @@
 modulesload_DATA = \
-	$(top_srcdir)/etc/modules-load.d/zfs.conf
+	zfs.conf
 
 EXTRA_DIST = \
 	$(top_srcdir)/etc/modules-load.d/zfs.conf.in
 
 $(modulesload_DATA):
 	-$(SED) \
 		-e '' \
-		'$@.in' >'$@'
+		"$(top_srcdir)/etc/modules-load.d/$@.in" >'$@'
 
 distclean-local::
 	-$(RM) $(modulesload_DATA)
diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am
@@ -1,12 +1,13 @@
 systemdpreset_DATA = \
-	$(top_srcdir)/etc/systemd/system/50-zfs.preset
+	50-zfs.preset
+
 systemdunit_DATA = \
-	$(top_srcdir)/etc/systemd/system/zed.service \
-	$(top_srcdir)/etc/systemd/system/zfs-import-cache.service \
-	$(top_srcdir)/etc/systemd/system/zfs-import-scan.service \
-	$(top_srcdir)/etc/systemd/system/zfs-mount.service \
-	$(top_srcdir)/etc/systemd/system/zfs-share.service \
-	$(top_srcdir)/etc/systemd/system/zfs.target
+	zed.service \
+	zfs-import-cache.service \
+	zfs-import-scan.service \
+	zfs-mount.service \
+	zfs-share.service \
+	zfs.target
 
 EXTRA_DIST = \
 	$(top_srcdir)/etc/systemd/system/zed.service.in \
@@ -22,14 +23,14 @@ $(systemdunit_DATA):
 		-e 's,@runstatedir\@,$(runstatedir),g' \
 		-e 's,@sbindir\@,$(sbindir),g' \
 		-e 's,@sysconfdir\@,$(sysconfdir),g' \
-		'$@.in' >'$@'
+		"$(top_srcdir)/etc/systemd/system/$@.in" >'$@'
 
 $(systemdpreset_DATA):
 	-$(SED) -e 's,@bindir\@,$(bindir),g' \
 		-e 's,@runstatedir\@,$(runstatedir),g' \
 		-e 's,@sbindir\@,$(sbindir),g' \
 		-e 's,@sysconfdir\@,$(sysconfdir),g' \
-		'$@.in' >'$@'
+		"$(top_srcdir)/etc/systemd/system/$@.in" >'$@'
 
 distclean-local::
 	-$(RM) $(systemdunit_DATA) $(systemdpreset_DATA)
diff --git a/lib/libavl/Makefile.am b/lib/libavl/Makefile.am
@@ -1,5 +1,7 @@
 include $(top_srcdir)/config/Rules.am
 
+VPATH = $(top_srcdir)/module/avl/
+
 AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
 
 DEFAULT_INCLUDES += \
@@ -8,5 +10,13 @@ DEFAULT_INCLUDES += \
 
 noinst_LTLIBRARIES = libavl.la
 
-libavl_la_SOURCES = \
-	$(top_srcdir)/module/avl/avl.c
+USER_C =
+
+KERNEL_C = \
+	avl.c
+
+nodist_libavl_la_SOURCES = \
+	$(USER_C) \
+	$(KERNEL_C)
+
+EXTRA_DIST = $(USER_C)
diff --git a/lib/libefi/Makefile.am b/lib/libefi/Makefile.am
@@ -8,7 +8,15 @@ DEFAULT_INCLUDES += \
 
 noinst_LTLIBRARIES = libefi.la
 
-libefi_la_SOURCES = \
-	$(top_srcdir)/lib/libefi/rdwr_efi.c
+USER_C = \
+	rdwr_efi.c
+
+KERNEL_C =
+
+nodist_libefi_la_SOURCES = \
+	$(USER_C) \
+	$(KERNEL_C)
 
 libefi_la_LIBADD = $(LIBUUID) $(ZLIB)
+
+EXTRA_DIST = $(USER_C)