]>
Commit | Line | Data |
---|---|---|
73730962 JB |
1 | --- zstd-1.3.7/lib/Makefile.orig 2018-10-17 05:58:52.000000000 +0200 |
2 | +++ zstd-1.3.7/lib/Makefile 2018-11-14 05:40:43.128342635 +0100 | |
3 | @@ -106,7 +106,7 @@ | |
a3eb5c88 | 4 | libzstd.a: ARFLAGS = rcs |
14b5ee43 | 5 | libzstd.a: $(ZSTD_OBJ) |
8edbfa0e | 6 | @echo compiling static library |
14b5ee43 JB |
7 | - @$(AR) $(ARFLAGS) $@ $^ |
8 | + $(AR) $(ARFLAGS) $@ $^ | |
a3eb5c88 | 9 | |
46edb54d AM |
10 | libzstd.a-mt: CPPFLAGS += -DZSTD_MULTITHREAD |
11 | libzstd.a-mt: libzstd.a | |
73730962 JB |
12 | @@ -125,10 +125,10 @@ |
13 | $(LIBZSTD): LDFLAGS += -shared -fPIC -fvisibility=hidden | |
14 | $(LIBZSTD): $(ZSTD_FILES) | |
15 | @echo compiling dynamic library $(LIBVER) | |
a3eb5c88 JB |
16 | - @$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@ |
17 | + $(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@ | |
8edbfa0e | 18 | @echo creating versioned links |
a3eb5c88 JB |
19 | - @ln -sf $@ libzstd.$(SHARED_EXT_MAJOR) |
20 | - @ln -sf $@ libzstd.$(SHARED_EXT) | |
21 | + ln -sf $@ libzstd.$(SHARED_EXT_MAJOR) | |
22 | + ln -sf $@ libzstd.$(SHARED_EXT) | |
73730962 | 23 | |
a3eb5c88 JB |
24 | endif |
25 | ||
73730962 | 26 | @@ -154,13 +154,13 @@ |
46edb54d AM |
27 | libzstd-nomt: $(ZSTD_NOMT_FILES) |
28 | @echo compiling single-thread dynamic library $(LIBVER) | |
29 | @echo files : $(ZSTD_NOMT_FILES) | |
30 | - @$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@ | |
31 | + $(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@ | |
8edbfa0e JB |
32 | |
33 | clean: | |
46edb54d | 34 | - @$(RM) -r *.dSYM # macOS-specific |
14b5ee43 | 35 | - @$(RM) core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc |
46edb54d | 36 | - @$(RM) dll/libzstd.dll dll/libzstd.lib libzstd-nomt* |
14b5ee43 | 37 | - @$(RM) common/*.o compress/*.o decompress/*.o dictBuilder/*.o legacy/*.o deprecated/*.o |
46edb54d | 38 | + $(RM) -r *.dSYM # macOS-specific |
14b5ee43 | 39 | + $(RM) core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc |
46edb54d | 40 | + $(RM) dll/libzstd.dll dll/libzstd.lib libzstd-nomt* |
14b5ee43 | 41 | + $(RM) common/*.o compress/*.o decompress/*.o dictBuilder/*.o legacy/*.o deprecated/*.o |
8edbfa0e JB |
42 | @echo Cleaning library completed |
43 | ||
14b5ee43 | 44 | #----------------------------------------------------------------------------- |
6107f243 | 45 | @@ -203,7 +203,7 @@ INSTALL_DATA ?= $(INSTALL) -m 644 |
8edbfa0e JB |
46 | libzstd.pc: |
47 | libzstd.pc: libzstd.pc.in | |
48 | @echo creating pkgconfig | |
49 | - @sed -e 's|@PREFIX@|$(PREFIX)|' \ | |
50 | + sed -e 's|@PREFIX@|$(PREFIX)|' \ | |
8edbfa0e | 51 | -e 's|@VERSION@|$(VERSION)|' \ |
6107f243 AM |
52 | $< >$@ |
53 | ||
73730962 | 54 | @@ -209,39 +209,39 @@ |
46edb54d | 55 | @echo zstd static and shared library installed |
8edbfa0e | 56 | |
46edb54d AM |
57 | install-pc: libzstd.pc |
58 | - @$(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ | |
14b5ee43 | 59 | - @$(INSTALL_DATA) libzstd.pc $(DESTDIR)$(PKGCONFIGDIR)/ |
46edb54d | 60 | + $(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ |
14b5ee43 | 61 | + $(INSTALL_DATA) libzstd.pc $(DESTDIR)$(PKGCONFIGDIR)/ |
46edb54d AM |
62 | |
63 | install-static: libzstd.a | |
64 | @echo Installing static library | |
65 | - @$(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/ | |
66 | - @$(INSTALL_DATA) libzstd.a $(DESTDIR)$(LIBDIR) | |
67 | + $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/ | |
68 | + $(INSTALL_DATA) libzstd.a $(DESTDIR)$(LIBDIR) | |
69 | ||
70 | install-shared: libzstd | |
71 | @echo Installing shared library | |
72 | - @$(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/ | |
73 | - @$(INSTALL_PROGRAM) $(LIBZSTD) $(DESTDIR)$(LIBDIR) | |
74 | - @ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR) | |
75 | - @ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT) | |
76 | + $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/ | |
77 | + $(INSTALL_PROGRAM) $(LIBZSTD) $(DESTDIR)$(LIBDIR) | |
78 | + ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR) | |
79 | + ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT) | |
80 | ||
81 | install-includes: | |
14b5ee43 | 82 | @echo Installing includes |
46edb54d | 83 | - @$(INSTALL) -d -m 755 $(DESTDIR)$(INCLUDEDIR)/ |
14b5ee43 JB |
84 | - @$(INSTALL_DATA) zstd.h $(DESTDIR)$(INCLUDEDIR) |
85 | - @$(INSTALL_DATA) common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR) | |
86 | - @$(INSTALL_DATA) deprecated/zbuff.h $(DESTDIR)$(INCLUDEDIR) # prototypes generate deprecation warnings | |
87 | - @$(INSTALL_DATA) dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR) | |
46edb54d | 88 | + $(INSTALL) -d -m 755 $(DESTDIR)$(INCLUDEDIR)/ |
14b5ee43 JB |
89 | + $(INSTALL_DATA) zstd.h $(DESTDIR)$(INCLUDEDIR) |
90 | + $(INSTALL_DATA) common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR) | |
91 | + $(INSTALL_DATA) deprecated/zbuff.h $(DESTDIR)$(INCLUDEDIR) # prototypes generate deprecation warnings | |
92 | + $(INSTALL_DATA) dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR) | |
8edbfa0e JB |
93 | |
94 | uninstall: | |
46edb54d AM |
95 | - @$(RM) $(DESTDIR)$(LIBDIR)/libzstd.a |
96 | - @$(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT) | |
97 | - @$(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR) | |
98 | - @$(RM) $(DESTDIR)$(LIBDIR)/$(LIBZSTD) | |
99 | - @$(RM) $(DESTDIR)$(PKGCONFIGDIR)/libzstd.pc | |
100 | - @$(RM) $(DESTDIR)$(INCLUDEDIR)/zstd.h | |
101 | - @$(RM) $(DESTDIR)$(INCLUDEDIR)/zstd_errors.h | |
102 | - @$(RM) $(DESTDIR)$(INCLUDEDIR)/zbuff.h # Deprecated streaming functions | |
103 | - @$(RM) $(DESTDIR)$(INCLUDEDIR)/zdict.h | |
104 | + $(RM) $(DESTDIR)$(LIBDIR)/libzstd.a | |
105 | + $(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT) | |
106 | + $(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR) | |
107 | + $(RM) $(DESTDIR)$(LIBDIR)/$(LIBZSTD) | |
108 | + $(RM) $(DESTDIR)$(PKGCONFIGDIR)/libzstd.pc | |
109 | + $(RM) $(DESTDIR)$(INCLUDEDIR)/zstd.h | |
110 | + $(RM) $(DESTDIR)$(INCLUDEDIR)/zstd_errors.h | |
111 | + $(RM) $(DESTDIR)$(INCLUDEDIR)/zbuff.h # Deprecated streaming functions | |
112 | + $(RM) $(DESTDIR)$(INCLUDEDIR)/zdict.h | |
113 | @echo zstd libraries successfully uninstalled | |
114 | ||
115 | endif |