From a507a22dbec9ab231f11e9b249bd3a9c65ddef26 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Tue, 10 Apr 2018 14:36:20 +0900 Subject: [PATCH] Fix static link Signed-off-by: Nobuhiro Iwamatsu Gbp-Pq: Name 0002-Fix-static-link.patch --- programs/Makefile | 4 ++-- tests/Makefile | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/Makefile b/programs/Makefile index a51bd4b..bd6829b 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -41,7 +41,7 @@ LIBVER_MINOR := $(shell echo $(LIBVER_MINOR_SCRIPT)) LIBVER_PATCH := $(shell echo $(LIBVER_PATCH_SCRIPT)) LIBVER := $(shell echo $(LIBVER_SCRIPT)) -SRCFILES := $(sort $(wildcard $(LZ4DIR)/*.c) $(wildcard *.c)) +SRCFILES := $(sort $(wildcard $(LZ4DIR)/xxhash.c) $(wildcard *.c)) OBJFILES := $(SRCFILES:.c=.o) CPPFLAGS += -I$(LZ4DIR) -DXXH_NAMESPACE=LZ4_ @@ -76,7 +76,7 @@ all32: CFLAGS+=-m32 all32: all lz4: $(OBJFILES) - $(CC) $(FLAGS) $^ -o $@$(EXT) + $(CC) $(FLAGS) $^ -o $@$(EXT) -L ../lib -llz4 lz4-release: DEBUGFLAGS= lz4-release: lz4 diff --git a/tests/Makefile b/tests/Makefile index 819ba43..c960202 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -44,6 +44,7 @@ CFLAGS += $(DEBUGFLAGS) $(MOREFLAGS) CPPFLAGS:= -I$(LZ4DIR) -I$(PRGDIR) -DXXH_NAMESPACE=LZ4_ FLAGS = $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) +export LD_LIBRARY_PATH += $(LZ4DIR) # Define *.exe as extension for Windows systems ifneq (,$(filter Windows%,$(OS))) @@ -70,7 +71,7 @@ all32: CFLAGS+=-m32 all32: all lz4: - $(MAKE) -C $(PRGDIR) $@ CFLAGS="$(CFLAGS)" + #$(MAKE) -C $(PRGDIR) $@ CFLAGS="$(CFLAGS)" lz4c unlz4 lz4cat: lz4 ln -sf $(LZ4) $(PRGDIR)/$@ -- 2.30.2