summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Ipsum <richardipsum@fastmail.co.uk>2017-06-06 21:39:13 +0100
committerRichard Ipsum <richardipsum@fastmail.co.uk>2017-06-17 14:10:33 +0100
commita94c0323cb58d1418ed9ea5777953f3efd16ace4 (patch)
treee51af66ab44ff5f882d37b53e6fd0c805b0fbc0e
parent10abc615fae65f23ec0dbe03591e32b06fa8ff5e (diff)
downloadlua-scrypt-git-a94c0323cb58d1418ed9ea5777953f3efd16ace4.tar.gz
Remove luxio specific stuff from findlua.mk
-rw-r--r--findlua.mk18
1 files changed, 4 insertions, 14 deletions
diff --git a/findlua.mk b/findlua.mk
index 45012b7..4ac2684 100644
--- a/findlua.mk
+++ b/findlua.mk
@@ -3,20 +3,10 @@ ifeq ($(strip $(shell which pkg-config > /dev/null || echo NONE)),NONE)
endif
ifeq ($(strip $(shell which $(CC) > /dev/null || echo NONE)),NONE)
- $(info Luxio: Hmm, CC make variable contains nonsense. Overriding to gcc.)
+ $(info lua-scrypt: Hmm, CC make variable contains nonsense. Overriding to gcc.)
CC := gcc
endif
-# This isn't nice. Find a nice way.
-HOST_OS := $(shell uname -s)
-
-ifneq ($(findstring $(HOST_OS),Linux NetBSD GNU/kFreeBSD),)
- # These operating systems require a seperate Real Time library
- EXTRA_LIBS := -lrt
-else
- EXTRA_LIBS :=
-endif
-
NAKED_LUA_VER := $(shell (pkg-config --exists lua && \
pkg-config --modversion lua || \
pkg-config --variable V lua) | cut -d. -f1-2)
@@ -45,7 +35,7 @@ ifeq ($$(LUA$(1)_PKG),NONE)
endif
ifneq ($$(LUA$(1)_PKG),NONE)
- $$(info Luxio: Lua $(2) package name on this system is $$(LUA$(1)_PKG))
+ $$(info lua-scrypt: Lua $(2) package name on this system is $$(LUA$(1)_PKG))
LUA$(1)_HAS_MODINST := $$(shell test x`pkg-config --variable INSTALL_LMOD $$(LUA$(1)_PKG)` != x && echo YES)
LUA$(1)_INC := $$(shell pkg-config --cflags $$(LUA$(1)_PKG))
LUA$(1)_LIB := $$(shell pkg-config --libs $$(LUA$(1)_PKG))
@@ -68,11 +58,11 @@ ifneq ($$(LUA$(1)_PKG),NONE)
else
.PHONY: lua-$(2)-try
lua-$(2)-try:
- @echo Luxio: Lua $(2) could not be found, so luxio was not built for it.
+ @echo lua-scrypt: Lua $(2) could not be found, so lua-scrypt was not built for it.
.PHONY: lua-$(2)-try-install
lua-$(2)-try-install:
- @echo Luxio: Lua $(2) could not be found, so luxio was not installed for it.
+ @echo lua-scrypt: Lua $(2) could not be found, so lua-scrypt was not installed for it.
endif
endef