c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-23 02:44:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Support parallel build trees (VPATH builds)

Browse Source 
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
This commit is contained in:
Turbo Fredriksson
2014-06-09 23:55:31 +02:00
committed by Brian Behlendorf
parent 2a53e2dacc
commit 47a4a6fd5f
42 changed files with 476 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/libavl/Makefile.am
+12 -2
View File
@@ -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)
lib/libefi/Makefile.am
+10 -2
View File
@@ -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)
lib/libnvpair/Makefile.am
+17 -8
View File
@@ -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)
lib/libshare/Makefile.am
+15 -7
View File
@@ -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)
lib/libspl/Makefile.am
+30 -16
View File
@@ -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)
lib/libspl/asm-generic/atomic.S
-6
View File
@@ -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.
lib/libspl/asm-i386/Makefile.am
+1 -1
View File
@@ -1 +1 @@
noinst_HEADERS = $(top_srcdir)/lib/libspl/asm-i386/*.S
noinst_HEADERS = atomic.S
lib/libspl/asm-x86_64/Makefile.am
+1 -1
View File
@@ -1 +1 @@
noinst_HEADERS = $(top_srcdir)/lib/libspl/asm-x86_64/*.S
noinst_HEADERS = atomic.S
lib/libunicode/Makefile.am
+13 -3
View File
@@ -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)
lib/libuutil/Makefile.am
+19 -11
View File
@@ -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)
lib/libzfs/Makefile.am
+23 -16
View File
@@ -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)
lib/libzfs_core/Makefile.am
+10 -2
View File
@@ -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)
lib/libzpool/Makefile.am
+105 -113
View File
@@ -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)