diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/Makefile.am | 2 | ||||
-rw-r--r-- | include/os/freebsd/linux/Makefile.am | 5 | ||||
-rw-r--r-- | include/os/freebsd/spl/acl/Makefile.am | 5 | ||||
-rw-r--r-- | include/os/freebsd/spl/rpc/Makefile.am | 9 | ||||
-rw-r--r-- | include/os/freebsd/spl/sys/Makefile.am | 5 | ||||
-rw-r--r-- | include/os/freebsd/zfs/sys/Makefile.am | 5 | ||||
-rw-r--r-- | include/os/linux/kernel/linux/Makefile.am | 13 | ||||
-rw-r--r-- | include/sys/Makefile.am | 6 | ||||
-rw-r--r-- | include/sys/crypto/Makefile.am | 10 | ||||
-rw-r--r-- | include/sys/fm/Makefile.am | 10 | ||||
-rw-r--r-- | include/sys/fm/fs/Makefile.am | 10 | ||||
-rw-r--r-- | include/sys/fs/Makefile.am | 10 | ||||
-rw-r--r-- | include/sys/lua/Makefile.am | 10 | ||||
-rw-r--r-- | include/sys/sysevent/Makefile.am | 10 |
14 files changed, 34 insertions, 76 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 6c36d9ad9..ba02142df 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -20,8 +20,6 @@ USER_H = \ libzutil.h \ thread_pool.h -EXTRA_DIST = $(COMMON_H) $(USER_H) - if CONFIG_USER libzfsdir = $(includedir)/libzfs libzfs_HEADERS = $(COMMON_H) $(USER_H) diff --git a/include/os/freebsd/linux/Makefile.am b/include/os/freebsd/linux/Makefile.am index 7168fc7a1..df902b87a 100644 --- a/include/os/freebsd/linux/Makefile.am +++ b/include/os/freebsd/linux/Makefile.am @@ -2,4 +2,7 @@ KERNEL_H = \ compiler.h \ types.h -EXTRA_DIST = $(KERNEL_H) +if CONFIG_KERNEL +kerneldir = @prefix@/src/zfs-$(VERSION)/include/linux +kernel_HEADERS = $(KERNEL_H) +endif diff --git a/include/os/freebsd/spl/acl/Makefile.am b/include/os/freebsd/spl/acl/Makefile.am index 4aabfd357..3028ebabe 100644 --- a/include/os/freebsd/spl/acl/Makefile.am +++ b/include/os/freebsd/spl/acl/Makefile.am @@ -1,4 +1,7 @@ KERNEL_H = \ acl_common.h -EXTRA_DIST = $(KERNEL_H) +if CONFIG_KERNEL +kerneldir = @prefix@/src/zfs-$(VERSION)/include/spl/acl +kernel_HEADERS = $(KERNEL_H) +endif diff --git a/include/os/freebsd/spl/rpc/Makefile.am b/include/os/freebsd/spl/rpc/Makefile.am index 8bd6e9b09..13d804fce 100644 --- a/include/os/freebsd/spl/rpc/Makefile.am +++ b/include/os/freebsd/spl/rpc/Makefile.am @@ -1,8 +1,7 @@ -COMMON_H = - KERNEL_H = \ xdr.h -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) +if CONFIG_KERNEL +kerneldir = @prefix@/src/zfs-$(VERSION)/include/spl/rpc +kernel_HEADERS = $(KERNEL_H) +endif diff --git a/include/os/freebsd/spl/sys/Makefile.am b/include/os/freebsd/spl/sys/Makefile.am index ac80f68cd..c95c9d65a 100644 --- a/include/os/freebsd/spl/sys/Makefile.am +++ b/include/os/freebsd/spl/sys/Makefile.am @@ -69,4 +69,7 @@ KERNEL_H = \ zmod.h \ zone.h -EXTRA_DIST = $(KERNEL_H) +if CONFIG_KERNEL +kerneldir = @prefix@/src/zfs-$(VERSION)/include/spl/sys +kernel_HEADERS = $(KERNEL_H) +endif diff --git a/include/os/freebsd/zfs/sys/Makefile.am b/include/os/freebsd/zfs/sys/Makefile.am index 56c0f6e90..8a1f8b313 100644 --- a/include/os/freebsd/zfs/sys/Makefile.am +++ b/include/os/freebsd/zfs/sys/Makefile.am @@ -11,4 +11,7 @@ KERNEL_H = \ zfs_znode_impl.h \ zpl.h -EXTRA_DIST = $(KERNEL_H) +if CONFIG_KERNEL +kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys +kernel_HEADERS = $(KERNEL_H) +endif diff --git a/include/os/linux/kernel/linux/Makefile.am b/include/os/linux/kernel/linux/Makefile.am index 7f84cbd1d..c142aac33 100644 --- a/include/os/linux/kernel/linux/Makefile.am +++ b/include/os/linux/kernel/linux/Makefile.am @@ -1,5 +1,3 @@ -COMMON_H = - KERNEL_H = \ dcache_compat.h \ xattr_compat.h \ @@ -15,16 +13,7 @@ KERNEL_H = \ page_compat.h \ compiler_compat.h -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - -if CONFIG_USER -libzfsdir = $(includedir)/libzfs/linux -libzfs_HEADERS = $(COMMON_H) $(USER_H) -endif - if CONFIG_KERNEL kerneldir = @prefix@/src/zfs-$(VERSION)/include/linux -kernel_HEADERS = $(COMMON_H) $(KERNEL_H) +kernel_HEADERS = $(KERNEL_H) endif diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am index f559f188e..3d7bd191b 100644 --- a/include/sys/Makefile.am +++ b/include/sys/Makefile.am @@ -133,13 +133,9 @@ KERNEL_H = \ zvol.h \ zvol_impl.h -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - if CONFIG_USER libzfsdir = $(includedir)/libzfs/sys -libzfs_HEADERS = $(COMMON_H) $(USER_H) +libzfs_HEADERS = $(COMMON_H) endif if CONFIG_KERNEL diff --git a/include/sys/crypto/Makefile.am b/include/sys/crypto/Makefile.am index 60dc3e137..79a5adfae 100644 --- a/include/sys/crypto/Makefile.am +++ b/include/sys/crypto/Makefile.am @@ -3,18 +3,12 @@ COMMON_H = \ common.h \ icp.h -KERNEL_H = - -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - if CONFIG_USER libzfsdir = $(includedir)/libzfs/sys/crypto -libzfs_HEADERS = $(COMMON_H) $(USER_H) +libzfs_HEADERS = $(COMMON_H) endif if CONFIG_KERNEL kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/crypto -kernel_HEADERS = $(COMMON_H) $(KERNEL_H) +kernel_HEADERS = $(COMMON_H) endif diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am index 718f23fb0..fd735e187 100644 --- a/include/sys/fm/Makefile.am +++ b/include/sys/fm/Makefile.am @@ -4,18 +4,12 @@ COMMON_H = \ protocol.h \ util.h -KERNEL_H = - -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - if CONFIG_USER libzfsdir = $(includedir)/libzfs/sys/fm -libzfs_HEADERS = $(COMMON_H) $(USER_H) +libzfs_HEADERS = $(COMMON_H) endif if CONFIG_KERNEL kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fm -kernel_HEADERS = $(COMMON_H) $(KERNEL_H) +kernel_HEADERS = $(COMMON_H) endif diff --git a/include/sys/fm/fs/Makefile.am b/include/sys/fm/fs/Makefile.am index d9adcd1fe..7f33a1532 100644 --- a/include/sys/fm/fs/Makefile.am +++ b/include/sys/fm/fs/Makefile.am @@ -1,18 +1,12 @@ COMMON_H = \ zfs.h -KERNEL_H = - -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - if CONFIG_USER libzfsdir = $(includedir)/libzfs/sys/fm/fs -libzfs_HEADERS = $(COMMON_H) $(USER_H) +libzfs_HEADERS = $(COMMON_H) endif if CONFIG_KERNEL kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fm/fs -kernel_HEADERS = $(COMMON_H) $(KERNEL_H) +kernel_HEADERS = $(COMMON_H) endif diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am index 4d9400ee6..351745786 100644 --- a/include/sys/fs/Makefile.am +++ b/include/sys/fs/Makefile.am @@ -1,18 +1,12 @@ COMMON_H = \ zfs.h -KERNEL_H = - -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - if CONFIG_USER libzfsdir = $(includedir)/libzfs/sys/fs -libzfs_HEADERS = $(COMMON_H) $(USER_H) +libzfs_HEADERS = $(COMMON_H) endif if CONFIG_KERNEL kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fs -kernel_HEADERS = $(COMMON_H) $(KERNEL_H) +kernel_HEADERS = $(COMMON_H) endif diff --git a/include/sys/lua/Makefile.am b/include/sys/lua/Makefile.am index 85f7c74e0..e9d1185a4 100644 --- a/include/sys/lua/Makefile.am +++ b/include/sys/lua/Makefile.am @@ -4,18 +4,12 @@ COMMON_H = \ lualib.h \ lauxlib.h -KERNEL_H = - -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - if CONFIG_USER libzfsdir = $(includedir)/libzfs/sys/lua -libzfs_HEADERS = $(COMMON_H) $(USER_H) +libzfs_HEADERS = $(COMMON_H) endif if CONFIG_KERNEL kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/lua -kernel_HEADERS = $(COMMON_H) $(KERNEL_H) +kernel_HEADERS = $(COMMON_H) endif diff --git a/include/sys/sysevent/Makefile.am b/include/sys/sysevent/Makefile.am index 348539782..18949913e 100644 --- a/include/sys/sysevent/Makefile.am +++ b/include/sys/sysevent/Makefile.am @@ -2,18 +2,12 @@ COMMON_H = \ eventdefs.h \ dev.h -KERNEL_H = - -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - if CONFIG_USER libzfsdir = $(includedir)/libzfs/sys/sysevent -libzfs_HEADERS = $(COMMON_H) $(USER_H) +libzfs_HEADERS = $(COMMON_H) endif if CONFIG_KERNEL kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/sysevent -kernel_HEADERS = $(COMMON_H) $(KERNEL_H) +kernel_HEADERS = $(COMMON_H) endif |