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 7c9e359c306e080aeac9a1a0e565545b22b0381a..d1cc3c4d31b329a2e2a13afd56a701ae9fec9bf1 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
@@ -86,7 +86,7 @@ lz4c: lz4
 
 lz4c32: CFLAGS += -m32
 lz4c32 : $(SRCFILES)
-       $(CC) $(FLAGS) $^ -o $@$(EXT)
+       $(CC) $(FLAGS) $^ -o $@$(EXT) -L ../lib -llz4
 
 lz4.1: lz4.1.md $(LIBVER_SRC)
        cat $< | $(MD2ROFF) $(MD2ROFF_FLAGS) | sed -n '/^\.\\\".*/!p' > $@

diff --git a/tests/Makefile b/tests/Makefile
index d67fb9c3d1b69efb6fe2e654d2bda7f0f8d8061d..884624f0e9f7547960c6574ad34dc4e3cb60cfe1 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -43,6 +43,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)))
@@ -69,7 +70,7 @@ all32: CFLAGS+=-m32
 all32: all
 
 lz4:
-       $(MAKE) -C $(PRGDIR) $@ CFLAGS="$(CFLAGS)"
+       # $(MAKE) -C $(PRGDIR) $@ CFLAGS="$(CFLAGS)"
 
 lib liblz4.pc:
        $(MAKE) -C $(LZ4DIR) $@ CFLAGS="$(CFLAGS)"