67 lines
2.8 KiB
Diff
67 lines
2.8 KiB
Diff
From: Jan Engelhardt <jengelh@inai.de>
|
|
Date: 2014-10-01 14:23:22.000000000 +0200
|
|
References: https://github.com/Cyan4973/lz4/pull/195
|
|
|
|
build: make programs use liblz too instead of duplicating object code.
|
|
|
|
---
|
|
programs/Makefile | 22 +++++++++++-----------
|
|
1 file changed, 11 insertions(+), 11 deletions(-)
|
|
|
|
Index: lz4-r131/programs/Makefile
|
|
===================================================================
|
|
--- lz4-r131.orig/programs/Makefile
|
|
+++ lz4-r131/programs/Makefile
|
|
@@ -40,7 +40,7 @@ DESTDIR?=
|
|
PREFIX ?= /usr/local
|
|
CFLAGS ?= -O3
|
|
CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -pedantic -DLZ4_VERSION=\"$(RELEASE)\"
|
|
-FLAGS := -I../lib $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
|
|
+FLAGS := -DXXH_NAMESPACE=LZ4_ -I../lib $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
|
|
|
|
BINDIR := $(PREFIX)/bin
|
|
MANDIR := $(PREFIX)/share/man/man1
|
|
@@ -72,32 +72,32 @@ bins: lz4 lz4c fullbench fuzzer frametes
|
|
|
|
all: bins m32
|
|
|
|
-lz4: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/lz4frame.c $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c
|
|
- $(CC) $(FLAGS) $^ -o $@$(EXT)
|
|
+lz4: bench.c lz4io.c lz4cli.c
|
|
+ $(CC) $(FLAGS) $^ -o $@$(EXT) -L${LZ4DIR} -llz4
|
|
|
|
lz4c : $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/lz4frame.c $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c
|
|
- $(CC) $(FLAGS) -DENABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT)
|
|
+ $(CC) $(FLAGS) -DENABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT) -L${LZ4DIR} -llz4
|
|
|
|
lz4c32: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/lz4frame.c $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c
|
|
- $(CC) -m32 $(FLAGS) -DENABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT)
|
|
+ $(CC) -m32 $(FLAGS) -DENABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT) -L${LZ4DIR} -llz4
|
|
|
|
fullbench : $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/lz4frame.c $(LZ4DIR)/xxhash.c fullbench.c
|
|
- $(CC) $(FLAGS) $^ -o $@$(EXT)
|
|
+ $(CC) $(FLAGS) $^ -o $@$(EXT) -L${LZ4DIR} -llz4
|
|
|
|
fullbench32: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/lz4frame.c $(LZ4DIR)/xxhash.c fullbench.c
|
|
- $(CC) -m32 $(FLAGS) $^ -o $@$(EXT)
|
|
+ $(CC) -m32 $(FLAGS) $^ -o $@$(EXT) -L${LZ4DIR} -llz4
|
|
|
|
fuzzer : $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/xxhash.c fuzzer.c
|
|
- $(CC) $(FLAGS) $^ -o $@$(EXT)
|
|
+ $(CC) $(FLAGS) $^ -o $@$(EXT) -L${LZ4DIR} -llz4
|
|
|
|
fuzzer32: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/xxhash.c fuzzer.c
|
|
- $(CC) -m32 $(FLAGS) $^ -o $@$(EXT)
|
|
+ $(CC) -m32 $(FLAGS) $^ -o $@$(EXT) -L${LZ4DIR} -llz4
|
|
|
|
frametest: $(LZ4DIR)/lz4frame.c $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/xxhash.c frametest.c
|
|
- $(CC) $(FLAGS) $^ -o $@$(EXT)
|
|
+ $(CC) $(FLAGS) $^ -o $@$(EXT) -L${LZ4DIR} -llz4
|
|
|
|
frametest32: $(LZ4DIR)/lz4frame.c $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/xxhash.c frametest.c
|
|
- $(CC) -m32 $(FLAGS) $^ -o $@$(EXT)
|
|
+ $(CC) -m32 $(FLAGS) $^ -o $@$(EXT) -L${LZ4DIR} -llz4
|
|
|
|
datagen : datagen.c datagencli.c
|
|
$(CC) $(FLAGS) $^ -o $@$(EXT)
|