summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorYann Collet <yann.collet.73@gmail.com>2014-11-04 19:56:38 (GMT)
committerYann Collet <yann.collet.73@gmail.com>2014-11-04 19:56:38 (GMT)
commit73554386ed8c9b08940411c0e62bbdca3216f8cd (patch)
tree618e58f16d0398e4dbd50e97c12e2a5b6304e2c6 /Makefile
parent4befab0fcc741101c4cfd4b81a6ca60ba5a4dafe (diff)
downloadlz4-73554386ed8c9b08940411c0e62bbdca3216f8cd.zip
lz4-73554386ed8c9b08940411c0e62bbdca3216f8cd.tar.gz
lz4-73554386ed8c9b08940411c0e62bbdca3216f8cd.tar.bz2
Makefile : refactored Travis CI tests
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile16
1 files changed, 6 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index c0b7a6f..586ac5e 100644
--- a/Makefile
+++ b/Makefile
@@ -90,14 +90,10 @@ SOURCES = $(TEXT) $(NONTEXT)
# Select test target for Travis CI's Build Matrix
-ifeq ($(LZ4_TRAVIS_CI_ENV),-dist)
-TRAVIS_TARGET=dist
-else ifeq ($(LZ4_TRAVIS_CI_ENV),-cmake)
-TRAVIS_TARGET=cmake
-else ifeq ($(LZ4_TRAVIS_CI_ENV),-examples)
-TRAVIS_TARGET=examples
+ifneq (,$(filter test-%,$(LZ4_TRAVIS_CI_ENV)))
+TRAVIS_TARGET=prg-travis
else
-TRAVIS_TARGET=test-prg
+TRAVIS_TARGET=$(LZ4_TRAVIS_CI_ENV)
endif
@@ -113,7 +109,7 @@ liblz4: lz4.c lz4hc.c
@echo compiling static library
@$(CC) $(CPPFLAGS) $(CFLAGS) -c $^
@$(AR) rcs liblz4.a lz4.o lz4hc.o
- @echo compiling dynamic library
+ @echo compiling dynamic library $(LIBVER)
@$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER)
@echo creating versioned links
@ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT_MAJOR)
@@ -186,10 +182,10 @@ test-travis: $(TRAVIS_TARGET)
cmake:
@cd cmake_unofficial; cmake CMakeLists.txt; $(MAKE)
-examples:
+streaming-examples:
cd examples; $(MAKE) -e test
-test-prg:
+prg-travis:
@cd $(PRGDIR); $(MAKE) -e test-travis
endif