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

autoconf: use include directives instead of recursing down lib

Browse Source 
As a bonus, this also adds zfs-mount-generator (previously undescended
down) and libzstd (not included) to CppCheck

As a bonus bonus, abigail rules work out-of-tree, too

Against current trunk:
  $ diff -U0 ./destdir.listing ~/store/code/zfs/destdir.listing
  -destdir/usr/local/include/libspl/sscanf.h

  $ diff --color -U0 ./zfs-2.1.99.tar.gz.listing ../oot/zfs-2.1.99.tar.gz.listing | grep -v @@ | grep -v /Makefile
  -zfs-2.1.99/config/Abigail.am
  -zfs-2.1.99/lib/libspl/include/util/
  -zfs-2.1.99/lib/libspl/include/util/sscanf.h

  $ diff --color -U0 ./zfs-2.1.99.tar.gz.listing ../oot/zfs-2.1.99.tar.gz.listing | grep -v @@ | grep /Makefile
  -zfs-2.1.99/lib/libavl/Makefile.in
  -zfs-2.1.99/lib/libefi/Makefile.in
  -zfs-2.1.99/lib/libicp/Makefile.in
  -zfs-2.1.99/lib/libnvpair/Makefile.in
  -zfs-2.1.99/lib/libshare/Makefile.in
  -zfs-2.1.99/lib/libspl/include/Makefile.in
  -zfs-2.1.99/lib/libspl/include/os/freebsd/Makefile.am
  -zfs-2.1.99/lib/libspl/include/os/freebsd/Makefile.in
  -zfs-2.1.99/lib/libspl/include/os/freebsd/sys/Makefile.am
  -zfs-2.1.99/lib/libspl/include/os/freebsd/sys/Makefile.in
  -zfs-2.1.99/lib/libspl/include/os/linux/Makefile.am
  -zfs-2.1.99/lib/libspl/include/os/linux/Makefile.in
  -zfs-2.1.99/lib/libspl/include/os/linux/sys/Makefile.am
  -zfs-2.1.99/lib/libspl/include/os/linux/sys/Makefile.in
  -zfs-2.1.99/lib/libspl/include/os/Makefile.am
  -zfs-2.1.99/lib/libspl/include/os/Makefile.in
  -zfs-2.1.99/lib/libspl/include/rpc/Makefile.am
  -zfs-2.1.99/lib/libspl/include/rpc/Makefile.in
  -zfs-2.1.99/lib/libspl/include/sys/dktp/Makefile.am
  -zfs-2.1.99/lib/libspl/include/sys/dktp/Makefile.in
  -zfs-2.1.99/lib/libspl/include/sys/Makefile.am
  -zfs-2.1.99/lib/libspl/include/sys/Makefile.in
  -zfs-2.1.99/lib/libspl/include/util/Makefile.am
  -zfs-2.1.99/lib/libspl/include/util/Makefile.in
  -zfs-2.1.99/lib/libspl/Makefile.in
  -zfs-2.1.99/lib/libtpool/Makefile.in
  -zfs-2.1.99/lib/libunicode/Makefile.in
  -zfs-2.1.99/lib/libuutil/Makefile.in
  -zfs-2.1.99/lib/libzfsbootenv/Makefile.in
  -zfs-2.1.99/lib/libzfs_core/Makefile.in
  -zfs-2.1.99/lib/libzfs/Makefile.in
  -zfs-2.1.99/lib/libzpool/Makefile.in
  -zfs-2.1.99/lib/libzstd/Makefile.in
  -zfs-2.1.99/lib/libzutil/Makefile.in
  -zfs-2.1.99/lib/Makefile.in

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13316
This commit is contained in:
наб
2022-04-08 01:07:08 +02:00
committed by Brian Behlendorf
parent 6fc34371e1
commit c8970f52ed
58 changed files with 830 additions and 1038 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/libspl/Makefile.am
+29 -34
View File
@@ -1,50 +1,45 @@
include $(top_srcdir)/config/Rules.am
include $(srcdir)/%D%/include/Makefile.am
SUBDIRS = include
libspl_assert_la_CFLAGS = $(AM_CFLAGS) $(LIBRARY_CFLAGS)
libspl_la_CFLAGS = $(libspl_assert_la_CFLAGS)
# See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=54020
AM_CFLAGS += -no-suppress
noinst_LTLIBRARIES = libspl_assert.la libspl.la
noinst_LTLIBRARIES += libspl_assert.la libspl.la
CPPCHECKTARGETS += libspl_assert.la libspl.la
libspl_assert_la_SOURCES = \
assert.c
%D%/assert.c
USER_C = \
libspl_impl.h \
atomic.c \
getexecname.c \
list.c \
mkdirp.c \
page.c \
strlcat.c \
strlcpy.c \
timestamp.c \
include/sys/list.h \
include/sys/list_impl.h
libspl_la_SOURCES = \
%D%/libspl_impl.h \
%D%/atomic.c \
%D%/getexecname.c \
%D%/list.c \
%D%/mkdirp.c \
%D%/page.c \
%D%/strlcat.c \
%D%/strlcpy.c \
%D%/timestamp.c \
%D%/include/sys/list.h \
%D%/include/sys/list_impl.h
if BUILD_LINUX
USER_C += \
os/linux/getexecname.c \
os/linux/gethostid.c \
os/linux/getmntany.c \
os/linux/zone.c
libspl_la_SOURCES += \
%D%/os/linux/getexecname.c \
%D%/os/linux/gethostid.c \
%D%/os/linux/getmntany.c \
%D%/os/linux/zone.c
endif
if BUILD_FREEBSD
USER_C += \
os/freebsd/getexecname.c \
os/freebsd/gethostid.c \
os/freebsd/getmntany.c \
os/freebsd/mnttab.c \
os/freebsd/zone.c
libspl_la_SOURCES += \
%D%/os/freebsd/getexecname.c \
%D%/os/freebsd/gethostid.c \
%D%/os/freebsd/getmntany.c \
%D%/os/freebsd/mnttab.c \
%D%/os/freebsd/zone.c
endif
libspl_la_SOURCES = $(USER_C)
libspl_la_LIBADD = \
libspl_assert.la
libspl_la_LIBADD += $(LIBATOMIC_LIBS) $(LIBCLOCK_GETTIME)
include $(top_srcdir)/config/CppCheck.am
lib/libspl/include/Makefile.am
+106 -20
View File
@@ -1,22 +1,108 @@
SUBDIRS = rpc sys os
libspldir = $(includedir)/libspl
libspl_HEADERS = \
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
%D%/assert.h \
%D%/atomic.h \
%D%/libdevinfo.h \
%D%/libgen.h \
%D%/libshare.h \
%D%/limits.h \
%D%/locale.h \
%D%/statcommon.h \
%D%/stdio.h \
%D%/stdlib.h \
%D%/string.h \
%D%/stropts.h \
%D%/thread.h \
%D%/tzfile.h \
%D%/ucred.h \
%D%/umem.h \
%D%/unistd.h \
%D%/zone.h
if BUILD_FREEBSD
libspl_HEADERS += \
%D%/os/freebsd/fcntl.h
endif
libspl_rpcdir = $(libspldir)/rpc
libspl_rpc_HEADERS = \
%D%/rpc/xdr.h
libspl_sysdir = $(libspldir)/sys
libspl_sys_HEADERS = \
%D%/sys/acl.h \
%D%/sys/acl_impl.h \
%D%/sys/callb.h \
%D%/sys/cmn_err.h \
%D%/sys/cred.h \
%D%/sys/debug.h \
%D%/sys/dkio.h \
%D%/sys/dklabel.h \
%D%/sys/feature_tests.h \
%D%/sys/int_limits.h \
%D%/sys/int_types.h \
%D%/sys/inttypes.h \
%D%/sys/isa_defs.h \
%D%/sys/kmem.h \
%D%/sys/kstat.h \
%D%/sys/list.h \
%D%/sys/list_impl.h \
%D%/sys/mhd.h \
%D%/sys/mkdev.h \
%D%/sys/policy.h \
%D%/sys/poll.h \
%D%/sys/priv.h \
%D%/sys/processor.h \
%D%/sys/sha2.h \
%D%/sys/simd.h \
%D%/sys/stack.h \
%D%/sys/stdtypes.h \
%D%/sys/string.h \
%D%/sys/stropts.h \
%D%/sys/sunddi.h \
%D%/sys/systeminfo.h \
%D%/sys/time.h \
%D%/sys/trace_spl.h \
%D%/sys/trace_zfs.h \
%D%/sys/types.h \
%D%/sys/types32.h \
%D%/sys/tzfile.h \
%D%/sys/uio.h \
%D%/sys/va_list.h \
%D%/sys/varargs.h \
%D%/sys/vnode.h \
%D%/sys/wmsum.h \
%D%/sys/zone.h
if BUILD_LINUX
libspl_sys_HEADERS += \
%D%/os/linux/sys/byteorder.h \
%D%/os/linux/sys/errno.h \
%D%/os/linux/sys/mnttab.h \
%D%/os/linux/sys/mount.h \
%D%/os/linux/sys/param.h \
%D%/os/linux/sys/stat.h \
%D%/os/linux/sys/sysmacros.h \
%D%/os/linux/sys/zfs_context_os.h
endif
if BUILD_FREEBSD
libspl_sys_HEADERS += \
%D%/os/freebsd/sys/byteorder.h \
%D%/os/freebsd/sys/fcntl.h \
%D%/os/freebsd/sys/file.h \
%D%/os/freebsd/sys/mnttab.h \
%D%/os/freebsd/sys/mount.h \
%D%/os/freebsd/sys/param.h \
%D%/os/freebsd/sys/stat.h \
%D%/os/freebsd/sys/sysmacros.h \
%D%/os/freebsd/sys/vfs.h \
%D%/os/freebsd/sys/zfs_context_os.h
endif
libspl_sys_dktpdir = $(libspl_sysdir)/dktp
libspl_sys_dktp_HEADERS = \
%D%/sys/dktp/fdisk.h
lib/libspl/include/os/Makefile.am
-7
View File
@@ -1,7 +0,0 @@
if BUILD_FREEBSD
SUBDIRS = freebsd
endif
if BUILD_LINUX
SUBDIRS = linux
endif
lib/libspl/include/os/freebsd/Makefile.am
-5
View File
@@ -1,5 +0,0 @@
SUBDIRS = sys
libspldir = $(includedir)/libspl
libspl_HEADERS = \
fcntl.h
lib/libspl/include/os/freebsd/sys/Makefile.am
-12
View File
@@ -1,12 +0,0 @@
libspldir = $(includedir)/libspl/sys
libspl_HEADERS = \
byteorder.h \
fcntl.h \
file.h \
mnttab.h \
mount.h \
param.h \
stat.h \
sysmacros.h \
vfs.h \
zfs_context_os.h
lib/libspl/include/os/linux/Makefile.am
-1
View File
@@ -1 +0,0 @@
SUBDIRS = sys
lib/libspl/include/os/linux/sys/Makefile.am
-10
View File
@@ -1,10 +0,0 @@
libspldir = $(includedir)/libspl/sys
libspl_HEADERS = \
byteorder.h \
errno.h \
mnttab.h \
mount.h \
param.h \
stat.h \
sysmacros.h \
zfs_context_os.h
lib/libspl/include/rpc/Makefile.am
-3
View File
@@ -1,3 +0,0 @@
libspldir = $(includedir)/libspl/rpc
libspl_HEADERS = \
xdr.h
lib/libspl/include/sys/Makefile.am
-47
View File
@@ -1,47 +0,0 @@
SUBDIRS = dktp
libspldir = $(includedir)/libspl/sys
libspl_HEADERS = \
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 \
string.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 \
wmsum.h \
zone.h
lib/libspl/include/sys/dktp/Makefile.am
-4
View File
@@ -1,4 +0,0 @@
libspldir = $(includedir)/libspl/sys/dktp
libspl_HEADERS = \
fdisk.h