Fix static link

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org>
Gbp-Pq: Name 0002-Fix-static-link.patch

diff --git a/programs/Makefile b/programs/Makefile
index a51bd4b0fdaafd7df1b83f3c44c5893d256754f8..bd6829bca81335bbe69712ccf38287adfca3f1e7 100644 (file)
--- 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 819ba43ce73d0c9ed7d62119df195be21df1835f..c960202fabd164d07f8941d9b0ed9dc0c63625c2 100644 (file)
--- 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)/$@