diff options
| author | JPeterMugaas <jpmugaas@suddenlink.net> | 2019-04-22 19:48:48 (GMT) |
|---|---|---|
| committer | JPeterMugaas <jpmugaas@suddenlink.net> | 2019-04-22 19:48:48 (GMT) |
| commit | b48f823f907e7763ed4178726c00453fb2af7a28 (patch) | |
| tree | 85689a795652cd9eb8281a98024ac04012eb5735 /lib | |
| parent | 773b66547f84792fd4143e605ca27f31c2989945 (diff) | |
| download | lz4-b48f823f907e7763ed4178726c00453fb2af7a28.zip lz4-b48f823f907e7763ed4178726c00453fb2af7a28.tar.gz lz4-b48f823f907e7763ed4178726c00453fb2af7a28.tar.bz2 | |
Try to put some tests I made in ONE place. I also moved a test for "install" in one place to try to isolate it.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/lib/Makefile b/lib/Makefile index 4e96b57..0546031 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -45,10 +45,6 @@ LIBVER := $(shell echo $(LIBVER_SCRIPT)) BUILD_SHARED:=yes BUILD_STATIC:=yes -TARGET_OS ?= $(shell uname) -ifeq ($(TARGET_OS),) - TARGET_OS ?= $(OS) -endif CPPFLAGS+= -DXXH_NAMESPACE=LZ4_ CFLAGS ?= -O3 DEBUGFLAGS:= -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \ @@ -74,27 +70,7 @@ else SHARED_EXT_VER = $(SHARED_EXT).$(LIBVER) endif -WINBASED = yes -ifneq (,$(filter Windows%,$(TARGET_OS))) -LIBLZ4 = liblz4-$(LIBVER_MAJOR) -LIBLZ4_EXP = liblz4.lib -else -LIBLZ4_EXP = liblz4.dll.a -ifneq (,$(filter MINGW%,$(TARGET_OS))) -LIBLZ4 = liblz4 -else -ifneq (,$(filter MSYS%,$(TARGET_OS))) -LIBLZ4 = msys-lz4-$(LIBVER_MAJOR) -else -ifneq (,$(filter CYGWIN%,$(TARGET_OS))) -LIBLZ4 = cyglz4-$(LIBVER_MAJOR) -else -LIBLZ4 = liblz4.$(SHARED_EXT_VER) -WINBASED = no -endif -endif -endif -endif +include ../Makefile.inc .PHONY: default default: lib-release @@ -147,7 +123,7 @@ clean: #----------------------------------------------------------------------------- # make install is validated only for Linux, OSX, BSD, Hurd and Solaris targets #----------------------------------------------------------------------------- -ifneq (,$(filter Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku MidnightBSD MINGW32_NT% MINGW64_NT% MSYS% CYGWIN_NT%,$(shell uname))) +ifeq ($(POSIX_ENV),yes) .PHONY: listL120 listL120: # extract lines >= 120 characters in *.{c,h}, by Takayuki Matsuoka (note : $$, for Makefile compatibility) |