diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2017-06-26 09:07:09 (GMT) |
|---|---|---|
| committer | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2017-06-26 10:32:40 (GMT) |
| commit | e14b4c5a3eceb8ea9490b29031a94863187062ed (patch) | |
| tree | 90b8df3f76b1e2962d9df80b7f530675add40fe5 | |
| parent | 1525fd1f52940e9acb0df094b3e6ee5d0a36e4f3 (diff) | |
| download | lz4-e14b4c5a3eceb8ea9490b29031a94863187062ed.zip lz4-e14b4c5a3eceb8ea9490b29031a94863187062ed.tar.gz lz4-e14b4c5a3eceb8ea9490b29031a94863187062ed.tar.bz2 | |
tests/Makefile: don't use LIBDIR as variable
LIBDIR may be overriden with a environment variable: In this case make
clean breaks in tests/. Use another variable name.
| -rw-r--r-- | tests/Makefile | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/Makefile b/tests/Makefile index 07bf401..5d2532f 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -34,7 +34,7 @@ DESTDIR ?= PREFIX ?= /usr/local BINDIR := $(PREFIX)/bin MANDIR := $(PREFIX)/share/man/man1 -LIBDIR := ../lib +LZ4DIR := ../lib PRGDIR := ../programs VOID := /dev/null TESTDIR := versionsTest @@ -45,7 +45,7 @@ CFLAGS += -g -Wall -Wextra -Wundef -Wcast-qual -Wcast-align -Wshadow -Wswitch-e -Wdeclaration-after-statement -Wstrict-prototypes \ -Wpointer-arith -Wstrict-aliasing=1 CFLAGS += $(MOREFLAGS) -CPPFLAGS:= -I$(LIBDIR) -I$(PRGDIR) -DXXH_NAMESPACE=LZ4_ +CPPFLAGS:= -I$(LZ4DIR) -I$(PRGDIR) -DXXH_NAMESPACE=LZ4_ FLAGS = $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) @@ -81,31 +81,31 @@ lz4c32: # create a 32-bits version for 32/64 interop tests $(MAKE) -C $(PRGDIR) clean $@ CFLAGS="-m32 $(CFLAGS)" cp $(LZ4) $(LZ4)c32 -fullbench : $(LIBDIR)/lz4.o $(LIBDIR)/lz4hc.o $(LIBDIR)/lz4frame.o $(LIBDIR)/xxhash.o fullbench.c +fullbench : $(LZ4DIR)/lz4.o $(LZ4DIR)/lz4hc.o $(LZ4DIR)/lz4frame.o $(LZ4DIR)/xxhash.o fullbench.c $(CC) $(FLAGS) $^ -o $@$(EXT) -fullbench-lib: fullbench.c $(LIBDIR)/xxhash.c - $(MAKE) -C $(LIBDIR) liblz4.a - $(CC) $(FLAGS) $^ -o $@$(EXT) $(LIBDIR)/liblz4.a +fullbench-lib: fullbench.c $(LZ4DIR)/xxhash.c + $(MAKE) -C $(LZ4DIR) liblz4.a + $(CC) $(FLAGS) $^ -o $@$(EXT) $(LZ4DIR)/liblz4.a -fullbench-dll: fullbench.c $(LIBDIR)/xxhash.c - $(MAKE) -C $(LIBDIR) liblz4 - $(CC) $(FLAGS) $^ -o $@$(EXT) -DLZ4_DLL_IMPORT=1 $(LIBDIR)/dll/liblz4.dll +fullbench-dll: fullbench.c $(LZ4DIR)/xxhash.c + $(MAKE) -C $(LZ4DIR) liblz4 + $(CC) $(FLAGS) $^ -o $@$(EXT) -DLZ4_DLL_IMPORT=1 $(LZ4DIR)/dll/liblz4.dll -fuzzer : $(LIBDIR)/lz4.o $(LIBDIR)/lz4hc.o $(LIBDIR)/xxhash.o fuzzer.c +fuzzer : $(LZ4DIR)/lz4.o $(LZ4DIR)/lz4hc.o $(LZ4DIR)/xxhash.o fuzzer.c $(CC) $(FLAGS) $^ -o $@$(EXT) -frametest: $(LIBDIR)/lz4frame.o $(LIBDIR)/lz4.o $(LIBDIR)/lz4hc.o $(LIBDIR)/xxhash.o frametest.c +frametest: $(LZ4DIR)/lz4frame.o $(LZ4DIR)/lz4.o $(LZ4DIR)/lz4hc.o $(LZ4DIR)/xxhash.o frametest.c $(CC) $(FLAGS) $^ -o $@$(EXT) -fasttest: $(LIBDIR)/lz4.o fasttest.c +fasttest: $(LZ4DIR)/lz4.o fasttest.c $(CC) $(FLAGS) $^ -o $@$(EXT) datagen : $(PRGDIR)/datagen.c datagencli.c $(CC) $(FLAGS) -I$(PRGDIR) $^ -o $@$(EXT) clean: - @$(MAKE) -C $(LIBDIR) $@ > $(VOID) + @$(MAKE) -C $(LZ4DIR) $@ > $(VOID) @$(MAKE) -C $(PRGDIR) $@ > $(VOID) @$(RM) core *.o *.test tmp* \ fullbench-dll$(EXT) fullbench-lib$(EXT) \ |