From a94c0323cb58d1418ed9ea5777953f3efd16ace4 Mon Sep 17 00:00:00 2001 From: Richard Ipsum Date: Tue, 6 Jun 2017 21:39:13 +0100 Subject: Remove luxio specific stuff from findlua.mk --- findlua.mk | 18 ++++-------------- 1 file 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 -- cgit v1.2.1