2014-11-28 19:13:39 +00:00
|
|
|
From: Jan Engelhardt <jengelh@inai.de>
|
|
|
|
|
Date: 2014-10-01 14:23:22.000000000 +0200
|
2016-04-02 23:56:32 +00:00
|
|
|
References: https://github.com/Cyan4973/lz4/pull/195
|
2014-11-28 19:13:39 +00:00
|
|
|
|
2016-04-02 19:30:27 +00:00
|
|
|
build: make programs use liblz too instead of duplicating object code.
|
2014-11-28 19:13:39 +00:00
|
|
|
|
2014-07-16 14:42:40 +00:00
|
|
|
---
|
2017-07-05 23:54:59 +00:00
|
|
|
programs/Makefile | 10 +++++-----
|
|
|
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
2014-07-16 14:42:40 +00:00
|
|
|
|
2017-07-05 23:54:59 +00:00
|
|
|
Index: lz4-1.7.5/programs/Makefile
|
2014-07-16 14:42:40 +00:00
|
|
|
===================================================================
|
2017-07-05 23:54:59 +00:00
|
|
|
--- lz4-1.7.5.orig/programs/Makefile
|
|
|
|
|
+++ lz4-1.7.5/programs/Makefile
|
|
|
|
|
@@ -40,7 +40,7 @@ LIBVER := $(shell echo $(LIBVER_SCRIPT)
|
2016-04-02 23:45:52 +00:00
|
|
|
|
2017-07-05 23:54:59 +00:00
|
|
|
LZ4DIR := ../lib
|
2014-07-16 14:42:40 +00:00
|
|
|
|
2017-07-05 23:54:59 +00:00
|
|
|
-SRCFILES := $(wildcard $(LZ4DIR)/*.c) $(wildcard *.c)
|
|
|
|
|
+SRCFILES := $(wildcard *.c)
|
|
|
|
|
OBJFILES := $(patsubst %.c,%.o,$(SRCFILES))
|
2014-07-16 14:42:40 +00:00
|
|
|
|
2017-07-05 23:54:59 +00:00
|
|
|
CPPFLAGS+= -I$(LZ4DIR) -DXXH_NAMESPACE=LZ4_
|
|
|
|
|
@@ -75,19 +75,19 @@ all32: CFLAGS+=-m32
|
|
|
|
|
all32: all
|
2014-07-16 14:42:40 +00:00
|
|
|
|
2017-07-05 23:54:59 +00:00
|
|
|
lz4: CFLAGS += $(DEBUGFLAGS)
|
|
|
|
|
-lz4: $(OBJFILES)
|
|
|
|
|
- $(CC) $(FLAGS) $^ -o $@$(EXT)
|
|
|
|
|
+lz4: $(SRCFILES)
|
|
|
|
|
+ $(CC) $(FLAGS) $^ -o $@$(EXT) -L${LZ4DIR} -llz4
|
2016-04-02 19:30:27 +00:00
|
|
|
|
2017-07-05 23:54:59 +00:00
|
|
|
lz4-release: DEBUGFLAGS=
|
|
|
|
|
lz4-release: lz4
|
2016-04-02 23:45:52 +00:00
|
|
|
|
2017-07-05 23:54:59 +00:00
|
|
|
lz4c : CFLAGS += $(DEBUGFLAGS)
|
|
|
|
|
lz4c : $(SRCFILES)
|
|
|
|
|
- $(CC) $(FLAGS) -DENABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT)
|
|
|
|
|
+ $(CC) $(FLAGS) -DENABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT) -L${LZ4DIR} -llz4
|
2016-04-02 23:45:52 +00:00
|
|
|
|
2017-07-05 23:54:59 +00:00
|
|
|
lz4c32: CFLAGS += -m32 $(DEBUGFLAGS)
|
|
|
|
|
lz4c32: $(SRCFILES)
|
|
|
|
|
- $(CC) $(FLAGS) $^ -o $@$(EXT)
|
|
|
|
|
+ $(CC) $(FLAGS) $^ -o $@$(EXT) -L${LZ4DIR} -llz4
|
2016-04-02 23:45:52 +00:00
|
|
|
|
2017-07-05 23:54:59 +00:00
|
|
|
clean:
|
|
|
|
|
@$(MAKE) -C $(LZ4DIR) $@ > $(VOID)
|
