diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2022-05-18 22:54:40 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2022-05-18 22:55:59 +0000 |
| commit | 716fd348e01c5f2ba125f878a634a753436c2994 (patch) | |
| tree | 0d738baf7a9ccfd90fa1e622f67e0399f306f024 /sys/contrib/openzfs/cmd/zstream/Makefile.am | |
| parent | 4e2d3f26bd12610ef8672eefb02814b882a4c29b (diff) | |
| parent | c0cf6ed6792e545fd614c2a88cb53756db7e03f8 (diff) | |
| download | src-716fd348e01c5f2ba125f878a634a753436c2994.tar.gz src-716fd348e01c5f2ba125f878a634a753436c2994.zip | |
zfs: merge openzfs/zfs@c0cf6ed67
Notable upstream pull request merges:
#10662 zvol_wait: Ignore locked zvols
#12789 Improve log spacemap load time
#12812 Improved zpool status output, list all affected datasets
#13277 FreeBSD: Use NDFREE_PNBUF if available
#13302 Make zfs_max_recordsize default to 16M
#13311 Fix error handling in FreeBSD's get/putpages VOPs
#13345 FreeBSD: Fix translation from ABD to physical pages
#13373 zfs: holds: dequadratify
#13375 Corrected edge case in uncompressed ARC->L2ARC handling
#13388 Improve mg_aliquot math
#13405 Reduce dbuf_find() lock contention
#13406 FreeBSD: use zero_region instead of allocating a dedicated page
Obtained from: OpenZFS
OpenZFS commit: c0cf6ed6792e545fd614c2a88cb53756db7e03f8
Diffstat (limited to 'sys/contrib/openzfs/cmd/zstream/Makefile.am')
| -rw-r--r-- | sys/contrib/openzfs/cmd/zstream/Makefile.am | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/sys/contrib/openzfs/cmd/zstream/Makefile.am b/sys/contrib/openzfs/cmd/zstream/Makefile.am index 8e813027fa3d..9b2716ae0391 100644 --- a/sys/contrib/openzfs/cmd/zstream/Makefile.am +++ b/sys/contrib/openzfs/cmd/zstream/Makefile.am @@ -1,20 +1,18 @@ -include $(top_srcdir)/config/Rules.am - -sbin_PROGRAMS = zstream +sbin_PROGRAMS += zstream +CPPCHECKTARGETS += zstream zstream_SOURCES = \ - zstream.c \ - zstream.h \ - zstream_dump.c \ - zstream_redup.c \ - zstream_token.c + %D%/zstream.c \ + %D%/zstream.h \ + %D%/zstream_dump.c \ + %D%/zstream_redup.c \ + %D%/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 - -include $(top_srcdir)/config/CppCheck.am + libzfs.la \ + libzfs_core.la \ + libnvpair.la +PHONY += install-exec-hook install-exec-hook: cd $(DESTDIR)$(sbindir) && $(LN_S) -f zstream zstreamdump |