From 1dee52fc482b38268a1ea5f023fff44aa90ab0ad Mon Sep 17 00:00:00 2001 From: Sascha Steinbiss Date: Sun, 20 Mar 2022 16:25:50 +0000 Subject: [PATCH] Do not build zlibWrapper examples against embedded code copies. Gbp-Pq: Name 0008-Address-embedded-zlib.patch --- zlibWrapper/Makefile | 10 +++++----- zlibWrapper/examples/example.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/zlibWrapper/Makefile b/zlibWrapper/Makefile index 6fd5ac3..e0c1671 100644 --- 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 9000f7a..0299b20 100644 --- a/zlibWrapper/examples/example.c +++ b/zlibWrapper/examples/example.c @@ -27,7 +27,7 @@ /* @(#) $Id$ */ -#include "zstd_zlibwrapper.h" +#include "zlib.h" #include #ifdef STDC -- 2.30.2