Merge pull request #596 from ldv-alt/dev

programs/Makefile: remove zstd-internal target
This commit is contained in:
Yann Collet 2017-03-09 18:36:45 -08:00 committed by GitHub
commit a404cafcf0

View File

@ -83,8 +83,11 @@ all: zstd
$(ZSTDDECOMP_O): CFLAGS += $(ALIGN_LOOP)
zstd-internal : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
zstd-internal : $(ZSTDLIB_OBJ) zstdcli.o fileio.o bench.o datagen.o dibio.o
zstd : CPPFLAGS += $(ZLIBCPP)
zstd : LDFLAGS += $(ZLIBLD)
zstd-nogz : HAVE_ZLIB=0
zstd zstd-nogz : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
zstd zstd-nogz : $(ZSTDLIB_OBJ) zstdcli.o fileio.o bench.o datagen.o dibio.o
ifeq ($(HAVE_ZLIB), 1)
@echo "==> building zstd with .gz decompression support "
else
@ -95,13 +98,6 @@ ifneq (,$(filter Windows%,$(OS)))
endif
$(CC) $(FLAGS) $^ $(RES_FILE) -o zstd$(EXT) $(LDFLAGS)
zstd-nogz : HAVE_ZLIB=0
zstd-nogz : zstd-internal
zstd : CPPFLAGS += $(ZLIBCPP)
zstd : LDFLAGS += $(ZLIBLD)
zstd : zstd-internal
zstd-release: DEBUGFLAGS :=
zstd-release: zstd