mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 02:27:36 +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:
наб
+187
-216
@@ -1,223 +1,196 @@
|
||||
include $(top_srcdir)/config/Rules.am
|
||||
libzpool_la_CFLAGS = $(AM_CFLAGS) $(KERNEL_CFLAGS) $(LIBRARY_CFLAGS)
|
||||
libzpool_la_CFLAGS += $(ZLIB_CFLAGS)
|
||||
|
||||
VPATH = \
|
||||
$(top_srcdir)/module/zfs \
|
||||
$(top_srcdir)/module/zcommon \
|
||||
$(top_srcdir)/module/lua \
|
||||
$(top_srcdir)/module/os/linux/zfs \
|
||||
$(top_srcdir)/lib/libzpool
|
||||
libzpool_la_CPPFLAGS = $(AM_CPPFLAGS) $(FORCEDEBUG_CPPFLAGS)
|
||||
libzpool_la_CPPFLAGS += -I$(srcdir)/include/os/@ac_system_l@/zfs
|
||||
libzpool_la_CPPFLAGS += -DLIB_ZPOOL_BUILD
|
||||
|
||||
if BUILD_FREEBSD
|
||||
DEFAULT_INCLUDES += -I$(top_srcdir)/include/os/freebsd/zfs
|
||||
endif
|
||||
if BUILD_LINUX
|
||||
DEFAULT_INCLUDES += -I$(top_srcdir)/include/os/linux/zfs
|
||||
endif
|
||||
|
||||
# Unconditionally enable debugging for libzpool
|
||||
AM_CPPFLAGS += -DDEBUG -UNDEBUG -DZFS_DEBUG
|
||||
|
||||
# Includes kernel code generate warnings for large stack frames
|
||||
AM_CFLAGS += $(FRAME_LARGER_THAN)
|
||||
|
||||
AM_CFLAGS += $(ZLIB_CFLAGS)
|
||||
|
||||
AM_CFLAGS += -DLIB_ZPOOL_BUILD
|
||||
|
||||
# See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=54020
|
||||
AM_CFLAGS += -no-suppress
|
||||
|
||||
lib_LTLIBRARIES = libzpool.la
|
||||
|
||||
USER_C = \
|
||||
kernel.c \
|
||||
taskq.c \
|
||||
util.c
|
||||
|
||||
KERNEL_C = \
|
||||
zfeature_common.c \
|
||||
zfs_comutil.c \
|
||||
zfs_deleg.c \
|
||||
zfs_fletcher.c \
|
||||
zfs_fletcher_aarch64_neon.c \
|
||||
zfs_fletcher_avx512.c \
|
||||
zfs_fletcher_intel.c \
|
||||
zfs_fletcher_sse.c \
|
||||
zfs_fletcher_superscalar.c \
|
||||
zfs_fletcher_superscalar4.c \
|
||||
zfs_namecheck.c \
|
||||
zfs_prop.c \
|
||||
zpool_prop.c \
|
||||
zprop_common.c \
|
||||
abd.c \
|
||||
abd_os.c \
|
||||
aggsum.c \
|
||||
arc.c \
|
||||
arc_os.c \
|
||||
blkptr.c \
|
||||
bplist.c \
|
||||
bpobj.c \
|
||||
bptree.c \
|
||||
bqueue.c \
|
||||
btree.c \
|
||||
cityhash.c \
|
||||
dbuf.c \
|
||||
dbuf_stats.c \
|
||||
ddt.c \
|
||||
ddt_zap.c \
|
||||
dmu.c \
|
||||
dmu_diff.c \
|
||||
dmu_object.c \
|
||||
dmu_objset.c \
|
||||
dmu_recv.c \
|
||||
dmu_redact.c \
|
||||
dmu_send.c \
|
||||
dmu_traverse.c \
|
||||
dmu_tx.c \
|
||||
dmu_zfetch.c \
|
||||
dnode.c \
|
||||
dnode_sync.c \
|
||||
dsl_bookmark.c \
|
||||
dsl_crypt.c \
|
||||
dsl_dataset.c \
|
||||
dsl_deadlist.c \
|
||||
dsl_deleg.c \
|
||||
dsl_destroy.c \
|
||||
dsl_dir.c \
|
||||
dsl_pool.c \
|
||||
dsl_prop.c \
|
||||
dsl_scan.c \
|
||||
dsl_synctask.c \
|
||||
dsl_userhold.c \
|
||||
edonr_zfs.c \
|
||||
fm.c \
|
||||
gzip.c \
|
||||
hkdf.c \
|
||||
lz4.c \
|
||||
lz4_zfs.c \
|
||||
lzjb.c \
|
||||
metaslab.c \
|
||||
mmp.c \
|
||||
multilist.c \
|
||||
objlist.c \
|
||||
pathname.c \
|
||||
range_tree.c \
|
||||
refcount.c \
|
||||
rrwlock.c \
|
||||
sa.c \
|
||||
sha256.c \
|
||||
skein_zfs.c \
|
||||
spa.c \
|
||||
spa_boot.c \
|
||||
spa_checkpoint.c \
|
||||
spa_config.c \
|
||||
spa_errlog.c \
|
||||
spa_history.c \
|
||||
spa_log_spacemap.c \
|
||||
spa_misc.c \
|
||||
spa_stats.c \
|
||||
space_map.c \
|
||||
space_reftree.c \
|
||||
trace.c \
|
||||
txg.c \
|
||||
uberblock.c \
|
||||
unique.c \
|
||||
vdev.c \
|
||||
vdev_cache.c \
|
||||
vdev_draid.c \
|
||||
vdev_draid_rand.c \
|
||||
vdev_file.c \
|
||||
vdev_indirect.c \
|
||||
vdev_indirect_births.c \
|
||||
vdev_indirect_mapping.c \
|
||||
vdev_initialize.c \
|
||||
vdev_label.c \
|
||||
vdev_mirror.c \
|
||||
vdev_missing.c \
|
||||
vdev_queue.c \
|
||||
vdev_raidz.c \
|
||||
vdev_raidz_math.c \
|
||||
vdev_raidz_math_aarch64_neon.c \
|
||||
vdev_raidz_math_aarch64_neonx2.c \
|
||||
vdev_raidz_math_avx2.c \
|
||||
vdev_raidz_math_avx512bw.c \
|
||||
vdev_raidz_math_avx512f.c \
|
||||
vdev_raidz_math_powerpc_altivec.c \
|
||||
vdev_raidz_math_scalar.c \
|
||||
vdev_raidz_math_sse2.c \
|
||||
vdev_raidz_math_ssse3.c \
|
||||
vdev_rebuild.c \
|
||||
vdev_removal.c \
|
||||
vdev_root.c \
|
||||
vdev_trim.c \
|
||||
zap.c \
|
||||
zap_leaf.c \
|
||||
zap_micro.c \
|
||||
zcp.c \
|
||||
zcp_get.c \
|
||||
zcp_global.c \
|
||||
zcp_iter.c \
|
||||
zcp_set.c \
|
||||
zcp_synctask.c \
|
||||
zfeature.c \
|
||||
zfs_byteswap.c \
|
||||
zfs_debug.c \
|
||||
zfs_fm.c \
|
||||
zfs_fuid.c \
|
||||
zfs_racct.c \
|
||||
zfs_sa.c \
|
||||
zfs_ratelimit.c \
|
||||
zfs_rlock.c \
|
||||
zfs_znode.c \
|
||||
zil.c \
|
||||
zio.c \
|
||||
zio_checksum.c \
|
||||
zio_compress.c \
|
||||
zio_crypt.c \
|
||||
zio_inject.c \
|
||||
zle.c \
|
||||
zrlock.c \
|
||||
zthr.c
|
||||
|
||||
LUA_C = \
|
||||
lapi.c \
|
||||
lauxlib.c \
|
||||
lbaselib.c \
|
||||
lcode.c \
|
||||
lcompat.c \
|
||||
lcorolib.c \
|
||||
lctype.c \
|
||||
ldebug.c \
|
||||
ldo.c \
|
||||
lfunc.c \
|
||||
lgc.c \
|
||||
llex.c \
|
||||
lmem.c \
|
||||
lobject.c \
|
||||
lopcodes.c \
|
||||
lparser.c \
|
||||
lstate.c \
|
||||
lstring.c \
|
||||
lstrlib.c \
|
||||
ltable.c \
|
||||
ltablib.c \
|
||||
ltm.c \
|
||||
lvm.c \
|
||||
lzio.c
|
||||
lib_LTLIBRARIES += libzpool.la
|
||||
CPPCHECKTARGETS += libzpool.la
|
||||
|
||||
dist_libzpool_la_SOURCES = \
|
||||
$(USER_C)
|
||||
%D%/kernel.c \
|
||||
%D%/taskq.c \
|
||||
%D%/util.c
|
||||
|
||||
nodist_libzpool_la_SOURCES = \
|
||||
$(KERNEL_C) \
|
||||
$(LUA_C)
|
||||
module/lua/lapi.c \
|
||||
module/lua/lauxlib.c \
|
||||
module/lua/lbaselib.c \
|
||||
module/lua/lcode.c \
|
||||
module/lua/lcompat.c \
|
||||
module/lua/lcorolib.c \
|
||||
module/lua/lctype.c \
|
||||
module/lua/ldebug.c \
|
||||
module/lua/ldo.c \
|
||||
module/lua/lfunc.c \
|
||||
module/lua/lgc.c \
|
||||
module/lua/llex.c \
|
||||
module/lua/lmem.c \
|
||||
module/lua/lobject.c \
|
||||
module/lua/lopcodes.c \
|
||||
module/lua/lparser.c \
|
||||
module/lua/lstate.c \
|
||||
module/lua/lstring.c \
|
||||
module/lua/lstrlib.c \
|
||||
module/lua/ltable.c \
|
||||
module/lua/ltablib.c \
|
||||
module/lua/ltm.c \
|
||||
module/lua/lvm.c \
|
||||
module/lua/lzio.c \
|
||||
\
|
||||
module/os/linux/zfs/abd_os.c \
|
||||
module/os/linux/zfs/arc_os.c \
|
||||
module/os/linux/zfs/trace.c \
|
||||
module/os/linux/zfs/vdev_file.c \
|
||||
module/os/linux/zfs/zfs_debug.c \
|
||||
module/os/linux/zfs/zfs_racct.c \
|
||||
module/os/linux/zfs/zfs_znode.c \
|
||||
module/os/linux/zfs/zio_crypt.c \
|
||||
\
|
||||
module/zcommon/cityhash.c \
|
||||
module/zcommon/zfeature_common.c \
|
||||
module/zcommon/zfs_comutil.c \
|
||||
module/zcommon/zfs_deleg.c \
|
||||
module/zcommon/zfs_fletcher.c \
|
||||
module/zcommon/zfs_fletcher_aarch64_neon.c \
|
||||
module/zcommon/zfs_fletcher_avx512.c \
|
||||
module/zcommon/zfs_fletcher_intel.c \
|
||||
module/zcommon/zfs_fletcher_sse.c \
|
||||
module/zcommon/zfs_fletcher_superscalar.c \
|
||||
module/zcommon/zfs_fletcher_superscalar4.c \
|
||||
module/zcommon/zfs_namecheck.c \
|
||||
module/zcommon/zfs_prop.c \
|
||||
module/zcommon/zpool_prop.c \
|
||||
module/zcommon/zprop_common.c \
|
||||
\
|
||||
module/zfs/abd.c \
|
||||
module/zfs/aggsum.c \
|
||||
module/zfs/arc.c \
|
||||
module/zfs/blkptr.c \
|
||||
module/zfs/bplist.c \
|
||||
module/zfs/bpobj.c \
|
||||
module/zfs/bptree.c \
|
||||
module/zfs/bqueue.c \
|
||||
module/zfs/btree.c \
|
||||
module/zfs/dbuf.c \
|
||||
module/zfs/dbuf_stats.c \
|
||||
module/zfs/ddt.c \
|
||||
module/zfs/ddt_zap.c \
|
||||
module/zfs/dmu.c \
|
||||
module/zfs/dmu_diff.c \
|
||||
module/zfs/dmu_object.c \
|
||||
module/zfs/dmu_objset.c \
|
||||
module/zfs/dmu_recv.c \
|
||||
module/zfs/dmu_redact.c \
|
||||
module/zfs/dmu_send.c \
|
||||
module/zfs/dmu_traverse.c \
|
||||
module/zfs/dmu_tx.c \
|
||||
module/zfs/dmu_zfetch.c \
|
||||
module/zfs/dnode.c \
|
||||
module/zfs/dnode_sync.c \
|
||||
module/zfs/dsl_bookmark.c \
|
||||
module/zfs/dsl_crypt.c \
|
||||
module/zfs/dsl_dataset.c \
|
||||
module/zfs/dsl_deadlist.c \
|
||||
module/zfs/dsl_deleg.c \
|
||||
module/zfs/dsl_destroy.c \
|
||||
module/zfs/dsl_dir.c \
|
||||
module/zfs/dsl_pool.c \
|
||||
module/zfs/dsl_prop.c \
|
||||
module/zfs/dsl_scan.c \
|
||||
module/zfs/dsl_synctask.c \
|
||||
module/zfs/dsl_userhold.c \
|
||||
module/zfs/edonr_zfs.c \
|
||||
module/zfs/fm.c \
|
||||
module/zfs/gzip.c \
|
||||
module/zfs/hkdf.c \
|
||||
module/zfs/lz4.c \
|
||||
module/zfs/lz4_zfs.c \
|
||||
module/zfs/lzjb.c \
|
||||
module/zfs/metaslab.c \
|
||||
module/zfs/mmp.c \
|
||||
module/zfs/multilist.c \
|
||||
module/zfs/objlist.c \
|
||||
module/zfs/pathname.c \
|
||||
module/zfs/range_tree.c \
|
||||
module/zfs/refcount.c \
|
||||
module/zfs/rrwlock.c \
|
||||
module/zfs/sa.c \
|
||||
module/zfs/sha256.c \
|
||||
module/zfs/skein_zfs.c \
|
||||
module/zfs/spa.c \
|
||||
module/zfs/spa_boot.c \
|
||||
module/zfs/spa_checkpoint.c \
|
||||
module/zfs/spa_config.c \
|
||||
module/zfs/spa_errlog.c \
|
||||
module/zfs/spa_history.c \
|
||||
module/zfs/spa_log_spacemap.c \
|
||||
module/zfs/spa_misc.c \
|
||||
module/zfs/spa_stats.c \
|
||||
module/zfs/space_map.c \
|
||||
module/zfs/space_reftree.c \
|
||||
module/zfs/txg.c \
|
||||
module/zfs/uberblock.c \
|
||||
module/zfs/unique.c \
|
||||
module/zfs/vdev.c \
|
||||
module/zfs/vdev_cache.c \
|
||||
module/zfs/vdev_draid.c \
|
||||
module/zfs/vdev_draid_rand.c \
|
||||
module/zfs/vdev_indirect.c \
|
||||
module/zfs/vdev_indirect_births.c \
|
||||
module/zfs/vdev_indirect_mapping.c \
|
||||
module/zfs/vdev_initialize.c \
|
||||
module/zfs/vdev_label.c \
|
||||
module/zfs/vdev_mirror.c \
|
||||
module/zfs/vdev_missing.c \
|
||||
module/zfs/vdev_queue.c \
|
||||
module/zfs/vdev_raidz.c \
|
||||
module/zfs/vdev_raidz_math.c \
|
||||
module/zfs/vdev_raidz_math_aarch64_neon.c \
|
||||
module/zfs/vdev_raidz_math_aarch64_neonx2.c \
|
||||
module/zfs/vdev_raidz_math_avx2.c \
|
||||
module/zfs/vdev_raidz_math_avx512bw.c \
|
||||
module/zfs/vdev_raidz_math_avx512f.c \
|
||||
module/zfs/vdev_raidz_math_powerpc_altivec.c \
|
||||
module/zfs/vdev_raidz_math_scalar.c \
|
||||
module/zfs/vdev_raidz_math_sse2.c \
|
||||
module/zfs/vdev_raidz_math_ssse3.c \
|
||||
module/zfs/vdev_rebuild.c \
|
||||
module/zfs/vdev_removal.c \
|
||||
module/zfs/vdev_root.c \
|
||||
module/zfs/vdev_trim.c \
|
||||
module/zfs/zap.c \
|
||||
module/zfs/zap_leaf.c \
|
||||
module/zfs/zap_micro.c \
|
||||
module/zfs/zcp.c \
|
||||
module/zfs/zcp_get.c \
|
||||
module/zfs/zcp_global.c \
|
||||
module/zfs/zcp_iter.c \
|
||||
module/zfs/zcp_set.c \
|
||||
module/zfs/zcp_synctask.c \
|
||||
module/zfs/zfeature.c \
|
||||
module/zfs/zfs_byteswap.c \
|
||||
module/zfs/zfs_fm.c \
|
||||
module/zfs/zfs_fuid.c \
|
||||
module/zfs/zfs_ratelimit.c \
|
||||
module/zfs/zfs_rlock.c \
|
||||
module/zfs/zfs_sa.c \
|
||||
module/zfs/zil.c \
|
||||
module/zfs/zio.c \
|
||||
module/zfs/zio_checksum.c \
|
||||
module/zfs/zio_compress.c \
|
||||
module/zfs/zio_inject.c \
|
||||
module/zfs/zle.c \
|
||||
module/zfs/zrlock.c \
|
||||
module/zfs/zthr.c
|
||||
|
||||
libzpool_la_LIBADD = \
|
||||
$(abs_top_builddir)/lib/libicp/libicp.la \
|
||||
$(abs_top_builddir)/lib/libunicode/libunicode.la \
|
||||
$(abs_top_builddir)/lib/libnvpair/libnvpair.la \
|
||||
$(abs_top_builddir)/lib/libzstd/libzstd.la \
|
||||
$(abs_top_builddir)/lib/libzutil/libzutil.la
|
||||
libicp.la \
|
||||
libunicode.la \
|
||||
libnvpair.la \
|
||||
libzstd.la \
|
||||
libzutil.la
|
||||
|
||||
libzpool_la_LIBADD += $(LIBCLOCK_GETTIME) $(ZLIB_LIBS) -ldl -lm
|
||||
|
||||
@@ -234,8 +207,6 @@ endif
|
||||
libzpool_la_LDFLAGS += -version-info 5:0:0
|
||||
|
||||
if TARGET_CPU_POWERPC
|
||||
vdev_raidz_math_powerpc_altivec.$(OBJEXT): CFLAGS += -maltivec
|
||||
vdev_raidz_math_powerpc_altivec.l$(OBJEXT): CFLAGS += -maltivec
|
||||
module/zfs/libzpool_la-vdev_raidz_math_powerpc_altivec.$(OBJEXT) : CFLAGS += -maltivec
|
||||
module/zfs/libzpool_la-vdev_raidz_math_powerpc_altivec.l$(OBJEXT): CFLAGS += -maltivec
|
||||
endif
|
||||
|
||||
include $(top_srcdir)/config/CppCheck.am
|
||||
|
||||
Reference in New Issue
Block a user