aboutsummaryrefslogtreecommitdiffstats
path: root/include/os
diff options
context:
space:
mode:
Diffstat (limited to 'include/os')
-rw-r--r--include/os/Makefile.am6
-rw-r--r--include/os/freebsd/Makefile.am91
-rw-r--r--include/os/freebsd/linux/Makefile.am5
-rw-r--r--include/os/freebsd/spl/Makefile.am1
-rw-r--r--include/os/freebsd/spl/acl/Makefile.am4
-rw-r--r--include/os/freebsd/spl/rpc/Makefile.am4
-rw-r--r--include/os/freebsd/spl/sys/Makefile.am73
-rw-r--r--include/os/freebsd/zfs/Makefile.am1
-rw-r--r--include/os/freebsd/zfs/sys/Makefile.am15
-rw-r--r--include/os/linux/Makefile.am112
-rw-r--r--include/os/linux/kernel/Makefile.am1
-rw-r--r--include/os/linux/kernel/linux/Makefile.am22
-rw-r--r--include/os/linux/spl/Makefile.am1
-rw-r--r--include/os/linux/spl/rpc/Makefile.am7
-rw-r--r--include/os/linux/spl/sys/Makefile.am64
-rw-r--r--include/os/linux/zfs/Makefile.am1
-rw-r--r--include/os/linux/zfs/sys/Makefile.am31
17 files changed, 201 insertions, 238 deletions
diff --git a/include/os/Makefile.am b/include/os/Makefile.am
deleted file mode 100644
index 7eab1abde..000000000
--- a/include/os/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-if BUILD_LINUX
-SUBDIRS = linux
-endif
-if BUILD_FREEBSD
-SUBDIRS = freebsd
-endif
diff --git a/include/os/freebsd/Makefile.am b/include/os/freebsd/Makefile.am
index 3c87d4a0e..5ddb7cd71 100644
--- a/include/os/freebsd/Makefile.am
+++ b/include/os/freebsd/Makefile.am
@@ -1 +1,90 @@
-SUBDIRS = linux spl zfs
+noinst_HEADERS = \
+ %D%/linux/compiler.h \
+ %D%/linux/types.h \
+ \
+ %D%/spl/acl/acl_common.h \
+ \
+ %D%/spl/rpc/xdr.h \
+ \
+ %D%/spl/sys/acl.h \
+ %D%/spl/sys/acl_impl.h \
+ %D%/spl/sys/atomic.h \
+ %D%/spl/sys/byteorder.h \
+ %D%/spl/sys/callb.h \
+ %D%/spl/sys/ccompat.h \
+ %D%/spl/sys/ccompile.h \
+ %D%/spl/sys/cmn_err.h \
+ %D%/spl/sys/condvar.h \
+ %D%/spl/sys/cred.h \
+ %D%/spl/sys/ctype.h \
+ %D%/spl/sys/debug.h \
+ %D%/spl/sys/dirent.h \
+ %D%/spl/sys/disp.h \
+ %D%/spl/sys/dkio.h \
+ %D%/spl/sys/extdirent.h \
+ %D%/spl/sys/fcntl.h \
+ %D%/spl/sys/file.h \
+ %D%/spl/sys/freebsd_rwlock.h \
+ %D%/spl/sys/idmap.h \
+ %D%/spl/sys/inttypes.h \
+ %D%/spl/sys/isa_defs.h \
+ %D%/spl/sys/kmem.h \
+ %D%/spl/sys/kmem_cache.h \
+ %D%/spl/sys/kstat.h \
+ %D%/spl/sys/list.h \
+ %D%/spl/sys/list_impl.h \
+ %D%/spl/sys/lock.h \
+ %D%/spl/sys/misc.h \
+ %D%/spl/sys/mod_os.h \
+ %D%/spl/sys/mode.h \
+ %D%/spl/sys/mount.h \
+ %D%/spl/sys/mutex.h \
+ %D%/spl/sys/param.h \
+ %D%/spl/sys/policy.h \
+ %D%/spl/sys/proc.h \
+ %D%/spl/sys/processor.h \
+ %D%/spl/sys/procfs_list.h \
+ %D%/spl/sys/random.h \
+ %D%/spl/sys/rwlock.h \
+ %D%/spl/sys/sdt.h \
+ %D%/spl/sys/sid.h \
+ %D%/spl/sys/sig.h \
+ %D%/spl/sys/simd.h \
+ %D%/spl/sys/simd_x86.h \
+ %D%/spl/sys/spl_condvar.h \
+ %D%/spl/sys/string.h \
+ %D%/spl/sys/sunddi.h \
+ %D%/spl/sys/sysmacros.h \
+ %D%/spl/sys/systeminfo.h \
+ %D%/spl/sys/systm.h \
+ %D%/spl/sys/taskq.h \
+ %D%/spl/sys/thread.h \
+ %D%/spl/sys/time.h \
+ %D%/spl/sys/timer.h \
+ %D%/spl/sys/trace.h \
+ %D%/spl/sys/trace_zfs.h \
+ %D%/spl/sys/types.h \
+ %D%/spl/sys/types32.h \
+ %D%/spl/sys/uio.h \
+ %D%/spl/sys/uuid.h \
+ %D%/spl/sys/vfs.h \
+ %D%/spl/sys/vm.h \
+ %D%/spl/sys/vmsystm.h \
+ %D%/spl/sys/vnode.h \
+ %D%/spl/sys/vnode_impl.h \
+ %D%/spl/sys/wmsum.h \
+ %D%/spl/sys/zmod.h \
+ %D%/spl/sys/zone.h \
+ \
+ %D%/zfs/sys/freebsd_crypto.h \
+ %D%/zfs/sys/sha2.h \
+ %D%/zfs/sys/vdev_os.h \
+ %D%/zfs/sys/zfs_bootenv_os.h \
+ %D%/zfs/sys/zfs_context_os.h \
+ %D%/zfs/sys/zfs_ctldir.h \
+ %D%/zfs/sys/zfs_dir.h \
+ %D%/zfs/sys/zfs_ioctl_compat.h \
+ %D%/zfs/sys/zfs_vfsops_os.h \
+ %D%/zfs/sys/zfs_vnops_os.h \
+ %D%/zfs/sys/zfs_znode_impl.h \
+ %D%/zfs/sys/zpl.h
diff --git a/include/os/freebsd/linux/Makefile.am b/include/os/freebsd/linux/Makefile.am
deleted file mode 100644
index 00cff7f5d..000000000
--- a/include/os/freebsd/linux/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-KERNEL_H = \
- compiler.h \
- types.h
-
-noinst_HEADERS = $(KERNEL_H)
diff --git a/include/os/freebsd/spl/Makefile.am b/include/os/freebsd/spl/Makefile.am
deleted file mode 100644
index b321825cb..000000000
--- a/include/os/freebsd/spl/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = acl rpc sys
diff --git a/include/os/freebsd/spl/acl/Makefile.am b/include/os/freebsd/spl/acl/Makefile.am
deleted file mode 100644
index 5c0698d02..000000000
--- a/include/os/freebsd/spl/acl/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-KERNEL_H = \
- acl_common.h
-
-noinst_HEADERS = $(KERNEL_H)
diff --git a/include/os/freebsd/spl/rpc/Makefile.am b/include/os/freebsd/spl/rpc/Makefile.am
deleted file mode 100644
index f6faf4b18..000000000
--- a/include/os/freebsd/spl/rpc/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-KERNEL_H = \
- xdr.h
-
-noinst_HEADERS = $(KERNEL_H)
diff --git a/include/os/freebsd/spl/sys/Makefile.am b/include/os/freebsd/spl/sys/Makefile.am
deleted file mode 100644
index 7d5081a4c..000000000
--- a/include/os/freebsd/spl/sys/Makefile.am
+++ /dev/null
@@ -1,73 +0,0 @@
-KERNEL_H = \
- acl_impl.h \
- acl.h \
- atomic.h \
- byteorder.h \
- callb.h \
- ccompat.h \
- ccompile.h \
- cmn_err.h \
- condvar.h \
- cred.h \
- ctype.h \
- debug.h \
- dirent.h \
- disp.h \
- dkio.h \
- extdirent.h \
- fcntl.h \
- file.h \
- freebsd_rwlock.h \
- idmap.h \
- inttypes.h \
- isa_defs.h \
- kmem_cache.h \
- kmem.h \
- kstat.h \
- list_impl.h \
- list.h \
- lock.h \
- Makefile.am \
- misc.h \
- mod_os.h \
- mode.h \
- mount.h \
- mutex.h \
- param.h \
- policy.h \
- proc.h \
- processor.h \
- procfs_list.h \
- random.h \
- rwlock.h \
- sdt.h \
- sid.h \
- sig.h \
- simd_x86.h \
- simd.h \
- spl_condvar.h \
- string.h \
- sunddi.h \
- sysmacros.h \
- systeminfo.h \
- systm.h \
- taskq.h \
- thread.h \
- time.h \
- timer.h \
- trace_zfs.h \
- trace.h \
- types.h \
- types32.h \
- uio.h \
- uuid.h \
- vfs.h \
- vm.h \
- vmsystm.h \
- vnode_impl.h \
- vnode.h \
- wmsum.h \
- zmod.h \
- zone.h
-
-noinst_HEADERS = $(KERNEL_H)
diff --git a/include/os/freebsd/zfs/Makefile.am b/include/os/freebsd/zfs/Makefile.am
deleted file mode 100644
index 081839c48..000000000
--- a/include/os/freebsd/zfs/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = sys
diff --git a/include/os/freebsd/zfs/sys/Makefile.am b/include/os/freebsd/zfs/sys/Makefile.am
deleted file mode 100644
index 392bb4ae3..000000000
--- a/include/os/freebsd/zfs/sys/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-KERNEL_H = \
- freebsd_crypto.h \
- sha2.h \
- vdev_os.h \
- zfs_bootenv_os.h \
- zfs_context_os.h \
- zfs_ctldir.h \
- zfs_dir.h \
- zfs_ioctl_compat.h \
- zfs_vfsops_os.h \
- zfs_vnops_os.h \
- zfs_znode_impl.h \
- zpl.h
-
-noinst_HEADERS = $(KERNEL_H)
diff --git a/include/os/linux/Makefile.am b/include/os/linux/Makefile.am
index 605a1fcb7..4d6901c69 100644
--- a/include/os/linux/Makefile.am
+++ b/include/os/linux/Makefile.am
@@ -1 +1,111 @@
-SUBDIRS = kernel spl zfs
+if CONFIG_KERNEL
+kernel_linuxdir = $(kerneldir)/linux
+kernel_linux_HEADERS = \
+ %D%/kernel/linux/blkdev_compat.h \
+ %D%/kernel/linux/compiler_compat.h \
+ %D%/kernel/linux/dcache_compat.h \
+ %D%/kernel/linux/kmap_compat.h \
+ %D%/kernel/linux/mod_compat.h \
+ %D%/kernel/linux/page_compat.h \
+ %D%/kernel/linux/percpu_compat.h \
+ %D%/kernel/linux/simd.h \
+ %D%/kernel/linux/simd_aarch64.h \
+ %D%/kernel/linux/simd_powerpc.h \
+ %D%/kernel/linux/simd_x86.h \
+ %D%/kernel/linux/utsname_compat.h \
+ %D%/kernel/linux/vfs_compat.h \
+ %D%/kernel/linux/xattr_compat.h
+
+kernel_sysdir = $(kerneldir)/sys
+kernel_sys_HEADERS = \
+ %D%/zfs/sys/policy.h \
+ %D%/zfs/sys/sha2.h \
+ %D%/zfs/sys/trace_acl.h \
+ %D%/zfs/sys/trace_arc.h \
+ %D%/zfs/sys/trace_common.h \
+ %D%/zfs/sys/trace_dbgmsg.h \
+ %D%/zfs/sys/trace_dbuf.h \
+ %D%/zfs/sys/trace_dmu.h \
+ %D%/zfs/sys/trace_dnode.h \
+ %D%/zfs/sys/trace_multilist.h \
+ %D%/zfs/sys/trace_rrwlock.h \
+ %D%/zfs/sys/trace_txg.h \
+ %D%/zfs/sys/trace_vdev.h \
+ %D%/zfs/sys/trace_zfs.h \
+ %D%/zfs/sys/trace_zil.h \
+ %D%/zfs/sys/trace_zio.h \
+ %D%/zfs/sys/trace_zrlock.h \
+ %D%/zfs/sys/zfs_bootenv_os.h \
+ %D%/zfs/sys/zfs_context_os.h \
+ %D%/zfs/sys/zfs_ctldir.h \
+ %D%/zfs/sys/zfs_dir.h \
+ %D%/zfs/sys/zfs_vfsops_os.h \
+ %D%/zfs/sys/zfs_vnops_os.h \
+ %D%/zfs/sys/zfs_znode_impl.h \
+ %D%/zfs/sys/zpl.h
+
+kernel_spl_rpcdir = $(kerneldir)/spl/rpc
+kernel_spl_rpc_HEADERS = \
+ %D%/spl/rpc/xdr.h
+
+kernel_spl_sysdir = $(kerneldir)/spl/sys
+kernel_spl_sys_HEADERS = \
+ %D%/spl/sys/acl.h \
+ %D%/spl/sys/atomic.h \
+ %D%/spl/sys/byteorder.h \
+ %D%/spl/sys/callb.h \
+ %D%/spl/sys/callo.h \
+ %D%/spl/sys/cmn_err.h \
+ %D%/spl/sys/condvar.h \
+ %D%/spl/sys/cred.h \
+ %D%/spl/sys/ctype.h \
+ %D%/spl/sys/debug.h \
+ %D%/spl/sys/disp.h \
+ %D%/spl/sys/dkio.h \
+ %D%/spl/sys/errno.h \
+ %D%/spl/sys/fcntl.h \
+ %D%/spl/sys/file.h \
+ %D%/spl/sys/inttypes.h \
+ %D%/spl/sys/isa_defs.h \
+ %D%/spl/sys/kmem.h \
+ %D%/spl/sys/kmem_cache.h \
+ %D%/spl/sys/kstat.h \
+ %D%/spl/sys/list.h \
+ %D%/spl/sys/mod_os.h \
+ %D%/spl/sys/mutex.h \
+ %D%/spl/sys/param.h \
+ %D%/spl/sys/proc.h \
+ %D%/spl/sys/processor.h \
+ %D%/spl/sys/procfs_list.h \
+ %D%/spl/sys/random.h \
+ %D%/spl/sys/rwlock.h \
+ %D%/spl/sys/shrinker.h \
+ %D%/spl/sys/sid.h \
+ %D%/spl/sys/signal.h \
+ %D%/spl/sys/simd.h \
+ %D%/spl/sys/stat.h \
+ %D%/spl/sys/string.h \
+ %D%/spl/sys/sunddi.h \
+ %D%/spl/sys/sysmacros.h \
+ %D%/spl/sys/systeminfo.h \
+ %D%/spl/sys/taskq.h \
+ %D%/spl/sys/thread.h \
+ %D%/spl/sys/time.h \
+ %D%/spl/sys/timer.h \
+ %D%/spl/sys/trace.h \
+ %D%/spl/sys/trace_spl.h \
+ %D%/spl/sys/trace_taskq.h \
+ %D%/spl/sys/tsd.h \
+ %D%/spl/sys/types.h \
+ %D%/spl/sys/types32.h \
+ %D%/spl/sys/uio.h \
+ %D%/spl/sys/user.h \
+ %D%/spl/sys/vfs.h \
+ %D%/spl/sys/vmem.h \
+ %D%/spl/sys/vmsystm.h \
+ %D%/spl/sys/vnode.h \
+ %D%/spl/sys/wait.h \
+ %D%/spl/sys/wmsum.h \
+ %D%/spl/sys/zmod.h \
+ %D%/spl/sys/zone.h
+endif
diff --git a/include/os/linux/kernel/Makefile.am b/include/os/linux/kernel/Makefile.am
deleted file mode 100644
index 08b2f5fc5..000000000
--- a/include/os/linux/kernel/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = linux
diff --git a/include/os/linux/kernel/linux/Makefile.am b/include/os/linux/kernel/linux/Makefile.am
deleted file mode 100644
index 6ff0df506..000000000
--- a/include/os/linux/kernel/linux/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-KERNEL_H = \
- dcache_compat.h \
- xattr_compat.h \
- vfs_compat.h \
- blkdev_compat.h \
- utsname_compat.h \
- kmap_compat.h \
- percpu_compat.h \
- simd.h \
- simd_x86.h \
- simd_aarch64.h \
- simd_powerpc.h \
- mod_compat.h \
- page_compat.h \
- compiler_compat.h
-
-if CONFIG_KERNEL
-if BUILD_LINUX
-kerneldir = @prefix@/src/zfs-$(VERSION)/include/linux
-kernel_HEADERS = $(KERNEL_H)
-endif
-endif
diff --git a/include/os/linux/spl/Makefile.am b/include/os/linux/spl/Makefile.am
deleted file mode 100644
index bd781c08f..000000000
--- a/include/os/linux/spl/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = rpc sys
diff --git a/include/os/linux/spl/rpc/Makefile.am b/include/os/linux/spl/rpc/Makefile.am
deleted file mode 100644
index 13d804fce..000000000
--- a/include/os/linux/spl/rpc/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-KERNEL_H = \
- xdr.h
-
-if CONFIG_KERNEL
-kerneldir = @prefix@/src/zfs-$(VERSION)/include/spl/rpc
-kernel_HEADERS = $(KERNEL_H)
-endif
diff --git a/include/os/linux/spl/sys/Makefile.am b/include/os/linux/spl/sys/Makefile.am
deleted file mode 100644
index 0dc9b90c1..000000000
--- a/include/os/linux/spl/sys/Makefile.am
+++ /dev/null
@@ -1,64 +0,0 @@
-KERNEL_H = \
- acl.h \
- atomic.h \
- byteorder.h \
- callb.h \
- callo.h \
- cmn_err.h \
- condvar.h \
- cred.h \
- ctype.h \
- debug.h \
- disp.h \
- dkio.h \
- errno.h \
- fcntl.h \
- file.h \
- inttypes.h \
- isa_defs.h \
- kmem_cache.h \
- kmem.h \
- kstat.h \
- list.h \
- mod_os.h \
- mutex.h \
- param.h \
- processor.h \
- proc.h \
- procfs_list.h \
- random.h \
- rwlock.h \
- shrinker.h \
- sid.h \
- signal.h \
- simd.h \
- stat.h \
- string.h \
- sunddi.h \
- sysmacros.h \
- systeminfo.h \
- taskq.h \
- thread.h \
- time.h \
- timer.h \
- trace.h \
- trace_spl.h \
- trace_taskq.h \
- tsd.h \
- types32.h \
- types.h \
- uio.h \
- user.h \
- vfs.h \
- vmem.h \
- vmsystm.h \
- vnode.h \
- wait.h \
- wmsum.h \
- zmod.h \
- zone.h
-
-if CONFIG_KERNEL
-kerneldir = @prefix@/src/zfs-$(VERSION)/include/spl/sys
-kernel_HEADERS = $(KERNEL_H)
-endif
diff --git a/include/os/linux/zfs/Makefile.am b/include/os/linux/zfs/Makefile.am
deleted file mode 100644
index 081839c48..000000000
--- a/include/os/linux/zfs/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = sys
diff --git a/include/os/linux/zfs/sys/Makefile.am b/include/os/linux/zfs/sys/Makefile.am
deleted file mode 100644
index a075db476..000000000
--- a/include/os/linux/zfs/sys/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-KERNEL_H = \
- policy.h \
- sha2.h \
- trace_acl.h \
- trace_arc.h \
- trace_common.h \
- trace_zfs.h \
- trace_dbgmsg.h \
- trace_dbuf.h \
- trace_dmu.h \
- trace_dnode.h \
- trace_multilist.h \
- trace_rrwlock.h \
- trace_txg.h \
- trace_vdev.h \
- trace_zil.h \
- trace_zio.h \
- trace_zrlock.h \
- zfs_bootenv_os.h \
- zfs_context_os.h \
- zfs_ctldir.h \
- zfs_dir.h \
- zfs_vfsops_os.h \
- zfs_vnops_os.h \
- zfs_znode_impl.h \
- zpl.h
-
-if CONFIG_KERNEL
-kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys
-kernel_HEADERS = $(KERNEL_H)
-endif