Do not build zlibWrapper examples against embedded code copies.

Gbp-Pq: Name 0008-Address-embedded-zlib.patch

diff --git a/zlibWrapper/Makefile b/zlibWrapper/Makefile
index 6fd5ac3bbec8c2f871a5e833f248e8e1e0e20d33..e0c1671ef7d5680cdd7128b950dcdc7c02b3ddfc 100644 (file)
--- a/zlibWrapper/Makefile
+++ b/zlibWrapper/Makefile
@@ -13,7 +13,7 @@ ZLIB_PATH ?= .
 ZSTDLIBDIR = ../lib
 ZSTDLIBRARY = $(ZSTDLIBDIR)/libzstd.a
 ZLIBWRAPPER_PATH = .
-GZFILES = gzclose.o gzlib.o gzread.o gzwrite.o
+#GZFILES = gzclose.o gzlib.o gzread.o gzwrite.o
 EXAMPLE_PATH = examples
 PROGRAMS_PATH = ../programs
 TEST_FILE = ../doc/zstd_compression_format.md
@@ -82,14 +82,14 @@ valgrindTest: clean example fitblk example_zstd fitblk_zstd zwrapbench
 #.c.o:
 #      $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
 
-minigzip: minigzip.o zstd_zlibwrapper.o $(GZFILES) $(ZSTDLIBRARY)
+minigzip: minigzip.o zstd_zlibwrapper.o $(ZSTDLIBRARY)
 
-minigzip_zstd: minigzip.o zstdTurnedOn_zlibwrapper.o $(GZFILES) $(ZSTDLIBRARY)
+minigzip_zstd: minigzip.o zstdTurnedOn_zlibwrapper.o $(ZSTDLIBRARY)
        $(LINK.o) $^ $(LDLIBS) $(OUTPUT_OPTION)
 
-example: example.o zstd_zlibwrapper.o $(GZFILES) $(ZSTDLIBRARY)
+example: example.o zstd_zlibwrapper.o $(ZSTDLIBRARY)
 
-example_zstd: example.o zstdTurnedOn_zlibwrapper.o $(GZFILES) $(ZSTDLIBRARY)
+example_zstd: example.o zstdTurnedOn_zlibwrapper.o $(ZSTDLIBRARY)
        $(LINK.o) $^ $(LDLIBS) $(OUTPUT_OPTION)
 
 fitblk: fitblk.o zstd_zlibwrapper.o $(ZSTDLIBRARY)

diff --git a/zlibWrapper/examples/example.c b/zlibWrapper/examples/example.c
index 9000f7a3295ecd5b4b44db4ed843a036bda8a421..0299b2008197123d57666c9aad12275789f29d39 100644 (file)
--- a/zlibWrapper/examples/example.c
+++ b/zlibWrapper/examples/example.c
@@ -27,7 +27,7 @@
 
 /* @(#) $Id$ */
 
-#include "zstd_zlibwrapper.h"
+#include "zlib.h"
 #include <stdio.h>
 
 #ifdef STDC