From: Hans Kristian Rosbach Date: Wed, 3 Jan 2024 14:04:09 +0000 (+0100) Subject: Simplify includes X-Git-Tag: 2.2.0~127 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f38b4c5fc0222676e8f709d5024a9b61d889d3e;p=thirdparty%2Fzlib-ng.git Simplify includes --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 8bcfaf7e..ce061371 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1067,6 +1067,10 @@ else() set(ZLIB_INSTALL_LIBRARIES zlib) endif() +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +include_directories(${ARCHDIR}) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/arch/generic) + foreach(ZLIB_INSTALL_LIBRARY ${ZLIB_INSTALL_LIBRARIES}) if(NOT ZLIB_COMPAT) target_compile_definitions(${ZLIB_INSTALL_LIBRARY} PUBLIC ZLIBNG_NATIVE_API) diff --git a/arch/arm/adler32_neon.c b/arch/arm/adler32_neon.c index f1c43ff0..8e46b380 100644 --- a/arch/arm/adler32_neon.c +++ b/arch/arm/adler32_neon.c @@ -7,8 +7,8 @@ */ #ifdef ARM_NEON #include "neon_intrins.h" -#include "../../zbuild.h" -#include "../../adler32_p.h" +#include "zbuild.h" +#include "adler32_p.h" static void NEON_accum32(uint32_t *s, const uint8_t *buf, size_t len) { static const uint16_t ALIGNED_(16) taps[64] = { diff --git a/arch/arm/arm_features.c b/arch/arm/arm_features.c index a0e070ba..247ed027 100644 --- a/arch/arm/arm_features.c +++ b/arch/arm/arm_features.c @@ -1,4 +1,4 @@ -#include "../../zbuild.h" +#include "zbuild.h" #include "arm_features.h" #if defined(__linux__) && defined(HAVE_SYS_AUXV_H) diff --git a/arch/arm/chunkset_neon.c b/arch/arm/chunkset_neon.c index f9a444b0..030f7be7 100644 --- a/arch/arm/chunkset_neon.c +++ b/arch/arm/chunkset_neon.c @@ -4,8 +4,8 @@ #ifdef ARM_NEON #include "neon_intrins.h" -#include "../../zbuild.h" -#include "../generic/chunk_permute_table.h" +#include "zbuild.h" +#include "chunk_permute_table.h" typedef uint8x16_t chunk_t; diff --git a/arch/arm/compare256_neon.c b/arch/arm/compare256_neon.c index 7daeba41..4d6ba533 100644 --- a/arch/arm/compare256_neon.c +++ b/arch/arm/compare256_neon.c @@ -3,7 +3,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -#include "../../zbuild.h" +#include "zbuild.h" #include "fallback_builtins.h" diff --git a/arch/arm/crc32_acle.c b/arch/arm/crc32_acle.c index ac7d6ff6..116bcab1 100644 --- a/arch/arm/crc32_acle.c +++ b/arch/arm/crc32_acle.c @@ -7,7 +7,7 @@ #ifdef ARM_ACLE #include "acle_intrins.h" -#include "../../zbuild.h" +#include "zbuild.h" Z_INTERNAL Z_TARGET_CRC uint32_t crc32_acle(uint32_t crc, const uint8_t *buf, size_t len) { Z_REGISTER uint32_t c; diff --git a/arch/arm/insert_string_acle.c b/arch/arm/insert_string_acle.c index aa8385c7..b357f8ab 100644 --- a/arch/arm/insert_string_acle.c +++ b/arch/arm/insert_string_acle.c @@ -7,8 +7,8 @@ #ifdef ARM_ACLE #include "acle_intrins.h" -#include "../../zbuild.h" -#include "../../deflate.h" +#include "zbuild.h" +#include "deflate.h" #define HASH_CALC(s, h, val) \ h = __crc32w(0, val) @@ -20,5 +20,5 @@ #define INSERT_STRING Z_TARGET_CRC insert_string_acle #define QUICK_INSERT_STRING Z_TARGET_CRC quick_insert_string_acle -#include "../../insert_string_tpl.h" +#include "insert_string_tpl.h" #endif diff --git a/arch/arm/slide_hash_armv6.c b/arch/arm/slide_hash_armv6.c index 0a2eeccf..07f71b59 100644 --- a/arch/arm/slide_hash_armv6.c +++ b/arch/arm/slide_hash_armv6.c @@ -5,8 +5,8 @@ #if defined(ARM_SIMD) #include "acle_intrins.h" -#include "../../zbuild.h" -#include "../../deflate.h" +#include "zbuild.h" +#include "deflate.h" /* SIMD version of hash_chain rebase */ static inline void slide_hash_chain(Pos *table, uint32_t entries, uint16_t wsize) { diff --git a/arch/arm/slide_hash_neon.c b/arch/arm/slide_hash_neon.c index a96ca117..a601e609 100644 --- a/arch/arm/slide_hash_neon.c +++ b/arch/arm/slide_hash_neon.c @@ -10,8 +10,8 @@ #ifdef ARM_NEON #include "neon_intrins.h" -#include "../../zbuild.h" -#include "../../deflate.h" +#include "zbuild.h" +#include "deflate.h" /* SIMD version of hash_chain rebase */ static inline void slide_hash_chain(Pos *table, uint32_t entries, uint16_t wsize) { diff --git a/arch/power/chunkset_power8.c b/arch/power/chunkset_power8.c index 7cbb8029..aef19732 100644 --- a/arch/power/chunkset_power8.c +++ b/arch/power/chunkset_power8.c @@ -4,7 +4,7 @@ #ifdef POWER8_VSX #include -#include "../../zbuild.h" +#include "zbuild.h" typedef vector unsigned char chunk_t; diff --git a/arch/power/compare256_power9.c b/arch/power/compare256_power9.c index 9b0ddaf8..f936cc98 100644 --- a/arch/power/compare256_power9.c +++ b/arch/power/compare256_power9.c @@ -5,8 +5,8 @@ #ifdef POWER9 #include -#include "../../zbuild.h" -#include "../../zendian.h" +#include "zbuild.h" +#include "zendian.h" /* Older versions of GCC misimplemented semantics for these bit counting builtins. * https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=3f30f2d1dbb3228b8468b26239fe60c2974ce2ac */ diff --git a/arch/power/power_features.c b/arch/power/power_features.c index f7350373..35145177 100644 --- a/arch/power/power_features.c +++ b/arch/power/power_features.c @@ -10,7 +10,7 @@ #ifdef __FreeBSD__ # include #endif -#include "../../zbuild.h" +#include "zbuild.h" #include "power_features.h" void Z_INTERNAL power_check_features(struct power_cpu_features *features) { diff --git a/arch/riscv/adler32_rvv.c b/arch/riscv/adler32_rvv.c index da46f37e..d0f9aaa5 100644 --- a/arch/riscv/adler32_rvv.c +++ b/arch/riscv/adler32_rvv.c @@ -9,8 +9,8 @@ #include #include -#include "../../zbuild.h" -#include "../../adler32_p.h" +#include "zbuild.h" +#include "adler32_p.h" static inline uint32_t adler32_rvv_impl(uint32_t adler, uint8_t* restrict dst, const uint8_t *src, size_t len, int COPY) { /* split Adler-32 into component sums */ diff --git a/arch/riscv/compare256_rvv.c b/arch/riscv/compare256_rvv.c index 0fd6082c..cf0de0de 100644 --- a/arch/riscv/compare256_rvv.c +++ b/arch/riscv/compare256_rvv.c @@ -6,7 +6,7 @@ #ifdef RISCV_RVV -#include "../../zbuild.h" +#include "zbuild.h" #include "fallback_builtins.h" #include diff --git a/arch/riscv/riscv_features.c b/arch/riscv/riscv_features.c index b066f427..506b480c 100644 --- a/arch/riscv/riscv_features.c +++ b/arch/riscv/riscv_features.c @@ -4,7 +4,7 @@ #include #include -#include "../../zbuild.h" +#include "zbuild.h" #include "riscv_features.h" #define ISA_V_HWCAP (1 << ('v' - 'a')) diff --git a/arch/riscv/slide_hash_rvv.c b/arch/riscv/slide_hash_rvv.c index 1164e89b..d8fa4626 100644 --- a/arch/riscv/slide_hash_rvv.c +++ b/arch/riscv/slide_hash_rvv.c @@ -8,8 +8,8 @@ #include -#include "../../zbuild.h" -#include "../../deflate.h" +#include "zbuild.h" +#include "deflate.h" static inline void slide_hash_chain(Pos *table, uint32_t entries, uint16_t wsize) { size_t vl; diff --git a/arch/s390/crc32-vx.c b/arch/s390/crc32-vx.c index acfa2188..82b8532e 100644 --- a/arch/s390/crc32-vx.c +++ b/arch/s390/crc32-vx.c @@ -12,7 +12,7 @@ * relicensed under the zlib license. */ -#include "../../zbuild.h" +#include "zbuild.h" #include "crc32_braid_p.h" #include diff --git a/arch/s390/dfltcc_detail.h b/arch/s390/dfltcc_detail.h index 362d94c3..49779d60 100644 --- a/arch/s390/dfltcc_detail.h +++ b/arch/s390/dfltcc_detail.h @@ -1,4 +1,4 @@ -#include "../../zbuild.h" +#include "zbuild.h" #include #ifdef HAVE_SYS_SDT_H diff --git a/arch/s390/s390_features.c b/arch/s390/s390_features.c index 82901060..629025d5 100644 --- a/arch/s390/s390_features.c +++ b/arch/s390/s390_features.c @@ -1,4 +1,4 @@ -#include "../../zbuild.h" +#include "zbuild.h" #include "s390_features.h" #ifdef HAVE_SYS_AUXV_H diff --git a/arch/x86/adler32_avx2.c b/arch/x86/adler32_avx2.c index e3ac6705..e2882cb7 100644 --- a/arch/x86/adler32_avx2.c +++ b/arch/x86/adler32_avx2.c @@ -9,10 +9,10 @@ #ifdef X86_AVX2 -#include "../../zbuild.h" +#include "zbuild.h" #include -#include "../../adler32_fold.h" -#include "../../adler32_p.h" +#include "adler32_fold.h" +#include "adler32_p.h" #include "adler32_avx2_p.h" #include "x86_intrins.h" diff --git a/arch/x86/adler32_avx512.c b/arch/x86/adler32_avx512.c index aa6cc170..6f5671b7 100644 --- a/arch/x86/adler32_avx512.c +++ b/arch/x86/adler32_avx512.c @@ -8,10 +8,10 @@ #ifdef X86_AVX512 -#include "../../zbuild.h" -#include "../../adler32_p.h" -#include "../../adler32_fold.h" -#include "../../cpu_features.h" +#include "zbuild.h" +#include "adler32_p.h" +#include "adler32_fold.h" +#include "cpu_features.h" #include #include "x86_intrins.h" #include "adler32_avx512_p.h" diff --git a/arch/x86/adler32_avx512_vnni.c b/arch/x86/adler32_avx512_vnni.c index 771f7ebe..c4faceda 100644 --- a/arch/x86/adler32_avx512_vnni.c +++ b/arch/x86/adler32_avx512_vnni.c @@ -9,11 +9,11 @@ #ifdef X86_AVX512VNNI -#include "../../zbuild.h" -#include "../../adler32_p.h" -#include "../../cpu_features.h" +#include "zbuild.h" +#include "adler32_p.h" +#include "cpu_features.h" #include -#include "../../adler32_fold.h" +#include "adler32_fold.h" #include "x86_intrins.h" #include "adler32_avx512_p.h" #include "adler32_avx2_p.h" diff --git a/arch/x86/adler32_sse42.c b/arch/x86/adler32_sse42.c index 257a3609..0b1addbc 100644 --- a/arch/x86/adler32_sse42.c +++ b/arch/x86/adler32_sse42.c @@ -6,9 +6,9 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -#include "../../zbuild.h" -#include "../../adler32_p.h" -#include "../../adler32_fold.h" +#include "zbuild.h" +#include "adler32_p.h" +#include "adler32_fold.h" #include "adler32_ssse3_p.h" #include diff --git a/arch/x86/adler32_ssse3.c b/arch/x86/adler32_ssse3.c index ae819d63..15e2f78b 100644 --- a/arch/x86/adler32_ssse3.c +++ b/arch/x86/adler32_ssse3.c @@ -6,8 +6,8 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -#include "../../zbuild.h" -#include "../../adler32_p.h" +#include "zbuild.h" +#include "adler32_p.h" #include "adler32_ssse3_p.h" #ifdef X86_SSSE3 diff --git a/arch/x86/compare256_avx2.c b/arch/x86/compare256_avx2.c index 1318a0e3..a706a30f 100644 --- a/arch/x86/compare256_avx2.c +++ b/arch/x86/compare256_avx2.c @@ -3,7 +3,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -#include "../../zbuild.h" +#include "zbuild.h" #include "fallback_builtins.h" diff --git a/arch/x86/compare256_sse2.c b/arch/x86/compare256_sse2.c index aad4bd24..015d5398 100644 --- a/arch/x86/compare256_sse2.c +++ b/arch/x86/compare256_sse2.c @@ -3,7 +3,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -#include "../../zbuild.h" +#include "zbuild.h" #include "fallback_builtins.h" diff --git a/arch/x86/crc32_pclmulqdq_tpl.h b/arch/x86/crc32_pclmulqdq_tpl.h index 05d3b152..7f29a5d0 100644 --- a/arch/x86/crc32_pclmulqdq_tpl.h +++ b/arch/x86/crc32_pclmulqdq_tpl.h @@ -17,7 +17,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -#include "../../zbuild.h" +#include "zbuild.h" #include #include @@ -26,8 +26,8 @@ # include #endif -#include "../../crc32_fold.h" -#include "../../crc32_braid_p.h" +#include "crc32_fold.h" +#include "crc32_braid_p.h" #include "x86_intrins.h" #include diff --git a/arch/x86/insert_string_sse42.c b/arch/x86/insert_string_sse42.c index ae092a7e..0cccf1d3 100644 --- a/arch/x86/insert_string_sse42.c +++ b/arch/x86/insert_string_sse42.c @@ -6,9 +6,9 @@ */ #ifdef X86_SSE42 -#include "../../zbuild.h" +#include "zbuild.h" #include -#include "../../deflate.h" +#include "deflate.h" #define HASH_CALC(s, h, val)\ h = _mm_crc32_u32(h, val) @@ -20,5 +20,5 @@ #define INSERT_STRING insert_string_sse42 #define QUICK_INSERT_STRING quick_insert_string_sse42 -#include "../../insert_string_tpl.h" +#include "insert_string_tpl.h" #endif diff --git a/arch/x86/slide_hash_avx2.c b/arch/x86/slide_hash_avx2.c index 94fe10c7..f49ad333 100644 --- a/arch/x86/slide_hash_avx2.c +++ b/arch/x86/slide_hash_avx2.c @@ -9,8 +9,8 @@ * * For conditions of distribution and use, see copyright notice in zlib.h */ -#include "../../zbuild.h" -#include "../../deflate.h" +#include "zbuild.h" +#include "deflate.h" #include diff --git a/arch/x86/slide_hash_sse2.c b/arch/x86/slide_hash_sse2.c index 5daac4a7..cfdf7bee 100644 --- a/arch/x86/slide_hash_sse2.c +++ b/arch/x86/slide_hash_sse2.c @@ -8,8 +8,8 @@ * * For conditions of distribution and use, see copyright notice in zlib.h */ -#include "../../zbuild.h" -#include "../../deflate.h" +#include "zbuild.h" +#include "deflate.h" #include #include diff --git a/arch/x86/x86_features.c b/arch/x86/x86_features.c index 8d11564c..fcd4cb35 100644 --- a/arch/x86/x86_features.c +++ b/arch/x86/x86_features.c @@ -7,7 +7,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -#include "../../zbuild.h" +#include "zbuild.h" #include "x86_features.h" #ifdef _MSC_VER diff --git a/configure b/configure index 20fb91ae..6de26247 100755 --- a/configure +++ b/configure @@ -1941,7 +1941,7 @@ replace_in_file() { # update Makefile with the configure results -INCLUDES="-I$SRCDIR" +INCLUDES="-I$SRCDIR -I$SRCDIR/$ARCHDIR -I$SRCDIR/arch/generic" if [ "$SRCDIR" != "$BUILDDIR" ]; then INCLUDES="-I$BUILDDIR ${INCLUDES}"; fi sed < $SRCDIR/Makefile.in " @@ -2044,15 +2044,12 @@ done # Generate Makefile in arch dir mkdir -p $ARCHDIR -ARCHINCLUDES="-I$SRCDIR/$ARCHDIR -I$SRCDIR" -if [ "$SRCDIR" != "$BUILDDIR" ]; then ARCHINCLUDES="-I$BUILDDIR ${ARCHINCLUDES}"; fi - sed < $SRCDIR/$ARCHDIR/Makefile.in " /^CC *=/s#=.*#=$CC# /^CFLAGS *=/s#=.*#=$CFLAGS# /^SFLAGS *=/s#=.*#=$SFLAGS# /^LDFLAGS *=/s#=.*#=$LDFLAGS# -/^INCLUDES *=/s#=.*#=$ARCHINCLUDES# +/^INCLUDES *=/s#=.*#=$INCLUDES# /^SUFFIX *=/s#=.*#=$SUFFIX# /^SRCDIR *=/s#=.*#=$SRCDIR/$ARCHDIR# /^SRCTOP *=/s#=.*#=$SRCDIR# diff --git a/win32/Makefile.a64 b/win32/Makefile.a64 index 2a0f3cfe..ec4a1cc1 100644 --- a/win32/Makefile.a64 +++ b/win32/Makefile.a64 @@ -23,7 +23,8 @@ LD = link AR = lib RC = rc CP = copy /y -CFLAGS = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC) +INCLUDES = -I$(TOP) -I$(TOP)/arch/arm -I$(TOP)/arch/generic +CFLAGS = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC) $(INCLUDES) WFLAGS = \ -D_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 \ -D_CRT_SECURE_NO_DEPRECATE \ diff --git a/win32/Makefile.arm b/win32/Makefile.arm index 34dfe6bb..4c7813f5 100644 --- a/win32/Makefile.arm +++ b/win32/Makefile.arm @@ -23,7 +23,8 @@ LD = link AR = lib RC = rc CP = copy /y -CFLAGS = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC) +INCLUDES = -I$(TOP) -I$(TOP)/arch/arm -I$(TOP)/arch/generic +CFLAGS = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC) $(INCLUDES) WFLAGS = \ -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 \ -D_CRT_SECURE_NO_DEPRECATE \ diff --git a/win32/Makefile.msc b/win32/Makefile.msc index 3035072b..044cc596 100644 --- a/win32/Makefile.msc +++ b/win32/Makefile.msc @@ -23,7 +23,8 @@ LD = link AR = lib RC = rc CP = copy /y -CFLAGS = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC) +INCLUDES = -I$(TOP) -I$(TOP)/arch/x86 -I$(TOP)/arch/generic +CFLAGS = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC) $(INCLUDES) WFLAGS = \ -D_CRT_SECURE_NO_DEPRECATE \ -D_CRT_NONSTDC_NO_DEPRECATE \