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 <turbo@bayour.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #1082

diff --git a/Makefile.am b/Makefile.am
index 10c87ddcd4b39214b9e04e12de21dc93a8791c2a..f8abb5f2c6e52984c211511bc84571450cc7d373 100644 (file)
--- 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
index 339b71ff3e06a4200e1e4a475b7054bdc3d7cfa9..815af3b2f37878dfa9cd5ced160dc26ecc8257a7 100644 (file)
--- 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
index 802b8e1d9e01623ce62f85ca71f3fd53316fc456..8987b2414c5cf1ae23ce1623332499a271508021 100644 (file)
--- 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
index 0548b240c308acd5fc15b7383de79df50bf2251f..19bffb0200c40e5767191c0b52f712e31e74b2fe 100644 (file)
--- 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
index 2e56631735dc5fe040f88325a5af491847773137..b1d9389226e278e1be7e52fb5562d0b3f6d8e605 100644 (file)
--- 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
index 854fbab26268c802a8496292c6e2617d5ea9ea51..bc47cffbaa94616967b3847dcced479b537f9ae6 100644 (file)
--- 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
index f0d22411d6f948d33643a1fe567a39532de48b3f..70e4f7f692f0f5ae23e1f30f0e509352e7637ae2 100644 (file)
--- 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
index 08580c92de5252c1f5f5aded33cd79ad4dfe6406..3cac73da6198279c71f96eedf037d75ab384f7c8 100644 (file)
--- 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
index 922aef97142636bfa976d814d391282c8d0e1854..53e324142f3834d11eebfa886f0b93e32d0afb2f 100644 (file)
--- 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
index 4adef11baaf6d51fde76028eba3684ba761128a3..2500beec2b56ffc51145ffdf724f1a8ee903de30 100644 (file)
--- 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
index 0799463cc6e0052538da52fae8df08fa852f4caf..9dabb653041fede6eb5324d80b4b357219ef30ec 100644 (file)
--- 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
index a39a2405f26d02913493d1d111d1b283b0dd5081..c11951b2277947988714ca3acf316fda5aa73a67 100644 (file)
--- 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
index d6c64f5126edd22f622fc4b1d0b329ff6ddd9a51..654863adb14548f8d322187c4c7db1ff15b99ddf 100644 (file)
--- 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
index a3cd83496f2848bd15cce8dddba953074eaa1154..ef4d99f288e8822fcc2d42f4d73251f05ec300cf 100644 (file)
--- 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
index 5703dd4b83a5cc820ccc82d72d218cb0c9dea045..d131c6386fc2f0e83a097a449a82afe4cf2f2ff4 100644 (file)
--- 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
index 5c97659c7b2598b93f3a4237d04b3c4d95fb58f0..8e8922ec7b887b68ff05a9ac1f4370e200b59bf8 100644 (file)
--- 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
index 311c754d429d4dbc00eb35e5fc312dc42abf7db4..51a20b3e6a10d736b3e6422f3faafbb1c93560db 100644 (file)
--- 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
index 30880bfc592e1dc6d5244bf5307ba56257de278d..b778a274486e68b73e9278710b68d79449c9ddc2 100644 (file)
--- 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
index dfa328b4aa32865b6fe37ca23aa8630fd0d54ecf..5f70fc658dfdfb98c63138076191ffbbe31d3f09 100644 (file)
--- 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
index 980cb851995ed565680c88c073a27b7ae0e2a8a9..a6780e1f08385c07498258b9b9fb245e48ab70b0 100644 (file)
--- a/etc/modules-load.d/Makefile.am
+++ b/etc/modules-load.d/Makefile.am
@@ -1,5 +1,5 @@
 modulesload_DATA = \
-       $(top_srcdir)/etc/modules-load.d/zfs.conf
+       zfs.conf
 
 EXTRA_DIST = \
        $(top_srcdir)/etc/modules-load.d/zfs.conf.in
@@ -7,7 +7,7 @@ EXTRA_DIST = \
 $(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
index b7a8db2435c3763b153145597c891291de5a5448..82aedd1ea08068c5969c05419f53668ea5c86d42 100644 (file)
--- 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
index b5e68fdb586a44b58cc7481e452c9b7b0f52cf04..6a42649b882b3b4624f7b36466eb4bae440efde6 100644 (file)
--- 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
index 55f7b11966777c16c73a024365706be8438cbf57..60863a81317dea1262d0c2ffba95c3ba17881100 100644 (file)
--- 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)

diff --git a/lib/libnvpair/Makefile.am b/lib/libnvpair/Makefile.am
index 7a8f96a050128dca33f8311d595e3c1bf7324e69..c9ac1f1fb807415234414b3f31d5c4cb1bfebfbe 100644 (file)
--- a/lib/libnvpair/Makefile.am
+++ b/lib/libnvpair/Makefile.am
@@ -1,5 +1,9 @@
 include $(top_srcdir)/config/Rules.am
 
+VPATH = \
+       $(top_srcdir)/module/nvpair \
+       $(top_srcdir)/lib/libnvpair
+
 AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
 
 DEFAULT_INCLUDES += \
@@ -8,17 +12,22 @@ DEFAULT_INCLUDES += \
 
 lib_LTLIBRARIES = libnvpair.la
 
-libnvpair_la_SOURCES = \
-       $(top_srcdir)/lib/libnvpair/libnvpair.c \
-       $(top_srcdir)/lib/libnvpair/nvpair_alloc_system.c \
-       $(top_srcdir)/module/nvpair/nvpair_alloc_fixed.c \
-       $(top_srcdir)/module/nvpair/nvpair.c \
-       $(top_srcdir)/module/nvpair/fnvpair.c
+USER_C = \
+       libnvpair.c \
+       nvpair_alloc_system.c
+
+KERNEL_C = \
+       nvpair_alloc_fixed.c \
+       nvpair.c \
+       fnvpair.c
+
+nodist_libnvpair_la_SOURCES = \
+       $(USER_C) \
+       $(KERNEL_C)
 
 libnvpair_la_LIBADD = \
         $(top_builddir)/lib/libuutil/libuutil.la
 
 libnvpair_la_LDFLAGS = -version-info 1:1:0
 
-EXTRA_DIST = \
-       $(top_srcdir)/module/nvpair/nvpair_alloc_spl.c
+EXTRA_DIST = $(USER_C)

diff --git a/lib/libshare/Makefile.am b/lib/libshare/Makefile.am
index 04710564324bb8c6f9a63019d95f565476a846f2..42bd207be48236fb0ce313cfda11dd4e039b564e 100644 (file)
--- a/lib/libshare/Makefile.am
+++ b/lib/libshare/Makefile.am
@@ -6,10 +6,18 @@ DEFAULT_INCLUDES += \
 
 noinst_LTLIBRARIES = libshare.la
 
-libshare_la_SOURCES = \
-       $(top_srcdir)/lib/libshare/libshare_impl.h \
-       $(top_srcdir)/lib/libshare/libshare.c \
-       $(top_srcdir)/lib/libshare/nfs.c \
-       $(top_srcdir)/lib/libshare/nfs.h \
-       $(top_srcdir)/lib/libshare/smb.c \
-       $(top_srcdir)/lib/libshare/smb.h
+USER_C = \
+       libshare_impl.h \
+       libshare.c \
+       nfs.c \
+       nfs.h \
+       smb.c \
+       smb.h
+
+KERNEL_C =
+
+nodist_libshare_la_SOURCES = \
+       $(USER_C)
+       $(KERNEL_C)
+
+EXTRA_DIST = $(USER_C)

diff --git a/lib/libspl/Makefile.am b/lib/libspl/Makefile.am
index dbf85c40fe39a3cd3a695f5aac1d4043769c44cd..a5694462335fc509f8ed36e061c35dfed7272426 100644 (file)
--- a/lib/libspl/Makefile.am
+++ b/lib/libspl/Makefile.am
@@ -1,5 +1,9 @@
 include $(top_srcdir)/config/Rules.am
 
+VPATH = \
+       $(top_srcdir)/lib/libspl \
+       $(top_srcdir)/lib/libspl/$(TARGET_ASM_DIR)
+
 AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
 
 SUBDIRS = include $(TARGET_ASM_DIR)
@@ -13,21 +17,31 @@ AM_CCASFLAGS = \
 
 noinst_LTLIBRARIES = libspl.la
 
-libspl_la_SOURCES = \
-       $(top_srcdir)/lib/libspl/getexecname.c \
-       $(top_srcdir)/lib/libspl/gethrtime.c \
-       $(top_srcdir)/lib/libspl/gethrestime.c \
-       $(top_srcdir)/lib/libspl/getmntany.c \
-       $(top_srcdir)/lib/libspl/list.c \
-       $(top_srcdir)/lib/libspl/mkdirp.c \
-       $(top_srcdir)/lib/libspl/strlcat.c \
-       $(top_srcdir)/lib/libspl/strlcpy.c \
-       $(top_srcdir)/lib/libspl/strnlen.c \
-       $(top_srcdir)/lib/libspl/timestamp.c \
-       $(top_srcdir)/lib/libspl/zone.c \
-       $(top_srcdir)/lib/libspl/xdr.c \
-       $(top_srcdir)/lib/libspl/$(TARGET_ASM_DIR)/atomic.S \
-       $(top_srcdir)/lib/libspl/include/sys/list.h \
-       $(top_srcdir)/lib/libspl/include/sys/list_impl.h
+USER_C = \
+       getexecname.c \
+       gethrtime.c \
+       gethrestime.c \
+       getmntany.c \
+       list.c \
+       mkdirp.c \
+       strlcat.c \
+       strlcpy.c \
+       strnlen.c \
+       timestamp.c \
+       zone.c \
+       xdr.c \
+       include/sys/list.h \
+       include/sys/list_impl.h
+
+USER_ASM = atomic.S
+
+KERNEL_C =
+
+nodist_libspl_la_SOURCES = \
+       $(USER_C) \
+       $(USER_ASM) \
+       $(KERNEL_C)
 
 libspl_la_LIBADD = -lrt
+
+EXTRA_DIST = $(USER_C)

diff --git a/lib/libspl/asm-generic/atomic.S b/lib/libspl/asm-generic/atomic.S
deleted file mode 100644 (file)
index 7550fd9..0000000
--- a/lib/libspl/asm-generic/atomic.S
+++ /dev/null
@@ -1,6 +0,0 @@
-Stub file for 'make dist' distdir rule.
-
-This file is directly referenced by ../Makefile.am as a source
-file and thus will be expected by 'make dist'.  To avoid this
-being a problem this stub file was added.  It will be overwritten
-at build time based on assmebly generated from atomic.c.

diff --git a/lib/libspl/asm-i386/Makefile.am b/lib/libspl/asm-i386/Makefile.am
index 417b640bc4488cc5ab4362f186dcb9abebc22357..e1126102f7c3962e68358a5832d45d1ec3cc7973 100644 (file)
--- a/lib/libspl/asm-i386/Makefile.am
+++ b/lib/libspl/asm-i386/Makefile.am
@@ -1 +1 @@
-noinst_HEADERS = $(top_srcdir)/lib/libspl/asm-i386/*.S
+noinst_HEADERS = atomic.S

diff --git a/lib/libspl/asm-x86_64/Makefile.am b/lib/libspl/asm-x86_64/Makefile.am
index 339c18d7ccb0a04b2857fc848e0d565e4546be33..e1126102f7c3962e68358a5832d45d1ec3cc7973 100644 (file)
--- a/lib/libspl/asm-x86_64/Makefile.am
+++ b/lib/libspl/asm-x86_64/Makefile.am
@@ -1 +1 @@
-noinst_HEADERS = $(top_srcdir)/lib/libspl/asm-x86_64/*.S
+noinst_HEADERS = atomic.S

diff --git a/lib/libunicode/Makefile.am b/lib/libunicode/Makefile.am
index c28519aa2b375970c02134cb0fad9c9c44dc3539..9bacae25140a1bce1fb4877bd397dd65d113a451 100644 (file)
--- a/lib/libunicode/Makefile.am
+++ b/lib/libunicode/Makefile.am
@@ -1,5 +1,7 @@
 include $(top_srcdir)/config/Rules.am
 
+VPATH = $(top_srcdir)/module/unicode
+
 AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
 
 DEFAULT_INCLUDES += \
@@ -8,6 +10,14 @@ DEFAULT_INCLUDES += \
 
 noinst_LTLIBRARIES = libunicode.la
 
-libunicode_la_SOURCES = \
-       $(top_srcdir)/module/unicode/u8_textprep.c \
-       $(top_srcdir)/module/unicode/uconv.c
+USER_C =
+
+KERNEL_C = \
+       u8_textprep.c \
+       uconv.c
+
+nodist_libunicode_la_SOURCES = \
+       $(USER_C) \
+       $(KERNEL_C)
+
+EXTRA_DIST = $(USER_C)

diff --git a/lib/libuutil/Makefile.am b/lib/libuutil/Makefile.am
index 2b2d5c1aa60b58e48023fca2b5bc003f8f21e579..4d54485b735b6a90de86754243782de6c8eb8d31 100644 (file)
--- a/lib/libuutil/Makefile.am
+++ b/lib/libuutil/Makefile.am
@@ -8,17 +8,23 @@ DEFAULT_INCLUDES += \
 
 lib_LTLIBRARIES = libuutil.la
 
-libuutil_la_SOURCES = \
-       $(top_srcdir)/lib/libuutil/uu_alloc.c \
-       $(top_srcdir)/lib/libuutil/uu_avl.c \
-       $(top_srcdir)/lib/libuutil/uu_dprintf.c \
-       $(top_srcdir)/lib/libuutil/uu_ident.c \
-       $(top_srcdir)/lib/libuutil/uu_list.c \
-       $(top_srcdir)/lib/libuutil/uu_misc.c \
-       $(top_srcdir)/lib/libuutil/uu_open.c \
-       $(top_srcdir)/lib/libuutil/uu_pname.c \
-       $(top_srcdir)/lib/libuutil/uu_string.c \
-       $(top_srcdir)/lib/libuutil/uu_strtoint.c
+USER_C = \
+       uu_alloc.c \
+       uu_avl.c \
+       uu_dprintf.c \
+       uu_ident.c \
+       uu_list.c \
+       uu_misc.c \
+       uu_open.c \
+       uu_pname.c \
+       uu_string.c \
+       uu_strtoint.c
+
+KERNEL_C =
+
+nodist_libuutil_la_SOURCES = \
+       $(USER_C) \
+       $(KERNEL_C)
 
 libuutil_la_LIBADD = \
        $(top_builddir)/lib/libavl/libavl.la \
@@ -26,3 +32,5 @@ libuutil_la_LIBADD = \
        $(top_builddir)/lib/libefi/libefi.la
 
 libuutil_la_LDFLAGS = -pthread -version-info 1:1:0
+
+EXTRA_DIST = $(USER_C)

diff --git a/lib/libzfs/Makefile.am b/lib/libzfs/Makefile.am
index c66285e249643e3ec6ee5f493baa3f81e9edfc50..b0c69875877c584077c591a0789f786e5880b3c8 100644 (file)
--- a/lib/libzfs/Makefile.am
+++ b/lib/libzfs/Makefile.am
@@ -1,8 +1,7 @@
 include $(top_srcdir)/config/Rules.am
 
 libzfs_pcdir = $(datarootdir)/pkgconfig
-libzfs_pc_DATA = $(top_srcdir)/lib/libzfs/libzfs.pc $(top_srcdir)/lib/libzfs/libzfs_core.pc
-EXTRA_DIST = $(top_srcdir)/lib/libzfs/libzfs.pc $(top_srcdir)/lib/libzfs/libzfs_core.pc
+libzfs_pc_DATA = libzfs.pc libzfs_core.pc
 
 DEFAULT_INCLUDES += \
        -I$(top_srcdir)/include \
@@ -10,20 +9,26 @@ DEFAULT_INCLUDES += \
 
 lib_LTLIBRARIES = libzfs.la
 
-libzfs_la_SOURCES = \
-       $(top_srcdir)/lib/libzfs/libzfs_changelist.c \
-       $(top_srcdir)/lib/libzfs/libzfs_config.c \
-       $(top_srcdir)/lib/libzfs/libzfs_dataset.c \
-       $(top_srcdir)/lib/libzfs/libzfs_diff.c \
-       $(top_srcdir)/lib/libzfs/libzfs_fru.c \
-       $(top_srcdir)/lib/libzfs/libzfs_graph.c \
-       $(top_srcdir)/lib/libzfs/libzfs_import.c \
-       $(top_srcdir)/lib/libzfs/libzfs_iter.c \
-       $(top_srcdir)/lib/libzfs/libzfs_mount.c \
-       $(top_srcdir)/lib/libzfs/libzfs_pool.c \
-       $(top_srcdir)/lib/libzfs/libzfs_sendrecv.c \
-       $(top_srcdir)/lib/libzfs/libzfs_status.c \
-       $(top_srcdir)/lib/libzfs/libzfs_util.c
+USER_C = \
+       libzfs_changelist.c \
+       libzfs_config.c \
+       libzfs_dataset.c \
+       libzfs_diff.c \
+       libzfs_fru.c \
+       libzfs_graph.c \
+       libzfs_import.c \
+       libzfs_iter.c \
+       libzfs_mount.c \
+       libzfs_pool.c \
+       libzfs_sendrecv.c \
+       libzfs_status.c \
+       libzfs_util.c
+
+KERNEL_C =
+
+nodist_libzfs_la_SOURCES = \
+       $(USER_C) \
+       $(KERNEL_C)
 
 libzfs_la_LIBADD = \
        $(top_builddir)/lib/libzfs_core/libzfs_core.la \
@@ -33,3 +38,5 @@ libzfs_la_LIBADD = \
 
 libzfs_la_LIBADD += -lm -ldl $(LIBBLKID)
 libzfs_la_LDFLAGS = -version-info 2:0:0
+
+EXTRA_DIST = $(libzfs_pc_DATA) $(USER_C)

diff --git a/lib/libzfs_core/Makefile.am b/lib/libzfs_core/Makefile.am
index 0ecd2085ca307dc04c97f3691dab98a9f8033e41..5eafc25c057b75371f1ff082439917c1f975d322 100644 (file)
--- a/lib/libzfs_core/Makefile.am
+++ b/lib/libzfs_core/Makefile.am
@@ -6,10 +6,18 @@ DEFAULT_INCLUDES += \
 
 lib_LTLIBRARIES = libzfs_core.la
 
-libzfs_core_la_SOURCES = \
-       $(top_srcdir)/lib/libzfs_core/libzfs_core.c
+USER_C = \
+       libzfs_core.c
+
+KERNEL_C =
+
+nodist_libzfs_core_la_SOURCES = \
+       $(USER_C) \
+       $(KERNEL_C)
 
 libzfs_core_la_LIBADD = \
        $(top_builddir)/lib/libnvpair/libnvpair.la
 
 libzfs_core_la_LDFLAGS = -version-info 1:0:0
+
+EXTRA_DIST = $(USER_C)

diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am
index e25591300ef7cfc7a3628daef07017c61040a828..0bcb5e466518c5bee023ed4fdb9843857de6861f 100644 (file)
--- a/lib/libzpool/Makefile.am
+++ b/lib/libzpool/Makefile.am
@@ -1,5 +1,10 @@
 include $(top_srcdir)/config/Rules.am
 
+VPATH = \
+       $(top_srcdir)/module/zfs \
+       $(top_srcdir)/module/zcommon \
+       $(top_srcdir)/lib/libzpool
+
 AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
 
 DEFAULT_INCLUDES += \
@@ -8,99 +13,105 @@ DEFAULT_INCLUDES += \
 
 lib_LTLIBRARIES = libzpool.la
 
-libzpool_la_SOURCES = \
-       $(top_srcdir)/lib/libzpool/kernel.c \
-       $(top_srcdir)/lib/libzpool/taskq.c \
-       $(top_srcdir)/lib/libzpool/util.c \
-       $(top_srcdir)/module/zcommon/zfs_comutil.c \
-       $(top_srcdir)/module/zcommon/zfs_deleg.c \
-       $(top_srcdir)/module/zcommon/zfs_fletcher.c \
-       $(top_srcdir)/module/zcommon/zfs_namecheck.c \
-       $(top_srcdir)/module/zcommon/zfs_prop.c \
-       $(top_srcdir)/module/zcommon/zfs_uio.c \
-       $(top_srcdir)/module/zcommon/zpool_prop.c \
-       $(top_srcdir)/module/zcommon/zprop_common.c \
-       $(top_srcdir)/module/zfs/arc.c \
-       $(top_srcdir)/module/zfs/blkptr.c \
-       $(top_srcdir)/module/zfs/bplist.c \
-       $(top_srcdir)/module/zfs/bpobj.c \
-       $(top_srcdir)/module/zfs/bptree.c \
-       $(top_srcdir)/module/zfs/dbuf.c \
-       $(top_srcdir)/module/zfs/dbuf_stats.c \
-       $(top_srcdir)/module/zfs/ddt.c \
-       $(top_srcdir)/module/zfs/ddt_zap.c \
-       $(top_srcdir)/module/zfs/dmu.c \
-       $(top_srcdir)/module/zfs/dmu_diff.c \
-       $(top_srcdir)/module/zfs/dmu_object.c \
-       $(top_srcdir)/module/zfs/dmu_objset.c \
-       $(top_srcdir)/module/zfs/dmu_send.c \
-       $(top_srcdir)/module/zfs/dmu_traverse.c \
-       $(top_srcdir)/module/zfs/dmu_tx.c \
-       $(top_srcdir)/module/zfs/dmu_zfetch.c \
-       $(top_srcdir)/module/zfs/dnode.c \
-       $(top_srcdir)/module/zfs/dnode_sync.c \
-       $(top_srcdir)/module/zfs/dsl_bookmark.c \
-       $(top_srcdir)/module/zfs/dsl_dataset.c \
-       $(top_srcdir)/module/zfs/dsl_deadlist.c \
-       $(top_srcdir)/module/zfs/dsl_deleg.c \
-       $(top_srcdir)/module/zfs/dsl_dir.c \
-       $(top_srcdir)/module/zfs/dsl_pool.c \
-       $(top_srcdir)/module/zfs/dsl_prop.c \
-       $(top_srcdir)/module/zfs/dsl_scan.c \
-       $(top_srcdir)/module/zfs/dsl_synctask.c \
-       $(top_srcdir)/module/zfs/dsl_destroy.c \
-       $(top_srcdir)/module/zfs/dsl_userhold.c \
-       $(top_srcdir)/module/zfs/fm.c \
-       $(top_srcdir)/module/zfs/gzip.c \
-       $(top_srcdir)/module/zfs/lzjb.c \
-       $(top_srcdir)/module/zfs/lz4.c \
-       $(top_srcdir)/module/zfs/metaslab.c \
-       $(top_srcdir)/module/zfs/multilist.c \
-       $(top_srcdir)/module/zfs/range_tree.c \
-       $(top_srcdir)/module/zfs/refcount.c \
-       $(top_srcdir)/module/zfs/rrwlock.c \
-       $(top_srcdir)/module/zfs/sa.c \
-       $(top_srcdir)/module/zfs/sha256.c \
-       $(top_srcdir)/module/zfs/spa.c \
-       $(top_srcdir)/module/zfs/spa_boot.c \
-       $(top_srcdir)/module/zfs/spa_config.c \
-       $(top_srcdir)/module/zfs/spa_errlog.c \
-       $(top_srcdir)/module/zfs/spa_history.c \
-       $(top_srcdir)/module/zfs/spa_misc.c \
-       $(top_srcdir)/module/zfs/spa_stats.c \
-       $(top_srcdir)/module/zfs/space_map.c \
-       $(top_srcdir)/module/zfs/space_reftree.c \
-       $(top_srcdir)/module/zfs/txg.c \
-       $(top_srcdir)/module/zfs/trace.c \
-       $(top_srcdir)/module/zfs/uberblock.c \
-       $(top_srcdir)/module/zfs/unique.c \
-       $(top_srcdir)/module/zfs/vdev.c \
-       $(top_srcdir)/module/zfs/vdev_cache.c \
-       $(top_srcdir)/module/zfs/vdev_file.c \
-       $(top_srcdir)/module/zfs/vdev_label.c \
-       $(top_srcdir)/module/zfs/vdev_mirror.c \
-       $(top_srcdir)/module/zfs/vdev_missing.c \
-       $(top_srcdir)/module/zfs/vdev_queue.c \
-       $(top_srcdir)/module/zfs/vdev_raidz.c \
-       $(top_srcdir)/module/zfs/vdev_root.c \
-       $(top_srcdir)/module/zfs/zap.c \
-       $(top_srcdir)/module/zfs/zap_leaf.c \
-       $(top_srcdir)/module/zfs/zap_micro.c \
-       $(top_srcdir)/module/zfs/zfeature.c \
-       $(top_srcdir)/module/zfs/zfeature_common.c \
-       $(top_srcdir)/module/zfs/zfs_byteswap.c \
-       $(top_srcdir)/module/zfs/zfs_debug.c \
-       $(top_srcdir)/module/zfs/zfs_fm.c \
-       $(top_srcdir)/module/zfs/zfs_fuid.c \
-       $(top_srcdir)/module/zfs/zfs_sa.c \
-       $(top_srcdir)/module/zfs/zfs_znode.c \
-       $(top_srcdir)/module/zfs/zil.c \
-       $(top_srcdir)/module/zfs/zio.c \
-       $(top_srcdir)/module/zfs/zio_checksum.c \
-       $(top_srcdir)/module/zfs/zio_compress.c \
-       $(top_srcdir)/module/zfs/zio_inject.c \
-       $(top_srcdir)/module/zfs/zle.c \
-       $(top_srcdir)/module/zfs/zrlock.c
+USER_C = \
+       kernel.c \
+       taskq.c \
+       util.c
+
+KERNEL_C = \
+       zfs_comutil.c \
+       zfs_deleg.c \
+       zfs_fletcher.c \
+       zfs_namecheck.c \
+       zfs_prop.c \
+       zfs_uio.c \
+       zpool_prop.c \
+       zprop_common.c \
+       arc.c \
+       blkptr.c \
+       bplist.c \
+       bpobj.c \
+       bptree.c \
+       dbuf.c \
+       dbuf_stats.c \
+       ddt.c \
+       ddt_zap.c \
+       dmu.c \
+       dmu_diff.c \
+       dmu_object.c \
+       dmu_objset.c \
+       dmu_send.c \
+       dmu_traverse.c \
+       dmu_tx.c \
+       dmu_zfetch.c \
+       dnode.c \
+       dnode_sync.c \
+       dsl_bookmark.c \
+       dsl_dataset.c \
+       dsl_deadlist.c \
+       dsl_deleg.c \
+       dsl_dir.c \
+       dsl_pool.c \
+       dsl_prop.c \
+       dsl_scan.c \
+       dsl_synctask.c \
+       dsl_destroy.c \
+       dsl_userhold.c \
+       fm.c \
+       gzip.c \
+       lzjb.c \
+       lz4.c \
+       metaslab.c \
+       multilist.c \
+       range_tree.c \
+       refcount.c \
+       rrwlock.c \
+       sa.c \
+       sha256.c \
+       spa.c \
+       spa_boot.c \
+       spa_config.c \
+       spa_errlog.c \
+       spa_history.c \
+       spa_misc.c \
+       spa_stats.c \
+       space_map.c \
+       space_reftree.c \
+       txg.c \
+       trace.c \
+       uberblock.c \
+       unique.c \
+       vdev.c \
+       vdev_cache.c \
+       vdev_file.c \
+       vdev_label.c \
+       vdev_mirror.c \
+       vdev_missing.c \
+       vdev_queue.c \
+       vdev_raidz.c \
+       vdev_root.c \
+       zap.c \
+       zap_leaf.c \
+       zap_micro.c \
+       zfeature.c \
+       zfeature_common.c \
+       zfs_byteswap.c \
+       zfs_debug.c \
+       zfs_fm.c \
+       zfs_fuid.c \
+       zfs_sa.c \
+       zfs_znode.c \
+       zil.c \
+       zio.c \
+       zio_checksum.c \
+       zio_compress.c \
+       zio_inject.c \
+       zle.c \
+       zrlock.c
+
+nodist_libzpool_la_SOURCES = \
+       $(USER_C) \
+       $(KERNEL_C)
 
 libzpool_la_LIBADD = \
        $(top_builddir)/lib/libunicode/libunicode.la \
@@ -110,23 +121,4 @@ libzpool_la_LIBADD = \
 libzpool_la_LIBADD += $(ZLIB)
 libzpool_la_LDFLAGS = -version-info 2:0:0
 
-EXTRA_DIST = \
-       $(top_srcdir)/module/zfs/vdev_disk.c \
-       $(top_srcdir)/module/zfs/zfs_acl.c \
-       $(top_srcdir)/module/zfs/zfs_ctldir.c \
-       $(top_srcdir)/module/zfs/zfs_dir.c \
-       $(top_srcdir)/module/zfs/zfs_ioctl.c \
-       $(top_srcdir)/module/zfs/zfs_log.c \
-       $(top_srcdir)/module/zfs/zfs_onexit.c \
-       $(top_srcdir)/module/zfs/zfs_replay.c \
-       $(top_srcdir)/module/zfs/zfs_rlock.c \
-       $(top_srcdir)/module/zfs/zfs_vfsops.c \
-       $(top_srcdir)/module/zfs/zfs_vnops.c \
-       $(top_srcdir)/module/zfs/zpl_ctldir.c \
-       $(top_srcdir)/module/zfs/zpl_export.c \
-       $(top_srcdir)/module/zfs/zpl_file.c \
-       $(top_srcdir)/module/zfs/zpl_inode.c \
-       $(top_srcdir)/module/zfs/zpl_super.c \
-       $(top_srcdir)/module/zfs/zpl_xattr.c \
-       $(top_srcdir)/module/zfs/zvol.c \
-       $(top_srcdir)/module/zpios/pios.c
+EXTRA_DIST = $(USER_C)

diff --git a/module/Makefile.in b/module/Makefile.in
index 686402b1fc4c62d1273969ee8977447a33519fc1..e8d34c894b3d9ece2d1e8f5319e0903b79c6fb8f 100644 (file)
--- a/module/Makefile.in
+++ b/module/Makefile.in
@@ -63,6 +63,10 @@ modules_uninstall:
        done
 
 distdir:
+       list='$(subdir-m)'; for subdir in $$list; do \
+               (find @top_srcdir@/module/$$subdir -name '*.c' -o -name '*.h' |\
+               xargs /bin/cp -t $$distdir/$$subdir); \
+       done
 
 distclean maintainer-clean: clean
 install: modules_install

diff --git a/module/avl/Makefile.in b/module/avl/Makefile.in
index 27f9e4af4993153d0055483ebe4e9d08bd25b132..98c011e8aa8168c2083e41320ad5623c227e5218 100644 (file)
--- a/module/avl/Makefile.in
+++ b/module/avl/Makefile.in
@@ -1,7 +1,10 @@
+src = @abs_top_srcdir@/module/avl
+obj = @abs_builddir@
+
 MODULE := zavl
 
 EXTRA_CFLAGS = $(ZFS_MODULE_CFLAGS) @KERNELCPPFLAGS@
 
 obj-$(CONFIG_ZFS) := $(MODULE).o
 
-$(MODULE)-objs += @top_srcdir@/module/avl/avl.o
+$(MODULE)-objs += avl.o

diff --git a/module/nvpair/Makefile.in b/module/nvpair/Makefile.in
index 211fc726dfab14080ffab7c8a58ca6d44d7e1246..a8144452a4b3e63b2e3e600f4c22fb7802ed5602 100644 (file)
--- a/module/nvpair/Makefile.in
+++ b/module/nvpair/Makefile.in
@@ -1,10 +1,13 @@
+src = @abs_top_srcdir@/module/nvpair
+obj = @abs_builddir@
+
 MODULE := znvpair
 
 EXTRA_CFLAGS = $(ZFS_MODULE_CFLAGS) @KERNELCPPFLAGS@
 
 obj-$(CONFIG_ZFS) := $(MODULE).o
 
-$(MODULE)-objs += @top_srcdir@/module/nvpair/nvpair.o
-$(MODULE)-objs += @top_srcdir@/module/nvpair/fnvpair.o
-$(MODULE)-objs += @top_srcdir@/module/nvpair/nvpair_alloc_spl.o
-$(MODULE)-objs += @top_srcdir@/module/nvpair/nvpair_alloc_fixed.o
+$(MODULE)-objs += nvpair.o
+$(MODULE)-objs += fnvpair.o
+$(MODULE)-objs += nvpair_alloc_spl.o
+$(MODULE)-objs += nvpair_alloc_fixed.o

diff --git a/module/unicode/Makefile.in b/module/unicode/Makefile.in
index 226e23baa8d8a567675e410c114569c22a4280fa..b26e669274bed89ef2f8ea9a424f9183b8c75702 100644 (file)
--- a/module/unicode/Makefile.in
+++ b/module/unicode/Makefile.in
@@ -1,8 +1,11 @@
+src = @abs_top_srcdir@/module/unicode
+obj = @abs_builddir@
+
 MODULE := zunicode
 
 EXTRA_CFLAGS = $(ZFS_MODULE_CFLAGS) @KERNELCPPFLAGS@
 
 obj-$(CONFIG_ZFS) := $(MODULE).o
 
-$(MODULE)-objs += @top_srcdir@/module/unicode/u8_textprep.o
-$(MODULE)-objs += @top_srcdir@/module/unicode/uconv.o
+$(MODULE)-objs += u8_textprep.o
+$(MODULE)-objs += uconv.o

diff --git a/module/zcommon/Makefile.in b/module/zcommon/Makefile.in
index d4f5ba7ec70e700836bcdd4fec9dde3cd9e86555..67e474ee089d29320e7191304f3c5d11cfd80599 100644 (file)
--- a/module/zcommon/Makefile.in
+++ b/module/zcommon/Makefile.in
@@ -1,14 +1,17 @@
+src = @abs_top_srcdir@/module/zcommon
+obj = @abs_builddir@
+
 MODULE := zcommon
 
 EXTRA_CFLAGS = $(ZFS_MODULE_CFLAGS) @KERNELCPPFLAGS@
 
 obj-$(CONFIG_ZFS) := $(MODULE).o
 
-$(MODULE)-objs += @top_srcdir@/module/zcommon/zfs_deleg.o
-$(MODULE)-objs += @top_srcdir@/module/zcommon/zfs_prop.o
-$(MODULE)-objs += @top_srcdir@/module/zcommon/zprop_common.o
-$(MODULE)-objs += @top_srcdir@/module/zcommon/zfs_namecheck.o
-$(MODULE)-objs += @top_srcdir@/module/zcommon/zfs_comutil.o
-$(MODULE)-objs += @top_srcdir@/module/zcommon/zfs_fletcher.o
-$(MODULE)-objs += @top_srcdir@/module/zcommon/zfs_uio.o
-$(MODULE)-objs += @top_srcdir@/module/zcommon/zpool_prop.o
+$(MODULE)-objs += zfs_deleg.o
+$(MODULE)-objs += zfs_prop.o
+$(MODULE)-objs += zprop_common.o
+$(MODULE)-objs += zfs_namecheck.o
+$(MODULE)-objs += zfs_comutil.o
+$(MODULE)-objs += zfs_fletcher.o
+$(MODULE)-objs += zfs_uio.o
+$(MODULE)-objs += zpool_prop.o

diff --git a/module/zfs/Makefile.in b/module/zfs/Makefile.in
index e5753ae81118441daa27ed7d7136124747788708..55f8cef16b6d5cdbb2e15ebee53de263e8de4da3 100644 (file)
--- a/module/zfs/Makefile.in
+++ b/module/zfs/Makefile.in
@@ -1,105 +1,108 @@
+src = @abs_top_srcdir@/module/zfs
+obj = @abs_builddir@
+
 MODULE := zfs
 
 EXTRA_CFLAGS = $(ZFS_MODULE_CFLAGS) @KERNELCPPFLAGS@
 
 obj-$(CONFIG_ZFS) := $(MODULE).o
 
-$(MODULE)-objs += @top_srcdir@/module/zfs/arc.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/blkptr.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/bplist.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/bpobj.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/dbuf.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/dbuf_stats.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/bptree.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/ddt.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/ddt_zap.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/dmu.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/dmu_diff.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/dmu_object.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/dmu_objset.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/dmu_send.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/dmu_traverse.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/dmu_tx.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/dmu_zfetch.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/dnode.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/dnode_sync.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/dsl_dataset.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/dsl_deadlist.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/dsl_deleg.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/dsl_bookmark.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/dsl_dir.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/dsl_pool.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/dsl_prop.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/dsl_scan.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/dsl_synctask.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/fm.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/gzip.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/lzjb.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/lz4.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/metaslab.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/multilist.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/range_tree.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/refcount.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/rrwlock.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/sa.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/sha256.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/spa.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/spa_boot.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/spa_config.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/spa_errlog.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/spa_history.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/spa_misc.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/spa_stats.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/space_map.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/space_reftree.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/txg.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/trace.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/uberblock.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/unique.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/vdev.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/vdev_cache.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/vdev_disk.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/vdev_file.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/vdev_label.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/vdev_mirror.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/vdev_missing.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/vdev_queue.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/vdev_raidz.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/vdev_root.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zap.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zap_leaf.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zap_micro.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zfeature.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zfeature_common.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zfs_acl.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zfs_byteswap.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zfs_ctldir.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zfs_debug.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zfs_dir.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zfs_fm.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zfs_fuid.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zfs_ioctl.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zfs_log.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zfs_onexit.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zfs_replay.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zfs_rlock.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zfs_sa.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zfs_vfsops.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zfs_vnops.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zfs_znode.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zil.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zio.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zio_checksum.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zio_compress.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zio_inject.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zle.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zpl_ctldir.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zpl_export.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zpl_file.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zpl_inode.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zpl_super.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zpl_xattr.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zrlock.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/zvol.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/dsl_destroy.o
-$(MODULE)-objs += @top_srcdir@/module/zfs/dsl_userhold.o
+$(MODULE)-objs += arc.o
+$(MODULE)-objs += blkptr.o
+$(MODULE)-objs += bplist.o
+$(MODULE)-objs += bpobj.o
+$(MODULE)-objs += dbuf.o
+$(MODULE)-objs += dbuf_stats.o
+$(MODULE)-objs += bptree.o
+$(MODULE)-objs += ddt.o
+$(MODULE)-objs += ddt_zap.o
+$(MODULE)-objs += dmu.o
+$(MODULE)-objs += dmu_diff.o
+$(MODULE)-objs += dmu_object.o
+$(MODULE)-objs += dmu_objset.o
+$(MODULE)-objs += dmu_send.o
+$(MODULE)-objs += dmu_traverse.o
+$(MODULE)-objs += dmu_tx.o
+$(MODULE)-objs += dmu_zfetch.o
+$(MODULE)-objs += dnode.o
+$(MODULE)-objs += dnode_sync.o
+$(MODULE)-objs += dsl_dataset.o
+$(MODULE)-objs += dsl_deadlist.o
+$(MODULE)-objs += dsl_deleg.o
+$(MODULE)-objs += dsl_bookmark.o
+$(MODULE)-objs += dsl_dir.o
+$(MODULE)-objs += dsl_pool.o
+$(MODULE)-objs += dsl_prop.o
+$(MODULE)-objs += dsl_scan.o
+$(MODULE)-objs += dsl_synctask.o
+$(MODULE)-objs += fm.o
+$(MODULE)-objs += gzip.o
+$(MODULE)-objs += lzjb.o
+$(MODULE)-objs += lz4.o
+$(MODULE)-objs += metaslab.o
+$(MODULE)-objs += multilist.o
+$(MODULE)-objs += range_tree.o
+$(MODULE)-objs += refcount.o
+$(MODULE)-objs += rrwlock.o
+$(MODULE)-objs += sa.o
+$(MODULE)-objs += sha256.o
+$(MODULE)-objs += spa.o
+$(MODULE)-objs += spa_boot.o
+$(MODULE)-objs += spa_config.o
+$(MODULE)-objs += spa_errlog.o
+$(MODULE)-objs += spa_history.o
+$(MODULE)-objs += spa_misc.o
+$(MODULE)-objs += spa_stats.o
+$(MODULE)-objs += space_map.o
+$(MODULE)-objs += space_reftree.o
+$(MODULE)-objs += txg.o
+$(MODULE)-objs += trace.o
+$(MODULE)-objs += uberblock.o
+$(MODULE)-objs += unique.o
+$(MODULE)-objs += vdev.o
+$(MODULE)-objs += vdev_cache.o
+$(MODULE)-objs += vdev_disk.o
+$(MODULE)-objs += vdev_file.o
+$(MODULE)-objs += vdev_label.o
+$(MODULE)-objs += vdev_mirror.o
+$(MODULE)-objs += vdev_missing.o
+$(MODULE)-objs += vdev_queue.o
+$(MODULE)-objs += vdev_raidz.o
+$(MODULE)-objs += vdev_root.o
+$(MODULE)-objs += zap.o
+$(MODULE)-objs += zap_leaf.o
+$(MODULE)-objs += zap_micro.o
+$(MODULE)-objs += zfeature.o
+$(MODULE)-objs += zfeature_common.o
+$(MODULE)-objs += zfs_acl.o
+$(MODULE)-objs += zfs_byteswap.o
+$(MODULE)-objs += zfs_ctldir.o
+$(MODULE)-objs += zfs_debug.o
+$(MODULE)-objs += zfs_dir.o
+$(MODULE)-objs += zfs_fm.o
+$(MODULE)-objs += zfs_fuid.o
+$(MODULE)-objs += zfs_ioctl.o
+$(MODULE)-objs += zfs_log.o
+$(MODULE)-objs += zfs_onexit.o
+$(MODULE)-objs += zfs_replay.o
+$(MODULE)-objs += zfs_rlock.o
+$(MODULE)-objs += zfs_sa.o
+$(MODULE)-objs += zfs_vfsops.o
+$(MODULE)-objs += zfs_vnops.o
+$(MODULE)-objs += zfs_znode.o
+$(MODULE)-objs += zil.o
+$(MODULE)-objs += zio.o
+$(MODULE)-objs += zio_checksum.o
+$(MODULE)-objs += zio_compress.o
+$(MODULE)-objs += zio_inject.o
+$(MODULE)-objs += zle.o
+$(MODULE)-objs += zpl_ctldir.o
+$(MODULE)-objs += zpl_export.o
+$(MODULE)-objs += zpl_file.o
+$(MODULE)-objs += zpl_inode.o
+$(MODULE)-objs += zpl_super.o
+$(MODULE)-objs += zpl_xattr.o
+$(MODULE)-objs += zrlock.o
+$(MODULE)-objs += zvol.o
+$(MODULE)-objs += dsl_destroy.o
+$(MODULE)-objs += dsl_userhold.o

diff --git a/module/zpios/Makefile.in b/module/zpios/Makefile.in
index 437bf22876370b5ff8a1ecb479f0e28e8b5039b4..10a101da4dc0e68ae248b715a864a0becbfbf8e4 100644 (file)
--- a/module/zpios/Makefile.in
+++ b/module/zpios/Makefile.in
@@ -1,7 +1,10 @@
+src = @abs_top_srcdir@/module/zpios
+obj = @abs_builddir@
+
 MODULE := zpios
 
 EXTRA_CFLAGS = $(ZFS_MODULE_CFLAGS) @KERNELCPPFLAGS@
 
 obj-$(CONFIG_ZFS) := $(MODULE).o
 
-$(MODULE)-objs += @top_srcdir@/module/zpios/pios.o
+$(MODULE)-objs += pios.o

diff --git a/udev/rules.d/Makefile.am b/udev/rules.d/Makefile.am
index 6816addb4cc63a883ab6dcbd701c2cb71ffc7a87..febbb4818af8084fd99d478be1003bf35a286fa5 100644 (file)
--- a/udev/rules.d/Makefile.am
+++ b/udev/rules.d/Makefile.am
@@ -1,7 +1,7 @@
 udevrule_DATA = \
-       $(top_srcdir)/udev/rules.d/69-vdev.rules \
-       $(top_srcdir)/udev/rules.d/60-zvol.rules \
-       $(top_srcdir)/udev/rules.d/90-zfs.rules
+       69-vdev.rules \
+       60-zvol.rules \
+       90-zfs.rules
 
 EXTRA_DIST = \
        $(top_srcdir)/udev/rules.d/69-vdev.rules.in \
@@ -14,7 +14,7 @@ $(udevrule_DATA):
                -e 's,@udevdir\@,$(udevdir),g' \
                -e 's,@udevruledir\@,$(udevruledir),g' \
                -e 's,@sysconfdir\@,$(sysconfdir),g' \
-               '$@.in' >'$@'
+               "$(top_srcdir)/udev/rules.d/$@.in" > '$@'
 
 distclean-local::
        -$(RM) $(udevrule_DATA)