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 b1751dd2776ef7547065c9effa98bf9b1ecddd62..070d69371bacc8013f1afb9aaefa6566631217ca 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_
@@ -79,10 +79,10 @@ lz4-exe.o: lz4-exe.rc
        $(WINDRES) -i lz4-exe.rc -o lz4-exe.o
 
 lz4: $(OBJFILES) lz4-exe.o
-       $(CC) $(FLAGS) $^ -o $@$(EXT)
+       $(CC) $(FLAGS) $^ -o $@$(EXT) -L ../lib -llz4
 else
 lz4: $(OBJFILES)
-       $(CC) $(FLAGS) $^ -o $@$(EXT)
+       $(CC) $(FLAGS) $^ -o $@$(EXT) -L ../lib -llz4
 endif
 
 
@@ -94,7 +94,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 a289c12a856bb574ff2273441a047c5efaa3d5a6..1f7291f32e54f2a3c650e2e3e7c03a5ecc692c38 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -43,6 +43,8 @@ CFLAGS  += $(DEBUGFLAGS) $(MOREFLAGS)
 CPPFLAGS+= -I$(LZ4DIR) -I$(PRGDIR) -DXXH_NAMESPACE=LZ4_
 FLAGS    = $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
 
+export LD_LIBRARY_PATH += $(LZ4DIR)
+
 include ../Makefile.inc
 
 LZ4 := $(PRGDIR)/lz4$(EXT)
@@ -61,7 +63,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)"