consolidated vpath

dev
Yann Collet 2020-10-21 04:01:01 -07:00
parent e8eb2939fe
commit 2b99bc29bf
1 changed files with 7 additions and 12 deletions

View File

@ -10,13 +10,13 @@
Q = $(if $(filter 1,$(V) $(VERBOSE)),,@) Q = $(if $(filter 1,$(V) $(VERBOSE)),,@)
# When cross-compiling from linux to windows, you might # When cross-compiling from linux to windows,
# need to specify this as "Windows." Fedora build fails # you might need to specify this as "Windows."
# without it. # Fedora build fails without it.
# #
# Note: mingw-w64 build from linux to windows does not # Note: mingw-w64 build from linux to windows
# fail on other tested distros (ubuntu, debian) even # does not fail on other tested distros (ubuntu, debian)
# without manually specifying the TARGET_SYSTEM. # even without manually specifying the TARGET_SYSTEM.
TARGET_SYSTEM ?= $(OS) TARGET_SYSTEM ?= $(OS)
# Version numbers # Version numbers
@ -167,12 +167,7 @@ CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
ZSTD_FULL_OBJ := $(ZSTD_FILES:.c=.o) ZSTD_FULL_OBJ := $(ZSTD_FILES:.c=.o)
ZSTD_LOCAL_OBJ := $(notdir $(ZSTD_FULL_OBJ)) ZSTD_LOCAL_OBJ := $(notdir $(ZSTD_FULL_OBJ))
vpath %.c ./common vpath %.c common compress decompress dictBuilder legacy deprecated
vpath %.c ./compress
vpath %.c ./decompress
vpath %.c ./dictBuilder
vpath %.c ./legacy
vpath %.c ./deprecated
ZSTD_DYNLIB_DIR := obj/dynlib ZSTD_DYNLIB_DIR := obj/dynlib
ZSTD_DYNLIB_OBJ := $(addprefix $(ZSTD_DYNLIB_DIR)/, $(ZSTD_LOCAL_OBJ)) ZSTD_DYNLIB_OBJ := $(addprefix $(ZSTD_DYNLIB_DIR)/, $(ZSTD_LOCAL_OBJ))