Fixes for make dist
Reduce the usage of EXTRA_DIST. If files are conditionally included in _SOURCES, _HEADERS etc, automake is smart enough to dist all files that could possibly be included, but this does not apply to EXTRA_DIST, resulting in make dist depending on the configuration. Add some files that were missing altogether in various Makefile's. The changes to disted files in this commit (excluding deleted files): +./cmd/zed/agents/README.md +./etc/init.d/README.md +./lib/libspl/os/freebsd/getexecname.c +./lib/libspl/os/freebsd/gethostid.c +./lib/libspl/os/freebsd/getmntany.c +./lib/libspl/os/freebsd/mnttab.c -./lib/libzfs/libzfs_core.pc -./lib/libzfs/libzfs.pc +./lib/libzfs/os/freebsd/libzfs_compat.c +./lib/libzfs/os/freebsd/libzfs_fsshare.c +./lib/libzfs/os/freebsd/libzfs_ioctl_compat.c +./lib/libzfs/os/freebsd/libzfs_zmount.c +./lib/libzutil/os/freebsd/zutil_compat.c +./lib/libzutil/os/freebsd/zutil_device_path_os.c +./lib/libzutil/os/freebsd/zutil_import_os.c +./module/lua/README.zfs +./module/os/linux/spl/README.md +./tests/README.md +./tests/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_rm_nested.ksh +./tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_encrypted_unloaded.ksh +./tests/zfs-tests/tests/functional/inheritance/README.config +./tests/zfs-tests/tests/functional/inheritance/README.state +./tests/zfs-tests/tests/functional/rsend/rsend_016_neg.ksh +./tests/zfs-tests/tests/perf/fio/sequential_readwrite.fio Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu> Closes #10501
This commit is contained in:
parent
7c902a5178
commit
6b99fc0620
@ -32,6 +32,7 @@ EXTRA_DIST = autogen.sh copy-builtin
|
||||
EXTRA_DIST += config/config.awk config/rpm.am config/deb.am config/tgz.am
|
||||
EXTRA_DIST += META AUTHORS COPYRIGHT LICENSE NEWS NOTICE README.md
|
||||
EXTRA_DIST += CODE_OF_CONDUCT.md
|
||||
EXTRA_DIST += module/lua/README.zfs module/os/linux/spl/README.md
|
||||
|
||||
# Include all the extra licensing information for modules
|
||||
EXTRA_DIST += module/icp/algs/skein/THIRDPARTYLICENSE
|
||||
|
@ -1,17 +1,14 @@
|
||||
EXTRA_DIST = arc_summary2 arc_summary3
|
||||
|
||||
transform = $(program_transform_name)
|
||||
|
||||
if USING_PYTHON_2
|
||||
dist_bin_SCRIPTS = arc_summary2
|
||||
install-exec-hook:
|
||||
before=$$(echo arc_summary2 | sed '$(transform)'); \
|
||||
after=$$(echo arc_summary | sed '$(transform)'); \
|
||||
mv "$(DESTDIR)$(bindir)/$$before" "$(DESTDIR)$(bindir)/$$after"
|
||||
SCRIPT = arc_summary2
|
||||
else
|
||||
dist_bin_SCRIPTS = arc_summary3
|
||||
SCRIPT = arc_summary3
|
||||
endif
|
||||
|
||||
dist_bin_SCRIPTS = $(SCRIPT)
|
||||
|
||||
install-exec-hook:
|
||||
before=$$(echo arc_summary3 | sed '$(transform)'); \
|
||||
before=$$(echo $(SCRIPT) | sed '$(transform)'); \
|
||||
after=$$(echo arc_summary | sed '$(transform)'); \
|
||||
mv "$(DESTDIR)$(bindir)/$$before" "$(DESTDIR)$(bindir)/$$after"
|
||||
endif
|
||||
|
@ -43,3 +43,5 @@ zed_LDADD = \
|
||||
|
||||
zed_LDADD += -lrt
|
||||
zed_LDFLAGS = -pthread
|
||||
|
||||
EXTRA_DIST = agents/README.md
|
||||
|
@ -1,20 +0,0 @@
|
||||
dnl #
|
||||
dnl # 4.16 kernel: check if struct posix_acl acl.a_refcount is a refcount_t.
|
||||
dnl # It's an atomic_t on older kernels.
|
||||
dnl #
|
||||
AC_DEFUN([ZFS_AC_KERNEL_ACL_HAS_REFCOUNT], [
|
||||
AC_MSG_CHECKING([whether posix_acl has refcount_t])
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/backing-dev.h>
|
||||
#include <linux/refcount.h>
|
||||
#include <linux/posix_acl.h>
|
||||
],[
|
||||
struct posix_acl acl;
|
||||
refcount_t *r __attribute__ ((unused)) = &acl.a_refcount;
|
||||
],[
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_ACL_REFCOUNT, 1, [posix_acl has refcount_t])
|
||||
],[
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
])
|
@ -143,9 +143,6 @@ AC_CONFIG_FILES([
|
||||
lib/libnvpair/Makefile
|
||||
lib/libshare/Makefile
|
||||
lib/libspl/Makefile
|
||||
lib/libspl/asm-generic/Makefile
|
||||
lib/libspl/asm-i386/Makefile
|
||||
lib/libspl/asm-x86_64/Makefile
|
||||
lib/libspl/include/Makefile
|
||||
lib/libspl/include/ia32/Makefile
|
||||
lib/libspl/include/ia32/sys/Makefile
|
||||
|
@ -15,10 +15,4 @@ $(pkgdracut_SCRIPTS):%:%.in
|
||||
-e 's,@sysconfdir\@,$(sysconfdir),g' \
|
||||
$< >'$@'
|
||||
|
||||
# Double-colon rules are allowed; there are multiple independent definitions.
|
||||
clean-local::
|
||||
-$(RM) $(pkgdracut_SCRIPTS)
|
||||
|
||||
# Double-colon rules are allowed; there are multiple independent definitions.
|
||||
distclean-local::
|
||||
-$(RM) $(pkgdracut_SCRIPTS)
|
||||
CLEANFILES = $(pkgdracut_SCRIPTS)
|
||||
|
@ -37,6 +37,4 @@ $(pkgdracut_SCRIPTS) $(pkgdracut_DATA) :%:%.in
|
||||
-e 's,@mounthelperdir\@,$(mounthelperdir),g' \
|
||||
$< >'$@'
|
||||
|
||||
# Double-colon rules are allowed; there are multiple independent definitions.
|
||||
distclean-local::
|
||||
-$(RM) $(pkgdracut_SCRIPTS) $(pkgdracut_DATA)
|
||||
CLEANFILES = $(pkgdracut_SCRIPTS) $(pkgdracut_DATA)
|
||||
|
@ -14,5 +14,4 @@ pam_zfs_key_la_LDFLAGS = -version-info 1:0:0 -avoid-version -module -shared
|
||||
|
||||
pam_zfs_key_la_LIBADD += -lpam $(LIBSSL)
|
||||
|
||||
pamconfigs_DATA = zfs_key
|
||||
EXTRA_DIST = $(pamconfigs_DATA)
|
||||
dist_pamconfigs_DATA = zfs_key
|
||||
|
@ -7,7 +7,8 @@ EXTRA_DIST = \
|
||||
zfs-share.in \
|
||||
zfs-import.in \
|
||||
zfs-mount.in \
|
||||
zfs-zed.in
|
||||
zfs-zed.in \
|
||||
README.md
|
||||
|
||||
$(init_SCRIPTS):%:%.in Makefile
|
||||
-(if [ -e /etc/debian_version ]; then \
|
||||
|
@ -9,6 +9,4 @@ $(modulesload_DATA):%:%.in
|
||||
-e '' \
|
||||
$< >'$@'
|
||||
|
||||
# Double-colon rules are allowed; there are multiple independent definitions.
|
||||
distclean-local::
|
||||
-$(RM) $(modulesload_DATA)
|
||||
CLEANFILES = $(modulesload_DATA)
|
||||
|
@ -11,6 +11,4 @@ $(systemdgenerator_SCRIPTS): %: %.in
|
||||
-e 's,@sysconfdir\@,$(sysconfdir),g' \
|
||||
$< >'$@'
|
||||
|
||||
# Double-colon rules are allowed; there are multiple independent definitions.
|
||||
distclean-local::
|
||||
-$(RM) $(systemdgenerator_SCRIPTS)
|
||||
CLEANFILES = $(systemdgenerator_SCRIPTS)
|
||||
|
@ -35,6 +35,4 @@ install-data-hook:
|
||||
$(MKDIR_P) "$(DESTDIR)$(systemdunitdir)"
|
||||
ln -sf /dev/null "$(DESTDIR)$(systemdunitdir)/zfs-import.service"
|
||||
|
||||
# Double-colon rules are allowed; there are multiple independent definitions.
|
||||
distclean-local::
|
||||
-$(RM) $(systemdunit_DATA) $(systemdpreset_DATA)
|
||||
CLEANFILES = $(systemdunit_DATA) $(systemdpreset_DATA)
|
||||
|
@ -1,7 +1,7 @@
|
||||
pkgsysconfdir = $(sysconfdir)/zfs
|
||||
initconfdir = $(DEFAULT_INITCONF_DIR)
|
||||
|
||||
pkgsysconf_DATA = \
|
||||
dist_pkgsysconf_DATA = \
|
||||
vdev_id.conf.alias.example \
|
||||
vdev_id.conf.sas_direct.example \
|
||||
vdev_id.conf.sas_switch.example \
|
||||
@ -10,26 +10,13 @@ pkgsysconf_DATA = \
|
||||
pkgsysconf_SCRIPTS = \
|
||||
zfs-functions
|
||||
|
||||
EXTRA_DIST = $(pkgsysconf_DATA) \
|
||||
zfs-functions.in
|
||||
EXTRA_DIST = zfs-functions.in
|
||||
|
||||
$(pkgsysconf_SCRIPTS):%:%.in Makefile
|
||||
-(if [ -e /etc/debian_version ]; then \
|
||||
NFS_SRV=nfs-kernel-server; \
|
||||
else \
|
||||
NFS_SRV=nfs; \
|
||||
fi; \
|
||||
if [ -e /sbin/openrc-run ]; then \
|
||||
SHELL=/sbin/openrc-run; \
|
||||
else \
|
||||
SHELL=/bin/sh; \
|
||||
fi; \
|
||||
$(SED) \
|
||||
-$(SED) \
|
||||
-e 's,@sbindir\@,$(sbindir),g' \
|
||||
-e 's,@sysconfdir\@,$(sysconfdir),g' \
|
||||
-e 's,@initconfdir\@,$(initconfdir),g' \
|
||||
$< >'$@'; \
|
||||
[ '$@' = 'zfs-functions' ] || \
|
||||
chmod +x '$@')
|
||||
$< >'$@'
|
||||
|
||||
CLEANFILES = $(pkgsysconf_SCRIPTS)
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -7,13 +7,8 @@ AM_CFLAGS += $(FRAME_LARGER_THAN)
|
||||
|
||||
noinst_LTLIBRARIES = libavl.la
|
||||
|
||||
USER_C =
|
||||
|
||||
KERNEL_C = \
|
||||
avl.c
|
||||
|
||||
nodist_libavl_la_SOURCES = \
|
||||
$(USER_C) \
|
||||
$(KERNEL_C)
|
||||
|
||||
EXTRA_DIST = $(USER_C)
|
||||
|
@ -5,8 +5,6 @@ noinst_LTLIBRARIES = libefi.la
|
||||
USER_C = \
|
||||
rdwr_efi.c
|
||||
|
||||
nodist_libefi_la_SOURCES = $(USER_C)
|
||||
libefi_la_SOURCES = $(USER_C)
|
||||
|
||||
libefi_la_LIBADD = $(LIBUUID)
|
||||
|
||||
EXTRA_DIST = $(USER_C)
|
||||
|
@ -20,8 +20,10 @@ KERNEL_C = \
|
||||
nvpair.c \
|
||||
fnvpair.c
|
||||
|
||||
dist_libnvpair_la_SOURCES = \
|
||||
$(USER_C)
|
||||
|
||||
nodist_libnvpair_la_SOURCES = \
|
||||
$(USER_C) \
|
||||
$(KERNEL_C)
|
||||
|
||||
if BUILD_FREEBSD
|
||||
@ -31,7 +33,3 @@ else
|
||||
libnvpair_la_LIBADD = $(LIBTIRPC_LIBS)
|
||||
libnvpair_la_LDFLAGS = -version-info 1:1:0
|
||||
endif
|
||||
|
||||
|
||||
|
||||
EXTRA_DIST = $(USER_C)
|
||||
|
@ -10,6 +10,4 @@ USER_C = \
|
||||
smb.c \
|
||||
smb.h
|
||||
|
||||
nodist_libshare_la_SOURCES = $(USER_C)
|
||||
|
||||
EXTRA_DIST = $(USER_C)
|
||||
libshare_la_SOURCES = $(USER_C)
|
||||
|
@ -11,7 +11,6 @@ endif
|
||||
endif
|
||||
|
||||
SUBDIRS = include
|
||||
DIST_SUBDIRS = include asm-generic asm-i386 asm-x86_64
|
||||
|
||||
AM_CFLAGS += $(LIBTIRPC_CFLAGS)
|
||||
|
||||
@ -46,10 +45,8 @@ USER_C += \
|
||||
os/freebsd/mnttab.c
|
||||
endif
|
||||
|
||||
nodist_libspl_la_SOURCES = \
|
||||
libspl_la_SOURCES = \
|
||||
$(USER_C) \
|
||||
$(TARGET_CPU_ATOMIC_SOURCE)
|
||||
|
||||
libspl_la_LIBADD = -lrt $(LIBTIRPC_LIBS)
|
||||
|
||||
EXTRA_DIST = $(USER_C)
|
||||
|
@ -1 +0,0 @@
|
||||
EXTRA_DIST = atomic.c
|
@ -1 +0,0 @@
|
||||
EXTRA_DIST = atomic.S
|
@ -1 +0,0 @@
|
||||
EXTRA_DIST = atomic.S
|
@ -6,11 +6,9 @@ USER_C = \
|
||||
thread_pool.c \
|
||||
thread_pool_impl.h
|
||||
|
||||
nodist_libtpool_la_SOURCES = $(USER_C)
|
||||
libtpool_la_SOURCES = $(USER_C)
|
||||
|
||||
libtpool_la_LIBADD = \
|
||||
$(top_builddir)/lib/libspl/libspl.la
|
||||
|
||||
libtpool_la_LDFLAGS = -pthread
|
||||
|
||||
EXTRA_DIST = $(USER_C)
|
||||
|
@ -7,14 +7,9 @@ AM_CFLAGS += $(FRAME_LARGER_THAN)
|
||||
|
||||
noinst_LTLIBRARIES = libunicode.la
|
||||
|
||||
USER_C =
|
||||
|
||||
KERNEL_C = \
|
||||
u8_textprep.c \
|
||||
uconv.c
|
||||
|
||||
nodist_libunicode_la_SOURCES = \
|
||||
$(USER_C) \
|
||||
$(KERNEL_C)
|
||||
|
||||
EXTRA_DIST = $(USER_C)
|
||||
|
@ -13,7 +13,7 @@ USER_C = \
|
||||
uu_pname.c \
|
||||
uu_string.c
|
||||
|
||||
nodist_libuutil_la_SOURCES = $(USER_C)
|
||||
libuutil_la_SOURCES = $(USER_C)
|
||||
|
||||
libuutil_la_LIBADD = \
|
||||
$(top_builddir)/lib/libavl/libavl.la \
|
||||
@ -24,5 +24,3 @@ libuutil_la_LDFLAGS = -pthread -version-info 3:0:0
|
||||
else
|
||||
libuutil_la_LDFLAGS = -pthread -version-info 1:1:0
|
||||
endif
|
||||
|
||||
EXTRA_DIST = $(USER_C)
|
||||
|
@ -63,8 +63,10 @@ KERNEL_C = \
|
||||
zpool_prop.c \
|
||||
zprop_common.c
|
||||
|
||||
dist_libzfs_la_SOURCES = \
|
||||
$(USER_C)
|
||||
|
||||
nodist_libzfs_la_SOURCES = \
|
||||
$(USER_C) \
|
||||
$(KERNEL_C)
|
||||
|
||||
libzfs_la_LIBADD = \
|
||||
@ -87,7 +89,5 @@ endif
|
||||
|
||||
libzfs_la_LIBADD += -lm $(LIBSSL)
|
||||
|
||||
EXTRA_DIST = $(libzfs_pc_DATA) $(USER_C)
|
||||
|
||||
# Licensing data
|
||||
EXTRA_DIST += THIRDPARTYLICENSE.openssl THIRDPARTYLICENSE.openssl.descrip
|
||||
EXTRA_DIST = THIRDPARTYLICENSE.openssl THIRDPARTYLICENSE.openssl.descrip
|
||||
|
@ -5,7 +5,7 @@ lib_LTLIBRARIES = libzfs_core.la
|
||||
USER_C = \
|
||||
libzfs_core.c
|
||||
|
||||
nodist_libzfs_core_la_SOURCES = $(USER_C)
|
||||
libzfs_core_la_SOURCES = $(USER_C)
|
||||
|
||||
libzfs_core_la_LIBADD = \
|
||||
$(top_builddir)/lib/libnvpair/libnvpair.la \
|
||||
@ -18,4 +18,3 @@ libzfs_core_la_LIBADD += -lutil -lgeom
|
||||
else
|
||||
libzfs_core_la_LDFLAGS = -version-info 1:0:0
|
||||
endif
|
||||
EXTRA_DIST = $(USER_C)
|
||||
|
@ -1,47 +0,0 @@
|
||||
/*
|
||||
* CDDL HEADER START
|
||||
*
|
||||
* The contents of this file are subject to the terms of the
|
||||
* Common Development and Distribution License (the "License").
|
||||
* You may not use this file except in compliance with the License.
|
||||
*
|
||||
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
|
||||
* or http://www.opensolaris.org/os/licensing.
|
||||
* See the License for the specific language governing permissions
|
||||
* and limitations under the License.
|
||||
*
|
||||
* When distributing Covered Code, include this CDDL HEADER in each
|
||||
* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
||||
* If applicable, add the following below this CDDL HEADER, with the
|
||||
* fields enclosed by brackets "[]" replaced with your own identifying
|
||||
* information: Portions Copyright [yyyy] [name of copyright owner]
|
||||
*
|
||||
* CDDL HEADER END
|
||||
*/
|
||||
|
||||
/*
|
||||
* Copyright (c) 2013 by Martin Matuska <mm@FreeBSD.org>. All rights reserved.
|
||||
*/
|
||||
|
||||
#ifndef _LIBZFS_CORE_COMPAT_H
|
||||
#define _LIBZFS_CORE_COMPAT_H
|
||||
|
||||
#include <libnvpair.h>
|
||||
#include <sys/param.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/fs/zfs.h>
|
||||
#include <sys/zfs_ioctl.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
int lzc_compat_pre(zfs_cmd_t *, zfs_ioc_t *, nvlist_t **);
|
||||
void lzc_compat_post(zfs_cmd_t *, const zfs_ioc_t);
|
||||
int lzc_compat_outnvl(zfs_cmd_t *, const zfs_ioc_t, nvlist_t **);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* _LIBZFS_CORE_COMPAT_H */
|
@ -189,8 +189,10 @@ LUA_C = \
|
||||
lvm.c \
|
||||
lzio.c
|
||||
|
||||
dist_libzpool_la_SOURCES = \
|
||||
$(USER_C)
|
||||
|
||||
nodist_libzpool_la_SOURCES = \
|
||||
$(USER_C) \
|
||||
$(KERNEL_C) \
|
||||
$(LUA_C)
|
||||
|
||||
@ -208,8 +210,6 @@ libzpool_la_LIBADD += $(ZLIB) -ldl
|
||||
libzpool_la_LDFLAGS = -pthread -version-info 2:0:0
|
||||
endif
|
||||
|
||||
EXTRA_DIST = $(USER_C)
|
||||
|
||||
if TARGET_CPU_POWERPC
|
||||
vdev_raidz_math_powerpc_altivec.$(OBJEXT): CFLAGS += -maltivec
|
||||
vdev_raidz_math_powerpc_altivec.l$(OBJEXT): CFLAGS += -maltivec
|
||||
|
@ -28,7 +28,7 @@ USER_C += \
|
||||
os/freebsd/zutil_compat.c
|
||||
endif
|
||||
|
||||
nodist_libzutil_la_SOURCES = $(USER_C)
|
||||
libzutil_la_SOURCES = $(USER_C)
|
||||
|
||||
libzutil_la_LIBADD = \
|
||||
$(top_builddir)/lib/libavl/libavl.la \
|
||||
@ -40,5 +40,3 @@ libzutil_la_LIBADD += \
|
||||
endif
|
||||
|
||||
libzutil_la_LIBADD += -lm $(LIBBLKID) $(LIBUDEV)
|
||||
|
||||
EXTRA_DIST = $(USER_C)
|
||||
|
@ -1,5 +1,2 @@
|
||||
dist_man_MANS = zhack.1 ztest.1 raidz_test.1 zvol_wait.1 arcstat.1
|
||||
EXTRA_DIST = cstyle.1
|
||||
|
||||
install-data-local:
|
||||
$(INSTALL) -d -m 0755 "$(DESTDIR)$(mandir)/man1"
|
||||
|
@ -4,6 +4,3 @@ dist_man_MANS = \
|
||||
spl-module-parameters.5 \
|
||||
zfs-module-parameters.5 \
|
||||
zfs-events.5
|
||||
|
||||
install-data-local:
|
||||
$(INSTALL) -d -m 0755 "$(DESTDIR)$(mandir)/man5"
|
||||
|
@ -97,8 +97,5 @@ $(nodist_man_MANS): %: %.in
|
||||
-e 's,@sysconfdir\@,$(sysconfdir),g' \
|
||||
$< >'$@'
|
||||
|
||||
install-data-local:
|
||||
$(INSTALL) -d -m 0755 "$(DESTDIR)$(mandir)/man8"
|
||||
|
||||
CLEANFILES = \
|
||||
$(nodist_man_MANS)
|
||||
|
@ -1 +1,3 @@
|
||||
SUBDIRS = runfiles test-runner zfs-tests
|
||||
|
||||
EXTRA_DIST = README.md
|
||||
|
@ -17,6 +17,4 @@ $(nodist_pkgdata_DATA): %: %.in
|
||||
-e 's,@sysconfdir\@,$(sysconfdir),g' \
|
||||
$< >'$@'
|
||||
|
||||
# Double-colon rules are allowed; there are multiple independent definitions.
|
||||
distclean-local::
|
||||
-$(RM) default.cfg
|
||||
CLEANFILES = default.cfg
|
||||
|
@ -13,4 +13,5 @@ dist_pkgdata_SCRIPTS = \
|
||||
zfs_clone_009_neg.ksh \
|
||||
zfs_clone_010_pos.ksh \
|
||||
zfs_clone_encrypted.ksh \
|
||||
zfs_clone_deeply_nested.ksh
|
||||
zfs_clone_deeply_nested.ksh \
|
||||
zfs_clone_rm_nested.ksh
|
||||
|
@ -10,6 +10,7 @@ dist_pkgdata_SCRIPTS = \
|
||||
zfs_send_006_pos.ksh \
|
||||
zfs_send_007_pos.ksh \
|
||||
zfs_send_encrypted.ksh \
|
||||
zfs_send_encrypted_unloaded.ksh \
|
||||
zfs_send_raw.ksh \
|
||||
zfs_send_sparse.ksh \
|
||||
zfs_send-b.ksh
|
||||
|
@ -4,6 +4,8 @@ dist_pkgdata_SCRIPTS = \
|
||||
inherit_001_pos.ksh
|
||||
|
||||
dist_pkgdata_DATA = \
|
||||
README.config \
|
||||
README.state \
|
||||
inherit.kshlib \
|
||||
config001.cfg \
|
||||
config002.cfg \
|
||||
|
@ -14,6 +14,4 @@ $(pkgpyzfs_SCRIPTS):%:%.in
|
||||
$< >'$@'
|
||||
-chmod 775 $@
|
||||
|
||||
# Double-colon rules are allowed; there are multiple independent definitions.
|
||||
distclean-local::
|
||||
-$(RM) $(pkgpyzfs_SCRIPTS)
|
||||
CLEANFILES = $(pkgpyzfs_SCRIPTS)
|
||||
|
@ -18,6 +18,7 @@ dist_pkgdata_SCRIPTS = \
|
||||
rsend_012_pos.ksh \
|
||||
rsend_013_pos.ksh \
|
||||
rsend_014_pos.ksh \
|
||||
rsend_016_neg.ksh \
|
||||
rsend_019_pos.ksh \
|
||||
rsend_020_pos.ksh \
|
||||
rsend_021_pos.ksh \
|
||||
|
@ -6,4 +6,5 @@ dist_pkgdata_DATA = \
|
||||
random_readwrite_fixed.fio \
|
||||
random_writes.fio \
|
||||
sequential_reads.fio \
|
||||
sequential_writes.fio
|
||||
sequential_writes.fio \
|
||||
sequential_readwrite.fio
|
||||
|
@ -16,6 +16,4 @@ $(udevrule_DATA):%:%.in
|
||||
-e 's,@sysconfdir\@,$(sysconfdir),g' \
|
||||
$< > '$@'
|
||||
|
||||
# Double-colon rules are allowed; there are multiple independent definitions.
|
||||
distclean-local::
|
||||
-$(RM) $(udevrule_DATA)
|
||||
CLEANFILES = $(udevrule_DATA)
|
||||
|
Loading…
Reference in New Issue
Block a user