summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorPrzemyslaw Skibinski <inikep@gmail.com>2016-11-03 12:12:51 (GMT)
committerPrzemyslaw Skibinski <inikep@gmail.com>2016-11-03 12:12:51 (GMT)
commitb768da8ad801d1b30c0fe24d0b6e48c3e6545771 (patch)
tree0e138c0edf714f44dab445ff0188a3b682a67077 /Makefile
parent3eb143fffa0a557726658d8164e76239dea9245c (diff)
parent59adfd82d6c00c005a88ef5bdd405204d71d5729 (diff)
downloadlz4-b768da8ad801d1b30c0fe24d0b6e48c3e6545771.zip
lz4-b768da8ad801d1b30c0fe24d0b6e48c3e6545771.tar.gz
lz4-b768da8ad801d1b30c0fe24d0b6e48c3e6545771.tar.bz2
Merge remote-tracking branch 'refs/remotes/lz4/dev' into dev
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index d9fbb8c..518ffbd 100644
--- a/Makefile
+++ b/Makefile
@@ -41,8 +41,10 @@ LZ4DIR = lib
# Define nul output
ifneq (,$(filter Windows%,$(OS)))
+EXT = .exe
VOID = nul
else
+EXT =
VOID = /dev/null
endif
@@ -58,14 +60,14 @@ lib:
lz4:
@$(MAKE) -C $(PRGDIR)
- @cp $(PRGDIR)/lz4 .
+ @cp $(PRGDIR)/lz4$(EXT) .
clean:
@$(MAKE) -C $(PRGDIR) $@ > $(VOID)
@$(MAKE) -C $(LZ4DIR) $@ > $(VOID)
@$(MAKE) -C examples $@ > $(VOID)
@$(MAKE) -C versionsTest $@ > $(VOID)
- @$(RM) lz4
+ @$(RM) lz4$(EXT)
@echo Cleaning completed
@@ -89,7 +91,7 @@ test:
$(MAKE) -C $(PRGDIR) test
cmake:
- @cd cmake_unofficial; cmake CMakeLists.txt; $(MAKE)
+ @cd contrib/cmake_unofficial; cmake CMakeLists.txt; $(MAKE)
gpptest: clean
$(MAKE) all CC=g++ CFLAGS="-O3 -I../lib -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror"