---- zstd-0.5.1/lib/Makefile.orig 2016-02-18 12:04:02.000000000 +0100
-+++ zstd-0.5.1/lib/Makefile 2016-04-09 17:32:37.197974571 +0200
-@@ -85,16 +85,16 @@
-
- libzstd: $(ZSTD_FILES)
+--- zstd-1.1.2/lib/Makefile.orig 2016-12-26 12:13:28.026947087 +0100
++++ zstd-1.1.2/lib/Makefile 2016-12-26 12:27:54.386937195 +0100
+@@ -67,20 +67,20 @@
+ libzstd.a: ARFLAGS = rcs
+ libzstd.a: $(ZSTD_FILES)
@echo compiling static library
- @$(CC) $(FLAGS) -c $^
-- @$(AR) rcs $@.a *.o
+- @$(AR) $(ARFLAGS) $@ *.o
+ $(CC) $(FLAGS) -c $^
-+ $(AR) rcs $@.a *.o
++ $(AR) $(ARFLAGS) $@ *.o
+
+ $(LIBZSTD): LDFLAGS += -shared -fPIC -fvisibility=hidden
+ $(LIBZSTD): $(ZSTD_FILES)
@echo compiling dynamic library $(LIBVER)
-- @$(CC) $(FLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER)
-+ $(CC) $(FLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER)
+ ifneq (,$(filter Windows%,$(OS)))
+- @$(CC) $(FLAGS) -DZSTD_DLL_EXPORT=1 -shared $^ -o dll\libzstd.dll
++ $(CC) $(FLAGS) -DZSTD_DLL_EXPORT=1 -shared $^ -o dll\libzstd.dll
+ dlltool -D dll\libzstd.dll -d dll\libzstd.def -l dll\libzstd.lib
+ else
+- @$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
++ $(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
@echo creating versioned links
-- @ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT_MAJOR)
-- @ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT)
-+ ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT_MAJOR)
-+ ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT)
+- @ln -sf $@ libzstd.$(SHARED_EXT_MAJOR)
+- @ln -sf $@ libzstd.$(SHARED_EXT)
++ ln -sf $@ libzstd.$(SHARED_EXT_MAJOR)
++ ln -sf $@ libzstd.$(SHARED_EXT)
+ endif
+
+ libzstd : $(LIBZSTD)
+@@ -88,8 +88,8 @@
+ lib: libzstd.a libzstd
clean:
-- @rm -f core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc
-+ rm -f core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc
+- @$(RM) core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc dll/libzstd.dll dll/libzstd.lib
+- @$(RM) decompress/*.o
++ $(RM) core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc dll/libzstd.dll dll/libzstd.lib
++ $(RM) decompress/*.o
@echo Cleaning library completed
#------------------------------------------------------------------------
-@@ -104,33 +104,33 @@
+@@ -99,35 +99,35 @@
libzstd.pc:
libzstd.pc: libzstd.pc.in
@echo creating pkgconfig
-e 's|@VERSION@|$(VERSION)|' \
$< >$@
- install: libzstd libzstd.pc
+ install: libzstd.a libzstd libzstd.pc
- @install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
-- @install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
+- @install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)
- @cp -a libzstd.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)
- @cp -a libzstd.$(SHARED_EXT) $(DESTDIR)$(LIBDIR)
- @cp -a libzstd.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
-- @install -m 644 libzstd.a $(DESTDIR)$(LIBDIR)/libzstd.a
-- @install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h
-- @install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zbuff.h
-- @install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zdict.h
+- @install -m 644 libzstd.a $(DESTDIR)$(LIBDIR)
+- @install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)
+- @install -m 644 common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR)
+- @install -m 644 deprecated/zbuff.h $(DESTDIR)$(INCLUDEDIR) # prototypes generate deprecation warnings
+- @install -m 644 dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)
+ install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
-+ install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
++ install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)
+ cp -a libzstd.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)
+ cp -a libzstd.$(SHARED_EXT) $(DESTDIR)$(LIBDIR)
+ cp -a libzstd.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
-+ install -m 644 libzstd.a $(DESTDIR)$(LIBDIR)/libzstd.a
-+ install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h
-+ install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zbuff.h
-+ install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zdict.h
++ install -m 644 libzstd.a $(DESTDIR)$(LIBDIR)
++ install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)
++ install -m 644 common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR)
++ install -m 644 deprecated/zbuff.h $(DESTDIR)$(INCLUDEDIR) # prototypes generate deprecation warnings
++ install -m 644 dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)
@echo zstd static and shared library installed
uninstall:
-- @rm -f $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
-- @rm -f $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
-- @rm -f $(DESTDIR)$(LIBDIR)/pkgconfig/libzstd.pc
-- @[ -x $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER) ] && rm -f $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
-- @[ -f $(DESTDIR)$(LIBDIR)/libzstd.a ] && rm -f $(DESTDIR)$(LIBDIR)/libzstd.a
-- @[ -f $(DESTDIR)$(INCLUDEDIR)/zstd.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/zstd.h
-- @[ -f $(DESTDIR)$(INCLUDEDIR)/zstd.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/zbuff.h
-- @[ -f $(DESTDIR)$(INCLUDEDIR)/zstd.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/zdict.h
-+ rm -f $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
-+ rm -f $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
-+ rm -f $(DESTDIR)$(LIBDIR)/pkgconfig/libzstd.pc
-+ [ -x $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER) ] && rm -f $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
-+ [ -f $(DESTDIR)$(LIBDIR)/libzstd.a ] && rm -f $(DESTDIR)$(LIBDIR)/libzstd.a
-+ [ -f $(DESTDIR)$(INCLUDEDIR)/zstd.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/zstd.h
-+ [ -f $(DESTDIR)$(INCLUDEDIR)/zstd.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/zbuff.h
-+ [ -f $(DESTDIR)$(INCLUDEDIR)/zstd.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/zdict.h
+- @$(RM) $(DESTDIR)$(LIBDIR)/libzstd.a
+- @$(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
+- @$(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
+- @$(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
+- @$(RM) $(DESTDIR)$(LIBDIR)/pkgconfig/libzstd.pc
+- @$(RM) $(DESTDIR)$(INCLUDEDIR)/zstd.h
+- @$(RM) $(DESTDIR)$(INCLUDEDIR)/zstd_errors.h
+- @$(RM) $(DESTDIR)$(INCLUDEDIR)/zbuff.h # Deprecated streaming functions
+- @$(RM) $(DESTDIR)$(INCLUDEDIR)/zdict.h
++ $(RM) $(DESTDIR)$(LIBDIR)/libzstd.a
++ $(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
++ $(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
++ $(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
++ $(RM) $(DESTDIR)$(LIBDIR)/pkgconfig/libzstd.pc
++ $(RM) $(DESTDIR)$(INCLUDEDIR)/zstd.h
++ $(RM) $(DESTDIR)$(INCLUDEDIR)/zstd_errors.h
++ $(RM) $(DESTDIR)$(INCLUDEDIR)/zbuff.h # Deprecated streaming functions
++ $(RM) $(DESTDIR)$(INCLUDEDIR)/zdict.h
@echo zstd libraries successfully uninstalled
endif
projects / packages / zstd.git / blobdiff