From 75138073208674967d0fb238f1b6210da224db36 Mon Sep 17 00:00:00 2001 From: Arvind Sankar Date: Mon, 22 Jun 2020 17:30:40 -0400 Subject: Drop unnecessary srcdir paths There's no need to specify the srcdir explicitly in _HEADERS and EXTRA_DIST. Reviewed-by: Ryan Moeller Reviewed-by: Brian Behlendorf Signed-off-by: Arvind Sankar Closes #10493 --- lib/libspl/include/Makefile.am | 36 +++++------ lib/libspl/include/ia32/sys/Makefile.am | 2 +- lib/libspl/include/os/freebsd/sys/Makefile.am | 18 +++--- lib/libspl/include/os/linux/sys/Makefile.am | 16 ++--- lib/libspl/include/rpc/Makefile.am | 2 +- lib/libspl/include/sys/Makefile.am | 86 +++++++++++++-------------- lib/libspl/include/sys/dktp/Makefile.am | 2 +- lib/libspl/include/util/Makefile.am | 2 +- 8 files changed, 82 insertions(+), 82 deletions(-) (limited to 'lib/libspl') diff --git a/lib/libspl/include/Makefile.am b/lib/libspl/include/Makefile.am index 2fd0c15ff..9ca08b2bc 100644 --- a/lib/libspl/include/Makefile.am +++ b/lib/libspl/include/Makefile.am @@ -2,21 +2,21 @@ SUBDIRS = ia32 rpc sys util os libspldir = $(includedir)/libspl libspl_HEADERS = \ - $(top_srcdir)/lib/libspl/include/assert.h \ - $(top_srcdir)/lib/libspl/include/atomic.h \ - $(top_srcdir)/lib/libspl/include/libdevinfo.h \ - $(top_srcdir)/lib/libspl/include/libgen.h \ - $(top_srcdir)/lib/libspl/include/libshare.h \ - $(top_srcdir)/lib/libspl/include/limits.h \ - $(top_srcdir)/lib/libspl/include/locale.h \ - $(top_srcdir)/lib/libspl/include/statcommon.h \ - $(top_srcdir)/lib/libspl/include/stdio.h \ - $(top_srcdir)/lib/libspl/include/stdlib.h \ - $(top_srcdir)/lib/libspl/include/string.h \ - $(top_srcdir)/lib/libspl/include/stropts.h \ - $(top_srcdir)/lib/libspl/include/thread.h \ - $(top_srcdir)/lib/libspl/include/tzfile.h \ - $(top_srcdir)/lib/libspl/include/ucred.h \ - $(top_srcdir)/lib/libspl/include/umem.h \ - $(top_srcdir)/lib/libspl/include/unistd.h \ - $(top_srcdir)/lib/libspl/include/zone.h + assert.h \ + atomic.h \ + libdevinfo.h \ + libgen.h \ + libshare.h \ + limits.h \ + locale.h \ + statcommon.h \ + stdio.h \ + stdlib.h \ + string.h \ + stropts.h \ + thread.h \ + tzfile.h \ + ucred.h \ + umem.h \ + unistd.h \ + zone.h diff --git a/lib/libspl/include/ia32/sys/Makefile.am b/lib/libspl/include/ia32/sys/Makefile.am index c8136ee2a..683288460 100644 --- a/lib/libspl/include/ia32/sys/Makefile.am +++ b/lib/libspl/include/ia32/sys/Makefile.am @@ -1,3 +1,3 @@ libspldir = $(includedir)/libspl/ia32/sys libspl_HEADERS = \ - $(top_srcdir)/lib/libspl/include/ia32/sys/asm_linkage.h + asm_linkage.h diff --git a/lib/libspl/include/os/freebsd/sys/Makefile.am b/lib/libspl/include/os/freebsd/sys/Makefile.am index 1f85b208e..6775522f5 100644 --- a/lib/libspl/include/os/freebsd/sys/Makefile.am +++ b/lib/libspl/include/os/freebsd/sys/Makefile.am @@ -1,11 +1,11 @@ libspldir = $(includedir)/libspl/sys libspl_HEADERS = \ - $(top_srcdir)/lib/libspl/include/os/freebsd/sys/byteorder.h \ - $(top_srcdir)/lib/libspl/include/os/freebsd/sys/file.h \ - $(top_srcdir)/lib/libspl/include/os/freebsd/sys/mnttab.h \ - $(top_srcdir)/lib/libspl/include/os/freebsd/sys/mount.h \ - $(top_srcdir)/lib/libspl/include/os/freebsd/sys/param.h \ - $(top_srcdir)/lib/libspl/include/os/freebsd/sys/stat.h \ - $(top_srcdir)/lib/libspl/include/os/freebsd/sys/sysmacros.h \ - $(top_srcdir)/lib/libspl/include/os/freebsd/sys/vfs.h \ - $(top_srcdir)/lib/libspl/include/os/freebsd/sys/zfs_context_os.h + byteorder.h \ + file.h \ + mnttab.h \ + mount.h \ + param.h \ + stat.h \ + sysmacros.h \ + vfs.h \ + zfs_context_os.h diff --git a/lib/libspl/include/os/linux/sys/Makefile.am b/lib/libspl/include/os/linux/sys/Makefile.am index b7019fc37..1ec07a76d 100644 --- a/lib/libspl/include/os/linux/sys/Makefile.am +++ b/lib/libspl/include/os/linux/sys/Makefile.am @@ -1,10 +1,10 @@ libspldir = $(includedir)/libspl/sys libspl_HEADERS = \ - $(top_srcdir)/lib/libspl/include/os/linux/sys/byteorder.h \ - $(top_srcdir)/lib/libspl/include/os/linux/sys/errno.h \ - $(top_srcdir)/lib/libspl/include/os/linux/sys/mnttab.h \ - $(top_srcdir)/lib/libspl/include/os/linux/sys/mount.h \ - $(top_srcdir)/lib/libspl/include/os/linux/sys/param.h \ - $(top_srcdir)/lib/libspl/include/os/linux/sys/stat.h \ - $(top_srcdir)/lib/libspl/include/os/linux/sys/sysmacros.h \ - $(top_srcdir)/lib/libspl/include/os/linux/sys/zfs_context_os.h + byteorder.h \ + errno.h \ + mnttab.h \ + mount.h \ + param.h \ + stat.h \ + sysmacros.h \ + zfs_context_os.h diff --git a/lib/libspl/include/rpc/Makefile.am b/lib/libspl/include/rpc/Makefile.am index 78ee5a29e..7fe1d7fea 100644 --- a/lib/libspl/include/rpc/Makefile.am +++ b/lib/libspl/include/rpc/Makefile.am @@ -1,3 +1,3 @@ libspldir = $(includedir)/libspl/rpc libspl_HEADERS = \ - $(top_srcdir)/lib/libspl/include/rpc/xdr.h + xdr.h diff --git a/lib/libspl/include/sys/Makefile.am b/lib/libspl/include/sys/Makefile.am index 5125b8ac3..53a36f6bf 100644 --- a/lib/libspl/include/sys/Makefile.am +++ b/lib/libspl/include/sys/Makefile.am @@ -2,46 +2,46 @@ SUBDIRS = dktp libspldir = $(includedir)/libspl/sys libspl_HEADERS = \ - $(top_srcdir)/lib/libspl/include/sys/acl.h \ - $(top_srcdir)/lib/libspl/include/sys/acl_impl.h \ - $(top_srcdir)/lib/libspl/include/sys/callb.h \ - $(top_srcdir)/lib/libspl/include/sys/cmn_err.h \ - $(top_srcdir)/lib/libspl/include/sys/cred.h \ - $(top_srcdir)/lib/libspl/include/sys/debug.h \ - $(top_srcdir)/lib/libspl/include/sys/dkio.h \ - $(top_srcdir)/lib/libspl/include/sys/dklabel.h \ - $(top_srcdir)/lib/libspl/include/sys/feature_tests.h \ - $(top_srcdir)/lib/libspl/include/sys/int_limits.h \ - $(top_srcdir)/lib/libspl/include/sys/int_types.h \ - $(top_srcdir)/lib/libspl/include/sys/inttypes.h \ - $(top_srcdir)/lib/libspl/include/sys/isa_defs.h \ - $(top_srcdir)/lib/libspl/include/sys/kmem.h \ - $(top_srcdir)/lib/libspl/include/sys/kstat.h \ - $(top_srcdir)/lib/libspl/include/sys/list.h \ - $(top_srcdir)/lib/libspl/include/sys/list_impl.h \ - $(top_srcdir)/lib/libspl/include/sys/mhd.h \ - $(top_srcdir)/lib/libspl/include/sys/mkdev.h \ - $(top_srcdir)/lib/libspl/include/sys/policy.h \ - $(top_srcdir)/lib/libspl/include/sys/poll.h \ - $(top_srcdir)/lib/libspl/include/sys/priv.h \ - $(top_srcdir)/lib/libspl/include/sys/processor.h \ - $(top_srcdir)/lib/libspl/include/sys/sha2.h \ - $(top_srcdir)/lib/libspl/include/sys/simd.h \ - $(top_srcdir)/lib/libspl/include/sys/stack.h \ - $(top_srcdir)/lib/libspl/include/sys/stdtypes.h \ - $(top_srcdir)/lib/libspl/include/sys/strings.h \ - $(top_srcdir)/lib/libspl/include/sys/stropts.h \ - $(top_srcdir)/lib/libspl/include/sys/sunddi.h \ - $(top_srcdir)/lib/libspl/include/sys/systeminfo.h \ - $(top_srcdir)/lib/libspl/include/sys/time.h \ - $(top_srcdir)/lib/libspl/include/sys/trace_spl.h \ - $(top_srcdir)/lib/libspl/include/sys/trace_zfs.h \ - $(top_srcdir)/lib/libspl/include/sys/types32.h \ - $(top_srcdir)/lib/libspl/include/sys/types.h \ - $(top_srcdir)/lib/libspl/include/sys/tzfile.h \ - $(top_srcdir)/lib/libspl/include/sys/uio.h \ - $(top_srcdir)/lib/libspl/include/sys/va_list.h \ - $(top_srcdir)/lib/libspl/include/sys/varargs.h \ - $(top_srcdir)/lib/libspl/include/sys/vnode.h \ - $(top_srcdir)/lib/libspl/include/sys/vtoc.h \ - $(top_srcdir)/lib/libspl/include/sys/zone.h + acl.h \ + acl_impl.h \ + callb.h \ + cmn_err.h \ + cred.h \ + debug.h \ + dkio.h \ + dklabel.h \ + feature_tests.h \ + int_limits.h \ + int_types.h \ + inttypes.h \ + isa_defs.h \ + kmem.h \ + kstat.h \ + list.h \ + list_impl.h \ + mhd.h \ + mkdev.h \ + policy.h \ + poll.h \ + priv.h \ + processor.h \ + sha2.h \ + simd.h \ + stack.h \ + stdtypes.h \ + strings.h \ + stropts.h \ + sunddi.h \ + systeminfo.h \ + time.h \ + trace_spl.h \ + trace_zfs.h \ + types32.h \ + types.h \ + tzfile.h \ + uio.h \ + va_list.h \ + varargs.h \ + vnode.h \ + vtoc.h \ + zone.h diff --git a/lib/libspl/include/sys/dktp/Makefile.am b/lib/libspl/include/sys/dktp/Makefile.am index 9887675c4..4ad3695d8 100644 --- a/lib/libspl/include/sys/dktp/Makefile.am +++ b/lib/libspl/include/sys/dktp/Makefile.am @@ -1,4 +1,4 @@ libspldir = $(includedir)/libspl/sys/dktp libspl_HEADERS = \ - $(top_srcdir)/lib/libspl/include/sys/dktp/fdisk.h + fdisk.h diff --git a/lib/libspl/include/util/Makefile.am b/lib/libspl/include/util/Makefile.am index 060e143a8..ab553bc80 100644 --- a/lib/libspl/include/util/Makefile.am +++ b/lib/libspl/include/util/Makefile.am @@ -1,3 +1,3 @@ libspldir = $(includedir)/libspl libspl_HEADERS = \ - $(top_srcdir)/lib/libspl/include/util/sscanf.h + sscanf.h -- cgit v1.2.3