mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-24 19:28:53 +03:00
autoconf: use include directives instead of recursing down lib
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:
+28
-39
@@ -1,44 +1,33 @@
|
||||
include $(top_srcdir)/config/Rules.am
|
||||
|
||||
VPATH = $(top_srcdir)/module/zstd
|
||||
|
||||
libzstd_la_CFLAGS = $(AM_CFLAGS) $(LIBRARY_CFLAGS)
|
||||
# -fno-tree-vectorize is set for gcc in zstd/common/compiler.h
|
||||
# Set it for other compilers, too.
|
||||
AM_CFLAGS += -fno-tree-vectorize
|
||||
# See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=54020
|
||||
AM_CFLAGS += -no-suppress
|
||||
libzstd_la_CFLAGS += -fno-tree-vectorize
|
||||
|
||||
noinst_LTLIBRARIES = libzstd.la
|
||||
noinst_LTLIBRARIES += libzstd.la
|
||||
CPPCHECKTARGETS += libzstd.la
|
||||
|
||||
KERNEL_C = lib/common/entropy_common.c \
|
||||
lib/common/error_private.c \
|
||||
lib/common/fse_decompress.c \
|
||||
lib/common/pool.c \
|
||||
lib/common/zstd_common.c \
|
||||
lib/compress/fse_compress.c \
|
||||
lib/compress/hist.c \
|
||||
lib/compress/huf_compress.c \
|
||||
lib/compress/zstd_compress_literals.c \
|
||||
lib/compress/zstd_compress_sequences.c \
|
||||
lib/compress/zstd_compress_superblock.c \
|
||||
lib/compress/zstd_compress.c \
|
||||
lib/compress/zstd_double_fast.c \
|
||||
lib/compress/zstd_fast.c \
|
||||
lib/compress/zstd_lazy.c \
|
||||
lib/compress/zstd_ldm.c \
|
||||
lib/compress/zstd_opt.c \
|
||||
lib/decompress/huf_decompress.c \
|
||||
lib/decompress/zstd_ddict.c \
|
||||
lib/decompress/zstd_decompress.c \
|
||||
lib/decompress/zstd_decompress_block.c \
|
||||
zfs_zstd.c
|
||||
nodist_libzstd_la_SOURCES = \
|
||||
module/zstd/lib/common/entropy_common.c \
|
||||
module/zstd/lib/common/error_private.c \
|
||||
module/zstd/lib/common/fse_decompress.c \
|
||||
module/zstd/lib/common/pool.c \
|
||||
module/zstd/lib/common/zstd_common.c \
|
||||
module/zstd/lib/compress/fse_compress.c \
|
||||
module/zstd/lib/compress/hist.c \
|
||||
module/zstd/lib/compress/huf_compress.c \
|
||||
module/zstd/lib/compress/zstd_compress_literals.c \
|
||||
module/zstd/lib/compress/zstd_compress_sequences.c \
|
||||
module/zstd/lib/compress/zstd_compress_superblock.c \
|
||||
module/zstd/lib/compress/zstd_compress.c \
|
||||
module/zstd/lib/compress/zstd_double_fast.c \
|
||||
module/zstd/lib/compress/zstd_fast.c \
|
||||
module/zstd/lib/compress/zstd_lazy.c \
|
||||
module/zstd/lib/compress/zstd_ldm.c \
|
||||
module/zstd/lib/compress/zstd_opt.c \
|
||||
module/zstd/lib/decompress/huf_decompress.c \
|
||||
module/zstd/lib/decompress/zstd_ddict.c \
|
||||
module/zstd/lib/decompress/zstd_decompress.c \
|
||||
module/zstd/lib/decompress/zstd_decompress_block.c \
|
||||
module/zstd/zfs_zstd.c
|
||||
|
||||
nodist_libzstd_la_SOURCES = $(KERNEL_C)
|
||||
|
||||
%.$(OBJEXT): CFLAGS += -fno-tree-vectorize -include $(top_srcdir)/module/zstd/include/zstd_compat_wrapper.h -Wp,-w
|
||||
%.l$(OBJEXT): CFLAGS += -fno-tree-vectorize -include $(top_srcdir)/module/zstd/include/zstd_compat_wrapper.h -Wp,-w
|
||||
|
||||
zfs_zstd.$(OBJEXT): CFLAGS += -include $(top_srcdir)/module/zstd/include/zstd_compat_wrapper.h
|
||||
zfs_zstd.l$(OBJEXT): CFLAGS += -include $(top_srcdir)/module/zstd/include/zstd_compat_wrapper.h
|
||||
|
||||
include $(top_srcdir)/config/CppCheck.am
|
||||
libzstd_la_CFLAGS += -include $(top_srcdir)/module/zstd/include/zstd_compat_wrapper.h -fno-tree-vectorize -Wp,-w $(AM_CFLAGS)
|
||||
|
||||
Reference in New Issue
Block a user