c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-23 19:04:45 +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
cmd/Makefile.am
+3 -7
View File
@@ -1,10 +1,12 @@
PHONY =
include $(top_srcdir)/config/Shellcheck.am
include $(top_srcdir)/config/CppCheck.am
SUBDIRS = zfs zpool zdb zhack zinject zstream ztest
SUBDIRS += fsck_zfs vdev_id raidz_test zfs_ids_to_path
SUBDIRS += zpool_influxdb
CPPCHECKDIRS = zfs zpool zdb zhack zinject zstream ztest
CPPCHECKDIRS += zfs zpool zdb zhack zinject zstream ztest
CPPCHECKDIRS += raidz_test zfs_ids_to_path zpool_influxdb
# TODO: #12084: SHELLCHECKDIRS += vdev_id
@@ -19,9 +21,3 @@ SUBDIRS += mount_zfs zed zgenhostid zvol_id zvol_wait
CPPCHECKDIRS += mount_zfs zed zgenhostid zvol_id
SHELLCHECKDIRS += zed
endif
PHONY = cppcheck
cppcheck: $(CPPCHECKDIRS)
set -e ; for dir in $(CPPCHECKDIRS) ; do \
$(MAKE) -C $$dir cppcheck ; \
done
cmd/mount_zfs/Makefile.am
+4 -3
View File
@@ -13,10 +13,11 @@ mount_zfs_SOURCES = \
mount_zfs.c
mount_zfs_LDADD = \
$(abs_top_builddir)/lib/libzfs/libzfs.la \
$(abs_top_builddir)/lib/libzfs_core/libzfs_core.la \
$(abs_top_builddir)/lib/libnvpair/libnvpair.la
$(abs_top_builddir)/libzfs.la \
$(abs_top_builddir)/libzfs_core.la \
$(abs_top_builddir)/libnvpair.la
mount_zfs_LDADD += $(LTLIBINTL)
include $(top_srcdir)/config/CppCheck.am
CPPCHECKTARGETS += mount.zfs
cmd/raidz_test/Makefile.am
+5 -7
View File
@@ -1,10 +1,7 @@
include $(top_srcdir)/config/Rules.am
# Includes kernel code, generate warnings for large stack frames
AM_CFLAGS += $(FRAME_LARGER_THAN)
# Unconditionally enable ASSERTs
AM_CPPFLAGS += -DDEBUG -UNDEBUG -DZFS_DEBUG
AM_CFLAGS += $(KERNEL_CFLAGS)
AM_CPPFLAGS += $(FORCEDEBUG_CPPFLAGS)
bin_PROGRAMS = raidz_test
@@ -14,9 +11,10 @@ raidz_test_SOURCES = \
raidz_bench.c
raidz_test_LDADD = \
$(abs_top_builddir)/lib/libzpool/libzpool.la \
$(abs_top_builddir)/lib/libzfs_core/libzfs_core.la
$(abs_top_builddir)/libzpool.la \
$(abs_top_builddir)/libzfs_core.la
raidz_test_LDADD += -lm
include $(top_srcdir)/config/CppCheck.am
CPPCHECKTARGETS += raidz_test
cmd/zdb/Makefile.am
+5 -5
View File
@@ -1,7 +1,6 @@
include $(top_srcdir)/config/Rules.am
# Unconditionally enable debugging for zdb
AM_CPPFLAGS += -DDEBUG -UNDEBUG -DZFS_DEBUG
AM_CPPFLAGS += $(FORCEDEBUG_CPPFLAGS)
sbin_PROGRAMS = zdb
@@ -11,8 +10,9 @@ zdb_SOURCES = \
zdb.h
zdb_LDADD = \
$(abs_top_builddir)/lib/libzpool/libzpool.la \
$(abs_top_builddir)/lib/libzfs_core/libzfs_core.la \
$(abs_top_builddir)/lib/libnvpair/libnvpair.la
$(abs_top_builddir)/libzpool.la \
$(abs_top_builddir)/libzfs_core.la \
$(abs_top_builddir)/libnvpair.la
include $(top_srcdir)/config/CppCheck.am
CPPCHECKTARGETS += zdb
cmd/zed/Makefile.am
+5 -4
View File
@@ -40,10 +40,10 @@ FMA_SRC = \
zed_SOURCES = $(ZED_SRC) $(FMA_SRC)
zed_LDADD = \
$(abs_top_builddir)/lib/libzfs/libzfs.la \
$(abs_top_builddir)/lib/libzfs_core/libzfs_core.la \
$(abs_top_builddir)/lib/libnvpair/libnvpair.la \
$(abs_top_builddir)/lib/libuutil/libuutil.la
$(abs_top_builddir)/libzfs.la \
$(abs_top_builddir)/libzfs_core.la \
$(abs_top_builddir)/libnvpair.la \
$(abs_top_builddir)/libuutil.la
zed_LDADD += -lrt $(LIBATOMIC_LIBS) $(LIBUDEV_LIBS) $(LIBUUID_LIBS)
zed_LDFLAGS = -pthread
@@ -51,3 +51,4 @@ zed_LDFLAGS = -pthread
EXTRA_DIST = agents/README.md
include $(top_srcdir)/config/CppCheck.am
CPPCHECKTARGETS += zed
cmd/zfs/Makefile.am
+5 -4
View File
@@ -11,10 +11,10 @@ zfs_SOURCES = \
zfs_projectutil.h
zfs_LDADD = \
$(abs_top_builddir)/lib/libzfs/libzfs.la \
$(abs_top_builddir)/lib/libzfs_core/libzfs_core.la \
$(abs_top_builddir)/lib/libnvpair/libnvpair.la \
$(abs_top_builddir)/lib/libuutil/libuutil.la
$(abs_top_builddir)/libzfs.la \
$(abs_top_builddir)/libzfs_core.la \
$(abs_top_builddir)/libnvpair.la \
$(abs_top_builddir)/libuutil.la
zfs_LDADD += $(LTLIBINTL)
@@ -23,3 +23,4 @@ zfs_LDADD += -lgeom -ljail
endif
include $(top_srcdir)/config/CppCheck.am
CPPCHECKTARGETS += zfs
cmd/zfs_ids_to_path/Makefile.am
+2 -1
View File
@@ -6,6 +6,7 @@ zfs_ids_to_path_SOURCES = \
zfs_ids_to_path.c
zfs_ids_to_path_LDADD = \
$(abs_top_builddir)/lib/libzfs/libzfs.la
$(abs_top_builddir)/libzfs.la
include $(top_srcdir)/config/CppCheck.am
CPPCHECKTARGETS += zfs_ids_to_path
cmd/zgenhostid/Makefile.am
+1
View File
@@ -5,3 +5,4 @@ sbin_PROGRAMS = zgenhostid
zgenhostid_SOURCES = zgenhostid.c
include $(top_srcdir)/config/CppCheck.am
CPPCHECKTARGETS += zgenhostid
cmd/zhack/Makefile.am
+5 -5
View File
@@ -1,7 +1,6 @@
include $(top_srcdir)/config/Rules.am
# Unconditionally enable debugging for zhack
AM_CPPFLAGS += -DDEBUG -UNDEBUG -DZFS_DEBUG
AM_CPPFLAGS += $(FORCEDEBUG_CPPFLAGS)
sbin_PROGRAMS = zhack
@@ -9,8 +8,9 @@ zhack_SOURCES = \
zhack.c
zhack_LDADD = \
$(abs_top_builddir)/lib/libzpool/libzpool.la \
$(abs_top_builddir)/lib/libzfs_core/libzfs_core.la \
$(abs_top_builddir)/lib/libnvpair/libnvpair.la
$(abs_top_builddir)/libzpool.la \
$(abs_top_builddir)/libzfs_core.la \
$(abs_top_builddir)/libnvpair.la
include $(top_srcdir)/config/CppCheck.am
CPPCHECKTARGETS += zhack
cmd/zinject/Makefile.am
+4 -3
View File
@@ -8,8 +8,9 @@ zinject_SOURCES = \
zinject.h
zinject_LDADD = \
$(abs_top_builddir)/lib/libzfs/libzfs.la \
$(abs_top_builddir)/lib/libzfs_core/libzfs_core.la \
$(abs_top_builddir)/lib/libnvpair/libnvpair.la
$(abs_top_builddir)/libzfs.la \
$(abs_top_builddir)/libzfs_core.la \
$(abs_top_builddir)/libnvpair.la
include $(top_srcdir)/config/CppCheck.am
CPPCHECKTARGETS += zinject
cmd/zpool/Makefile.am
+7 -6
View File
@@ -3,7 +3,7 @@ include $(top_srcdir)/config/Shellcheck.am
AM_CFLAGS += $(LIBBLKID_CFLAGS) $(LIBUUID_CFLAGS)
DEFAULT_INCLUDES += -I$(srcdir)
AM_CPPFLAGS += -I$(srcdir)
sbin_PROGRAMS = zpool
@@ -24,11 +24,11 @@ zpool_SOURCES += os/linux/zpool_vdev_os.c
endif
zpool_LDADD = \
$(abs_top_builddir)/lib/libzfs/libzfs.la \
$(abs_top_builddir)/lib/libzfs_core/libzfs_core.la \
$(abs_top_builddir)/lib/libnvpair/libnvpair.la \
$(abs_top_builddir)/lib/libuutil/libuutil.la \
$(abs_top_builddir)/lib/libzutil/libzutil.la
$(abs_top_builddir)/libzfs.la \
$(abs_top_builddir)/libzfs_core.la \
$(abs_top_builddir)/libnvpair.la \
$(abs_top_builddir)/libuutil.la \
$(abs_top_builddir)/libzutil.la
zpool_LDADD += $(LTLIBINTL)
@@ -38,6 +38,7 @@ endif
zpool_LDADD += -lm $(LIBBLKID_LIBS) $(LIBUUID_LIBS)
include $(top_srcdir)/config/CppCheck.am
CPPCHECKTARGETS += zpool
zpoolconfdir = $(sysconfdir)/zfs/zpool.d
zpoolexecdir = $(zfsexecdir)/zpool.d
cmd/zpool_influxdb/Makefile.am
+4 -3
View File
@@ -6,8 +6,9 @@ zpool_influxdb_SOURCES = \
zpool_influxdb.c
zpool_influxdb_LDADD = \
$(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libzfs/libzfs.la
$(top_builddir)/libspl.la \
$(top_builddir)/libnvpair.la \
$(top_builddir)/libzfs.la
include $(top_srcdir)/config/CppCheck.am
CPPCHECKTARGETS += zpool_influxdb
cmd/zstream/Makefile.am
+4 -3
View File
@@ -10,11 +10,12 @@ zstream_SOURCES = \
zstream_token.c
zstream_LDADD = \
$(abs_top_builddir)/lib/libzfs/libzfs.la \
$(abs_top_builddir)/lib/libzfs_core/libzfs_core.la \
$(abs_top_builddir)/lib/libnvpair/libnvpair.la
$(abs_top_builddir)/libzfs.la \
$(abs_top_builddir)/libzfs_core.la \
$(abs_top_builddir)/libnvpair.la
include $(top_srcdir)/config/CppCheck.am
CPPCHECKTARGETS += zstream
install-exec-hook:
cd $(DESTDIR)$(sbindir) && $(LN_S) -f zstream zstreamdump
cmd/ztest/Makefile.am
+7 -8
View File
@@ -1,13 +1,11 @@
include $(top_srcdir)/config/Rules.am
AM_CFLAGS += $(KERNEL_CFLAGS)
# Get rid of compiler warning for unchecked truncating snprintfs on gcc 7.1.1
AM_CFLAGS += $(NO_FORMAT_TRUNCATION)
# Includes kernel code, generate warnings for large stack frames
AM_CFLAGS += $(FRAME_LARGER_THAN)
# Unconditionally enable ASSERTs
AM_CPPFLAGS += -DDEBUG -UNDEBUG -DZFS_DEBUG
AM_CPPFLAGS += $(FORCEDEBUG_CPPFLAGS)
sbin_PROGRAMS = ztest
@@ -15,11 +13,12 @@ ztest_SOURCES = \
ztest.c
ztest_LDADD = \
$(abs_top_builddir)/lib/libzpool/libzpool.la \
$(abs_top_builddir)/lib/libzfs_core/libzfs_core.la \
$(abs_top_builddir)/lib/libnvpair/libnvpair.la
$(abs_top_builddir)/libzpool.la \
$(abs_top_builddir)/libzfs_core.la \
$(abs_top_builddir)/libnvpair.la
ztest_LDADD += -lm
ztest_LDFLAGS = -pthread
include $(top_srcdir)/config/CppCheck.am
CPPCHECKTARGETS += ztest
cmd/zvol_id/Makefile.am
+1
View File
@@ -10,3 +10,4 @@ zvol_id_SOURCES = \
zvol_id_main.c
include $(top_srcdir)/config/CppCheck.am
CPPCHECKTARGETS += zvol_id
cmd/zvol_wait/Makefile.am
-1
View File
@@ -1,4 +1,3 @@
include $(top_srcdir)/config/Shellcheck.am
dist_bin_SCRIPTS = zvol_wait