From 082755bd3f456729eec1be38feccfd706772e108 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Fri, 22 May 2020 15:35:54 -0700 Subject: [PATCH] do not install zbuff.h this API is deprecated, for a loong time now, all related symbols will be removed in a future version (likely v1.5.0) and the header file `zbuff.h` doesn't compile from `include/` anyway, because it needs to be positioned one directory below `zstd.h`. Also removed `cover.h` from `cmake` installer, as it should have never been part of this list to begin with. --- build/cmake/lib/CMakeLists.txt | 2 -- build/meson/lib/meson.build | 1 - lib/Makefile | 2 -- 3 files changed, 5 deletions(-) diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt index 666da60c..b9e22159 100644 --- a/build/cmake/lib/CMakeLists.txt +++ b/build/cmake/lib/CMakeLists.txt @@ -152,9 +152,7 @@ endif () # install target install(FILES "${LIBRARY_DIR}/zstd.h" - "${LIBRARY_DIR}/deprecated/zbuff.h" "${LIBRARY_DIR}/dictBuilder/zdict.h" - "${LIBRARY_DIR}/dictBuilder/cover.h" "${LIBRARY_DIR}/common/zstd_errors.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") diff --git a/build/meson/lib/meson.build b/build/meson/lib/meson.build index 6fb3df8e..17806c8d 100644 --- a/build/meson/lib/meson.build +++ b/build/meson/lib/meson.build @@ -127,6 +127,5 @@ pkgconfig.generate(libzstd, url: 'http://www.zstd.net/') install_headers(join_paths(zstd_rootdir, 'lib/zstd.h'), - join_paths(zstd_rootdir, 'lib/deprecated/zbuff.h'), join_paths(zstd_rootdir, 'lib/dictBuilder/zdict.h'), join_paths(zstd_rootdir, 'lib/common/zstd_errors.h')) diff --git a/lib/Makefile b/lib/Makefile index 7c6dff02..e6213ac8 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -336,7 +336,6 @@ install-includes: $(Q)$(INSTALL) -d -m 755 $(DESTDIR)$(INCLUDEDIR)/ $(Q)$(INSTALL_DATA) zstd.h $(DESTDIR)$(INCLUDEDIR) $(Q)$(INSTALL_DATA) common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR) - $(Q)$(INSTALL_DATA) deprecated/zbuff.h $(DESTDIR)$(INCLUDEDIR) # prototypes generate deprecation warnings $(Q)$(INSTALL_DATA) dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR) uninstall: @@ -347,7 +346,6 @@ uninstall: $(Q)$(RM) $(DESTDIR)$(PKGCONFIGDIR)/libzstd.pc $(Q)$(RM) $(DESTDIR)$(INCLUDEDIR)/zstd.h $(Q)$(RM) $(DESTDIR)$(INCLUDEDIR)/zstd_errors.h - $(Q)$(RM) $(DESTDIR)$(INCLUDEDIR)/zbuff.h # Deprecated streaming functions $(Q)$(RM) $(DESTDIR)$(INCLUDEDIR)/zdict.h @echo zstd libraries successfully uninstalled