| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From d4768d9e29b805096a86aa13c0d30ee8215af4df Mon Sep 17 00:00:00 2001 |
| 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| 3 | Date: Mon, 26 Jun 2017 12:07:09 +0300 |
| 4 | Subject: [PATCH] tests/Makefile: don't use LIBDIR as variable |
| 5 | |
| 6 | LIBDIR may be overriden with a environment variable: In this case make |
| 7 | clean breaks. Use another variable name. |
| 8 | |
| 9 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| 10 | Upstream-Status: Backport |
| 11 | --- |
| 12 | tests/Makefile | 26 +++++++++++++------------- |
| 13 | 1 file changed, 13 insertions(+), 13 deletions(-) |
| 14 | |
| 15 | diff --git a/tests/Makefile b/tests/Makefile |
| 16 | index 97fa782..51dd038 100644 |
| 17 | --- a/tests/Makefile |
| 18 | +++ b/tests/Makefile |
| 19 | @@ -32,7 +32,7 @@ DESTDIR ?= |
| 20 | PREFIX ?= /usr/local |
| 21 | BINDIR := $(PREFIX)/bin |
| 22 | MANDIR := $(PREFIX)/share/man/man1 |
| 23 | -LIBDIR := ../lib |
| 24 | +LZ4DIR := ../lib |
| 25 | PRGDIR := ../programs |
| 26 | VOID := /dev/null |
| 27 | TESTDIR := versionsTest |
| 28 | @@ -43,7 +43,7 @@ CFLAGS += -g -Wall -Wextra -Wundef -Wcast-qual -Wcast-align -Wshadow -Wswitch-e |
| 29 | -Wdeclaration-after-statement -Wstrict-prototypes \ |
| 30 | -Wpointer-arith -Wstrict-aliasing=1 |
| 31 | CFLAGS += $(MOREFLAGS) |
| 32 | -CPPFLAGS:= -I$(LIBDIR) -I$(PRGDIR) -DXXH_NAMESPACE=LZ4_ |
| 33 | +CPPFLAGS:= -I$(LZ4DIR) -I$(PRGDIR) -DXXH_NAMESPACE=LZ4_ |
| 34 | FLAGS = $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) |
| 35 | |
| 36 | |
| 37 | @@ -79,31 +79,31 @@ lz4c32: # create a 32-bits version for 32/64 interop tests |
| 38 | $(MAKE) -C $(PRGDIR) clean $@ CFLAGS="-m32 $(CFLAGS)" |
| 39 | cp $(LZ4) $(LZ4)c32 |
| 40 | |
| 41 | -fullbench : $(LIBDIR)/lz4.o $(LIBDIR)/lz4hc.o $(LIBDIR)/lz4frame.o $(LIBDIR)/xxhash.o fullbench.c |
| 42 | +fullbench : $(LZ4DIR)/lz4.o $(LZ4DIR)/lz4hc.o $(LZ4DIR)/lz4frame.o $(LZ4DIR)/xxhash.o fullbench.c |
| 43 | $(CC) $(FLAGS) $^ -o $@$(EXT) |
| 44 | |
| 45 | -fullbench-lib: fullbench.c $(LIBDIR)/xxhash.c |
| 46 | - $(MAKE) -C $(LIBDIR) liblz4.a |
| 47 | - $(CC) $(FLAGS) $^ -o $@$(EXT) $(LIBDIR)/liblz4.a |
| 48 | +fullbench-lib: fullbench.c $(LZ4DIR)/xxhash.c |
| 49 | + $(MAKE) -C $(LZ4DIR) liblz4.a |
| 50 | + $(CC) $(FLAGS) $^ -o $@$(EXT) $(LZ4DIR)/liblz4.a |
| 51 | |
| 52 | -fullbench-dll: fullbench.c $(LIBDIR)/xxhash.c |
| 53 | - $(MAKE) -C $(LIBDIR) liblz4 |
| 54 | - $(CC) $(FLAGS) $^ -o $@$(EXT) -DLZ4_DLL_IMPORT=1 $(LIBDIR)/dll/liblz4.dll |
| 55 | +fullbench-dll: fullbench.c $(LZ4DIR)/xxhash.c |
| 56 | + $(MAKE) -C $(LZ4DIR) liblz4 |
| 57 | + $(CC) $(FLAGS) $^ -o $@$(EXT) -DLZ4_DLL_IMPORT=1 $(LZ4DIR)/dll/liblz4.dll |
| 58 | |
| 59 | -fuzzer : $(LIBDIR)/lz4.o $(LIBDIR)/lz4hc.o $(LIBDIR)/xxhash.o fuzzer.c |
| 60 | +fuzzer : $(LZ4DIR)/lz4.o $(LZ4DIR)/lz4hc.o $(LZ4DIR)/xxhash.o fuzzer.c |
| 61 | $(CC) $(FLAGS) $^ -o $@$(EXT) |
| 62 | |
| 63 | -frametest: $(LIBDIR)/lz4frame.o $(LIBDIR)/lz4.o $(LIBDIR)/lz4hc.o $(LIBDIR)/xxhash.o frametest.c |
| 64 | +frametest: $(LZ4DIR)/lz4frame.o $(LZ4DIR)/lz4.o $(LZ4DIR)/lz4hc.o $(LZ4DIR)/xxhash.o frametest.c |
| 65 | $(CC) $(FLAGS) $^ -o $@$(EXT) |
| 66 | |
| 67 | -fasttest: $(LIBDIR)/lz4.o fasttest.c |
| 68 | +fasttest: $(LZ4DIR)/lz4.o fasttest.c |
| 69 | $(CC) $(FLAGS) $^ -o $@$(EXT) |
| 70 | |
| 71 | datagen : $(PRGDIR)/datagen.c datagencli.c |
| 72 | $(CC) $(FLAGS) -I$(PRGDIR) $^ -o $@$(EXT) |
| 73 | |
| 74 | clean: |
| 75 | - @$(MAKE) -C $(LIBDIR) $@ > $(VOID) |
| 76 | + @$(MAKE) -C $(LZ4DIR) $@ > $(VOID) |
| 77 | @$(MAKE) -C $(PRGDIR) $@ > $(VOID) |
| 78 | @$(RM) core *.o *.test tmp* \ |
| 79 | fullbench-dll$(EXT) fullbench-lib$(EXT) \ |
| 80 | -- |
| 81 | 2.1.4 |
| 82 | |