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 <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes #13316

1 files changed, 14 insertions, 23 deletions

diff --git a/lib/libuutil/Makefile.am b/lib/libuutil/Makefile.am
index 6678a90b5..cb89d423d 100644
--- a/lib/libuutil/Makefile.am
+++ b/lib/libuutil/Makefile.am
@@ -1,26 +1,20 @@
-include $(top_srcdir)/config/Rules.am
+libuutil_la_CFLAGS = $(AM_CFLAGS) $(LIBRARY_CFLAGS) $(LIBRARY_CFLAGS)
 
-# See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=54020
-AM_CFLAGS += -no-suppress
+lib_LTLIBRARIES += libuutil.la
+CPPCHECKTARGETS += libuutil.la
 
-lib_LTLIBRARIES = libuutil.la
-
-include $(top_srcdir)/config/Abigail.am
-
-USER_C = \
-	uu_alloc.c \
-	uu_avl.c \
-	uu_ident.c \
-	uu_list.c \
-	uu_misc.c \
-	uu_pname.c \
-	uu_string.c
-
-libuutil_la_SOURCES = $(USER_C)
+libuutil_la_SOURCES = \
+	%D%/uu_alloc.c \
+	%D%/uu_avl.c \
+	%D%/uu_ident.c \
+	%D%/uu_list.c \
+	%D%/uu_misc.c \
+	%D%/uu_pname.c \
+	%D%/uu_string.c
 
 libuutil_la_LIBADD = \
-	$(abs_top_builddir)/lib/libavl/libavl.la \
-	$(abs_top_builddir)/lib/libspl/libspl.la
+	libavl.la \
+	libspl.la
 
 libuutil_la_LIBADD += $(LTLIBINTL)
 
@@ -32,7 +26,4 @@ endif
 
 libuutil_la_LDFLAGS += -version-info 3:0:0
 
-include $(top_srcdir)/config/CppCheck.am
-
-# Library ABI
-EXTRA_DIST = libuutil.abi libuutil.suppr
+EXTRA_DIST += $(addprefix %D%/,libuutil.abi libuutil.suppr)