Merge pull request #442 from terrelln/pzstd-build
The static library was moved to libzstd.a
This commit is contained in:
commit
356582b663
@ -170,8 +170,7 @@ roundtrip: test/RoundTripTest$(EXT)
|
||||
# Use the static library that zstd builds for simplicity and
|
||||
# so we get the compiler options correct
|
||||
$(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
|
||||
test/RoundTripTest$(EXT): test/RoundTripTest.o $(PROGDIR)/datagen.o Options.o \
|
||||
|
@ -74,8 +74,8 @@ $(LIBZSTD): $(ZSTD_FILES)
|
||||
@echo compiling dynamic library $(LIBVER)
|
||||
@$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
|
||||
@echo creating versioned links
|
||||
@ln -sf $@.$(SHARED_EXT_VER) libzstd.$(SHARED_EXT_MAJOR)
|
||||
@ln -sf $@.$(SHARED_EXT_VER) libzstd.$(SHARED_EXT)
|
||||
@ln -sf $(LIBZSTD) libzstd.$(SHARED_EXT_MAJOR)
|
||||
@ln -sf $(LIBZSTD) libzstd.$(SHARED_EXT)
|
||||
|
||||
libzstd : $(LIBZSTD)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user