]>
Commit | Line | Data |
---|---|---|
14b5ee43 JB |
1 | --- zstd-1.1.4/lib/Makefile.orig 2017-04-28 18:58:28.327097113 +0200 |
2 | +++ zstd-1.1.4/lib/Makefile 2017-04-28 19:00:43.553762235 +0200 | |
3 | @@ -69,19 +69,19 @@ | |
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 JB |
9 | |
10 | $(LIBZSTD): LDFLAGS += -shared -fPIC -fvisibility=hidden | |
11 | $(LIBZSTD): $(ZSTD_FILES) | |
8edbfa0e | 12 | @echo compiling dynamic library $(LIBVER) |
a3eb5c88 JB |
13 | ifneq (,$(filter Windows%,$(OS))) |
14 | - @$(CC) $(FLAGS) -DZSTD_DLL_EXPORT=1 -shared $^ -o dll\libzstd.dll | |
15 | + $(CC) $(FLAGS) -DZSTD_DLL_EXPORT=1 -shared $^ -o dll\libzstd.dll | |
16 | dlltool -D dll\libzstd.dll -d dll\libzstd.def -l dll\libzstd.lib | |
17 | else | |
18 | - @$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@ | |
19 | + $(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@ | |
8edbfa0e | 20 | @echo creating versioned links |
a3eb5c88 JB |
21 | - @ln -sf $@ libzstd.$(SHARED_EXT_MAJOR) |
22 | - @ln -sf $@ libzstd.$(SHARED_EXT) | |
23 | + ln -sf $@ libzstd.$(SHARED_EXT_MAJOR) | |
24 | + ln -sf $@ libzstd.$(SHARED_EXT) | |
25 | endif | |
26 | ||
27 | libzstd : $(LIBZSTD) | |
14b5ee43 JB |
28 | @@ -92,10 +92,10 @@ |
29 | lib-release: lib | |
8edbfa0e JB |
30 | |
31 | clean: | |
14b5ee43 JB |
32 | - @$(RM) -r *.dSYM # Mac OS-X specific |
33 | - @$(RM) core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc | |
34 | - @$(RM) dll/libzstd.dll dll/libzstd.lib | |
35 | - @$(RM) common/*.o compress/*.o decompress/*.o dictBuilder/*.o legacy/*.o deprecated/*.o | |
36 | + $(RM) -r *.dSYM # Mac OS-X specific | |
37 | + $(RM) core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc | |
38 | + $(RM) dll/libzstd.dll dll/libzstd.lib | |
39 | + $(RM) common/*.o compress/*.o decompress/*.o dictBuilder/*.o legacy/*.o deprecated/*.o | |
8edbfa0e JB |
40 | @echo Cleaning library completed |
41 | ||
14b5ee43 JB |
42 | #----------------------------------------------------------------------------- |
43 | @@ -127,25 +127,25 @@ | |
8edbfa0e JB |
44 | libzstd.pc: |
45 | libzstd.pc: libzstd.pc.in | |
46 | @echo creating pkgconfig | |
47 | - @sed -e 's|@PREFIX@|$(PREFIX)|' \ | |
48 | + sed -e 's|@PREFIX@|$(PREFIX)|' \ | |
49 | -e 's|@LIBDIR@|$(LIBDIR)|' \ | |
50 | -e 's|@INCLUDEDIR@|$(INCLUDEDIR)|' \ | |
51 | -e 's|@VERSION@|$(VERSION)|' \ | |
52 | $< >$@ | |
53 | ||
a3eb5c88 | 54 | install: libzstd.a libzstd libzstd.pc |
14b5ee43 JB |
55 | - @$(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ $(DESTDIR)$(INCLUDEDIR)/ |
56 | - @$(INSTALL_DATA) libzstd.pc $(DESTDIR)$(PKGCONFIGDIR)/ | |
57 | + $(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ $(DESTDIR)$(INCLUDEDIR)/ | |
58 | + $(INSTALL_DATA) libzstd.pc $(DESTDIR)$(PKGCONFIGDIR)/ | |
59 | @echo Installing libraries | |
60 | - @$(INSTALL_LIB) libzstd.a $(DESTDIR)$(LIBDIR) | |
61 | - @$(INSTALL_LIB) libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR) | |
62 | - @ln -sf libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR) | |
63 | - @ln -sf libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT) | |
64 | + $(INSTALL_LIB) libzstd.a $(DESTDIR)$(LIBDIR) | |
65 | + $(INSTALL_LIB) libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR) | |
66 | + ln -sf libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR) | |
67 | + ln -sf libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT) | |
68 | @echo Installing includes | |
69 | - @$(INSTALL_DATA) zstd.h $(DESTDIR)$(INCLUDEDIR) | |
70 | - @$(INSTALL_DATA) common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR) | |
71 | - @$(INSTALL_DATA) deprecated/zbuff.h $(DESTDIR)$(INCLUDEDIR) # prototypes generate deprecation warnings | |
72 | - @$(INSTALL_DATA) dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR) | |
73 | + $(INSTALL_DATA) zstd.h $(DESTDIR)$(INCLUDEDIR) | |
74 | + $(INSTALL_DATA) common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR) | |
75 | + $(INSTALL_DATA) deprecated/zbuff.h $(DESTDIR)$(INCLUDEDIR) # prototypes generate deprecation warnings | |
76 | + $(INSTALL_DATA) dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR) | |
8edbfa0e JB |
77 | @echo zstd static and shared library installed |
78 | ||
79 | uninstall: |