[PATCH 1/2] Fix static link

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

diff --git a/programs/Makefile b/programs/Makefile
index ace0d0374f78c19144cff85e8da29441f0b0674e..fc4d6f18d4772680bd935d55d3ce48c1f1394453 100644 (file)
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -91,10 +91,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) $(OBJFILES) -o $@$(EXT) $(LDLIBS)
+       $(CC) $(FLAGS) $(OBJFILES) -o $@$(EXT) $(LDLIBS) -L ../lib -llz4
 endif
 
 .PHONY: lz4-release
@@ -118,7 +118,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 93a5581c285d4e93a3461ee62637e20b3326a74a..b48070ab503f2dc3307da351c6b11d234004a2f3 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)
@@ -62,7 +64,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)"