ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #442 from terrelln/pzstd-build

Browse Source 
The static library was moved to libzstd.a
This commit is contained in:
Yann Collet
2016-11-03 12:57:07 -07:00
committed by GitHub
parent 861cd06ded c8a9ac312b
commit 356582b663
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/pzstd/Makefile
+1 -2
View File
@@ -170,8 +170,7 @@ roundtrip: test/RoundTripTest$(EXT)
# Use the static library that zstd builds for simplicity and # Use the static library that zstd builds for simplicity and
# so we get the compiler options correct # so we get the compiler options correct
$(ZSTDDIR)/libzstd.a: $(ZSTD_FILES) $(ZSTDDIR)/libzstd.a: $(ZSTD_FILES)
$(MAKE) -C $(ZSTDDIR) libzstd CFLAGS="$(ALL_CFLAGS)" LDFLAGS="$(ALL_LDFLAGS)" CFLAGS="$(ALL_CFLAGS)" LDFLAGS="$(ALL_LDFLAGS)" $(MAKE) -C $(ZSTDDIR) libzstd.a
# Rules to build the tests # Rules to build the tests
test/RoundTripTest$(EXT): test/RoundTripTest.o $(PROGDIR)/datagen.o Options.o \ test/RoundTripTest$(EXT): test/RoundTripTest.o $(PROGDIR)/datagen.o Options.o \
lib/Makefile
+2 -2
View File
@@ -74,8 +74,8 @@ $(LIBZSTD): $(ZSTD_FILES)
@echo compiling dynamic library $(LIBVER) @echo compiling dynamic library $(LIBVER)
@$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@ @$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
@echo creating versioned links @echo creating versioned links
@ln -sf $@.$(SHARED_EXT_VER) libzstd.$(SHARED_EXT_MAJOR) @ln -sf $(LIBZSTD) libzstd.$(SHARED_EXT_MAJOR)
@ln -sf $@.$(SHARED_EXT_VER) libzstd.$(SHARED_EXT) @ln -sf $(LIBZSTD) libzstd.$(SHARED_EXT)
libzstd : $(LIBZSTD) libzstd : $(LIBZSTD)