From 056287e3f7c2e6b28e999b1b3b3320f017b7e044 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Sat, 21 Nov 2020 10:44:52 -0800 Subject: [PATCH] Include the ABI with dist tarball The ABI should be included when generating the `make dist` tarball since it's required by the `make checkabi` target. Signed-off-by: Brian Behlendorf Closes #11225 --- lib/libnvpair/Makefile.am | 3 +++ lib/libuutil/Makefile.am | 3 +++ lib/libzfs/Makefile.am | 5 ++++- lib/libzfs_core/Makefile.am | 3 +++ lib/libzfsbootenv/Makefile.am | 3 +++ 5 files changed, 16 insertions(+), 1 deletion(-) diff --git a/lib/libnvpair/Makefile.am b/lib/libnvpair/Makefile.am index 8d5a62980..7840e099b 100644 --- a/lib/libnvpair/Makefile.am +++ b/lib/libnvpair/Makefile.am @@ -41,3 +41,6 @@ libnvpair_la_LDFLAGS += -Wl,-z,defs endif libnvpair_la_LDFLAGS += -version-info 3:0:0 + +# Library ABI +EXTRA_DIST = libnvpair.abi libnvpair.suppr diff --git a/lib/libuutil/Makefile.am b/lib/libuutil/Makefile.am index 6f1fb4433..5e7cf5419 100644 --- a/lib/libuutil/Makefile.am +++ b/lib/libuutil/Makefile.am @@ -31,3 +31,6 @@ libuutil_la_LDFLAGS += -Wl,-z,defs endif libuutil_la_LDFLAGS += -version-info 3:0:0 + +# Library ABI +EXTRA_DIST = libuutil.abi libuutil.suppr diff --git a/lib/libzfs/Makefile.am b/lib/libzfs/Makefile.am index 0b0d7b075..abaef2d15 100644 --- a/lib/libzfs/Makefile.am +++ b/lib/libzfs/Makefile.am @@ -91,5 +91,8 @@ endif libzfs_la_LDFLAGS += -version-info 4:0:0 +# Library ABI +EXTRA_DIST = libzfs.abi libzfs.suppr + # Licensing data -EXTRA_DIST = THIRDPARTYLICENSE.openssl THIRDPARTYLICENSE.openssl.descrip +EXTRA_DIST += THIRDPARTYLICENSE.openssl THIRDPARTYLICENSE.openssl.descrip diff --git a/lib/libzfs_core/Makefile.am b/lib/libzfs_core/Makefile.am index 5f1564399..760caddde 100644 --- a/lib/libzfs_core/Makefile.am +++ b/lib/libzfs_core/Makefile.am @@ -29,3 +29,6 @@ libzfs_core_la_LIBADD += -lutil -lgeom endif libzfs_core_la_LDFLAGS += -version-info 3:0:0 + +# Library ABI +EXTRA_DIST = libzfs_core.abi libzfs_core.suppr diff --git a/lib/libzfsbootenv/Makefile.am b/lib/libzfsbootenv/Makefile.am index 354be3efa..51ab48f54 100644 --- a/lib/libzfsbootenv/Makefile.am +++ b/lib/libzfsbootenv/Makefile.am @@ -33,3 +33,6 @@ libzfsbootenv_la_LDFLAGS += -Wl,-z,defs endif libzfsbootenv_la_LDFLAGS += -version-info 1:0:0 + +# Library ABI +EXTRA_DIST = libzfsbootenv.abi libzfsbootenv.suppr