]>
Commit | Line | Data |
---|---|---|
d7426e6a JB |
1 | --- advancecomp-2.6/Makefile.am.orig 2023-10-10 17:01:16.000000000 +0200 |
2 | +++ advancecomp-2.6/Makefile.am 2024-04-17 18:59:18.464658604 +0200 | |
3 | @@ -21,34 +21,10 @@ bin_PROGRAMS = advzip advpng advmng advd | |
17fb1491 JB |
4 | 7z/WindowIn.cc \ |
5 | 7z/WindowOut.cc | |
6 | ||
7 | -libdeflate_SOURCES = \ | |
d7426e6a JB |
8 | - libdeflate/arm/cpu_features.c \ |
9 | - libdeflate/x86/cpu_features.c \ | |
17fb1491 | 10 | - libdeflate/adler32.c \ |
17fb1491 | 11 | - libdeflate/crc32.c \ |
d7426e6a | 12 | - libdeflate/deflate_compress.c\ |
17fb1491 JB |
13 | - libdeflate/deflate_decompress.c \ |
14 | - libdeflate/gzip_compress.c \ | |
15 | - libdeflate/gzip_decompress.c \ | |
d7426e6a | 16 | - libdeflate/utils.c \ |
17fb1491 JB |
17 | - libdeflate/zlib_compress.c \ |
18 | - libdeflate/zlib_decompress.c | |
19 | - | |
d7426e6a | 20 | - |
17fb1491 JB |
21 | -zopfli_SOURCES = \ |
22 | - zopfli/blocksplitter.c \ | |
23 | - zopfli/cache.c \ | |
24 | - zopfli/deflate.c \ | |
25 | - zopfli/gzip_container.c \ | |
26 | - zopfli/hash.c \ | |
27 | - zopfli/katajainen.c \ | |
28 | - zopfli/lz77.c \ | |
29 | - zopfli/squeeze.c \ | |
30 | - zopfli/tree.c \ | |
31 | - zopfli/util.c \ | |
32 | - zopfli/zlib_container.c \ | |
33 | - zopfli/zopfli.h \ | |
34 | - zopfli/zopfli_lib.c | |
35 | +libdeflate_LIBS = -ldeflate | |
d7426e6a JB |
36 | + |
37 | + | |
17fb1491 | 38 | +zopfli_LIBS = -lzopfli |
17fb1491 JB |
39 | |
40 | advzip_SOURCES = \ | |
41 | rezip.cc \ | |
d7426e6a | 42 | @@ -62,8 +38,8 @@ advzip_SOURCES = \ |
17fb1491 | 43 | snprintf.c \ |
d7426e6a JB |
44 | portable.c \ |
45 | $(7z_SOURCES) \ | |
17fb1491 JB |
46 | - $(libdeflate_SOURCES) \ |
47 | - $(zopfli_SOURCES) | |
d7426e6a JB |
48 | + $(nil) |
49 | +advzip_LDADD = $(libdeflate_LIBS) $(zopfli_LIBS) | |
17fb1491 JB |
50 | |
51 | advpng_SOURCES = \ | |
52 | repng.cc \ | |
d7426e6a | 53 | @@ -79,8 +55,8 @@ advpng_SOURCES = \ |
17fb1491 JB |
54 | lib/error.c \ |
55 | lib/snstring.c \ | |
d7426e6a | 56 | $(7z_SOURCES) \ |
17fb1491 JB |
57 | - $(libdeflate_SOURCES) \ |
58 | - $(zopfli_SOURCES) | |
d7426e6a JB |
59 | + $(nil) |
60 | +advpng_LDADD = $(libdeflate_LIBS) $(zopfli_LIBS) | |
17fb1491 JB |
61 | |
62 | advmng_SOURCES = \ | |
63 | remng.cc \ | |
d7426e6a | 64 | @@ -101,8 +75,8 @@ advmng_SOURCES = \ |
17fb1491 JB |
65 | lib/error.c \ |
66 | lib/snstring.c \ | |
d7426e6a | 67 | $(7z_SOURCES) \ |
17fb1491 JB |
68 | - $(libdeflate_SOURCES) \ |
69 | - $(zopfli_SOURCES) | |
d7426e6a JB |
70 | + $(nil) |
71 | +advmng_LDADD = $(libdeflate_LIBS) $(zopfli_LIBS) | |
17fb1491 JB |
72 | |
73 | advdef_SOURCES = \ | |
74 | redef.cc \ | |
d7426e6a | 75 | @@ -120,8 +93,8 @@ advdef_SOURCES = \ |
17fb1491 JB |
76 | lib/png.c \ |
77 | lib/mng.c \ | |
d7426e6a | 78 | $(7z_SOURCES) \ |
17fb1491 JB |
79 | - $(libdeflate_SOURCES) \ |
80 | - $(zopfli_SOURCES) | |
d7426e6a JB |
81 | + $(nil) |
82 | +advdef_LDADD = $(libdeflate_LIBS) $(zopfli_LIBS) | |
17fb1491 | 83 | |
d7426e6a JB |
84 | # Add the .version file in the distribution |
85 | dist-hook: | |
17fb1491 JB |
86 | --- advancecomp-1.23/compress.h.orig 2016-09-26 22:04:03.000000000 +0200 |
87 | +++ advancecomp-1.23/compress.h 2016-12-18 22:11:26.444429691 +0100 | |
88 | @@ -24,11 +24,11 @@ | |
89 | #include "7z/7z.h" | |
90 | ||
91 | extern "C" { | |
92 | -#include "libdeflate/libdeflate.h" | |
93 | +#include <libdeflate.h> | |
94 | } | |
95 | ||
96 | extern "C" { | |
97 | -#include "zopfli/zopfli.h" | |
98 | +#include <zopfli.h> | |
99 | } | |
100 | ||
101 | #if USE_BZIP2 |