]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
do not install zbuff.h 2166/head
authorYann Collet <cyan@fb.com>
Fri, 22 May 2020 22:35:54 +0000 (15:35 -0700)
committerYann Collet <cyan@fb.com>
Fri, 22 May 2020 22:35:54 +0000 (15:35 -0700)
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
build/meson/lib/meson.build
lib/Makefile

index 666da60c1e8ec7c2da037b4a1d8a7ef24c6dee0a..b9e221595503165f0cdd8a2bc663168739cfad7e 100644 (file)
@@ -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}")
 
index 6fb3df8e9fcfa314669f8c77a9d8d7b7caf860b5..17806c8dcc3703c2d02166f99500cbd636560901 100644 (file)
@@ -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'))
index 7c6dff02468ad8a9ace0306f678277d9b98f8b5d..e6213ac8600457cebbb38fc2f893d6550e987906 100644 (file)
@@ -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