More makefile improvements

3 files changed, 30 insertions, 18 deletions

diff --git a/Makefile b/Makefile
index f5ac12e..df56dcd 100644
--- a/Makefile
+++ b/Makefile
@@ -33,22 +33,30 @@ endif
 
 # Autodetect LUA
 #
-LUA=$(word 1,$(shell which lua5.1$(_LUAEXT)) $(shell which lua51$(_LUAEXT)) $(shell which lua$(_LUAEXT)) $(shell which luajit$(_LUAEXT)))
+LUA:=$(word 1,$(shell which lua5.1$(_LUAEXT) 2>/dev/null) $(shell which lua51$(_LUAEXT) 2>/dev/null) $(shell which lua$(_LUAEXT) 2>/dev/null) $(shell which luajit$(_LUAEXT) 2>/dev/null))
+LUA_VERSION:=$(shell $(LUA) -e "print(string.sub(_VERSION,5,7))")
 
-_TARGET_SO=$(_TARGET_DIR)/core.$(_SO)
+$(info LUA is $(LUA))
+$(info LUA_VERSION is $(LUA_VERSION))
 
-_UNITTEST_TARGET=$(_TARGET_DIR)/UnitTests$(_LUAEXT)
+_TARGET_SO:=$(_TARGET_DIR)/core.$(_SO)
 
-_PREFIX=LUA_CPATH="./src/?.$(_SO)" LUA_PATH="./src/?.lua;./tests/?.lua"
+_UNITTEST_TARGET:=$(_TARGET_DIR)/UnitTests$(_LUAEXT)
+
+_PREFIX:=LUA_CPATH="./src/?.$(_SO)" LUA_PATH="./src/?.lua;./tests/?.lua"
 
 #---
 all: $(_TARGET_SO) $(_UNITTEST_TARGET)
 
 $(_TARGET_SO): src/*.lua src/*.cpp src/*.h src/*.hpp
+        @echo =========================================================================================
         cd src && $(MAKE) LUA=$(LUA)
+        @echo ========== $(_TARGET_SO): DONE!
 
 $(_UNITTEST_TARGET): $(_TARGET_SO)
+        @echo =========================================================================================
         cd unit_tests && $(MAKE)
+        @echo ========== $(_UNITTEST_TARGET): DONE!
 
 clean:
         cd src && $(MAKE) clean
@@ -231,9 +239,9 @@ _perftest:
 #
 # LUA_LIBDIR and LUA_SHAREDIR are used by the .rockspec (don't change the names!)
 #
-DESTDIR=/usr/local
-LUA_LIBDIR=$(DESTDIR)/lib/lua/5.1
-LUA_SHAREDIR=$(DESTDIR)/share/lua/5.1
+DESTDIR:=/usr/local
+LUA_LIBDIR:=$(DESTDIR)/lib/lua/$(LUA_VERSION)
+LUA_SHAREDIR:=$(DESTDIR)/share/lua/$(LUA_VERSION)
 
 #
 # AKa 17-Oct: changed to use 'install -m 644' and 'cp -p'
@@ -243,6 +251,10 @@ install: $(_TARGET_SO) src/lanes.lua
         install -m 644 $(_TARGET_SO) $(LUA_LIBDIR)/lanes
         cp -p src/lanes.lua $(LUA_SHAREDIR)
 
+uninstall:
+        rm $(LUA_LIBDIR)/lanes/core.$(_SO)
+        rm $(LUA_SHAREDIR)/lanes.lua
+
 
 #--- Packaging ---
 #
@@ -286,5 +298,5 @@ run: $(_TARGET_SO)
 echo:
         @echo $(PROGRAMFILES:C=X)
 
-.PROXY: all clean test require debug _nodemo _notest
+.PHONY: all clean debug gdb rock test require install uninstall _nodemo _notest
 
diff --git a/Shared.mk b/Shared.mk
index 56c951c..f6941e1 100644
--- a/Shared.mk
+++ b/Shared.mk
@@ -10,12 +10,12 @@ OPT_FLAGS=-O2
 ifeq "$(findstring MINGW,$(shell uname -s))" "MINGW"
   # MinGW MSYS on Windows
   #
-  _SO=dll
-  _LUAEXT=.exe
-  TIME=timeit.exe
+  _SO:=dll
+  _LUAEXT:=.exe
+  TIME:=timeit.exe
 else
-  _SO=so
-  _LUAEXT=
+  _SO:=so
+  _LUAEXT:=
 endif
 
 ifeq "$(LUAROCKS)" ""
@@ -30,7 +30,7 @@ ifeq "$(LUAROCKS)" ""
       $(warning LUA_DEV not defined - try i.e. 'make LUA_DEV=/c/Program\ Files/Lua/5.1')
       # this assumes Lua was built and installed from source and everything is located in default folders (/usr/local/include and /usr/local/bin)
       LUA_FLAGS:=-I "/usr/local/include"
-      LUA_LIBS:=$(word 1,$(shell which lua54.$(_SO)) $(shell which lua53.$(_SO)) $(shell which lua52.$(_SO)) $(shell which lua51$(_SO)))
+      LUA_LIBS:=$(word 1,$(shell which lua54.$(_SO) 2>/dev/null) $(shell which lua53.$(_SO) 2>/dev/null) $(shell which lua52.$(_SO) 2>/dev/null) $(shell which lua51$(_SO) 2>/dev/null))
     else
       LUA_FLAGS:=-I "$(LUA_DEV)/include"
       LUA_LIBS:="$(LUA_DEV)/lua5.1.dll" -lgcc
diff --git a/src/Makefile b/src/Makefile
index 028ef3a..39b98e6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -9,11 +9,11 @@ include ../Shared.mk
 
 MODULE=lanes
 
-CC= g++ -std=c++20
+CC:= g++ -std=c++20
 
-SRC=$(wildcard *.cpp)
+SRC:=$(wildcard *.cpp)
 
-OBJ=$(SRC:.cpp=.o)
+OBJ:=$(SRC:.cpp=.o)
 
 
 MODULE_DIR=$(MODULE)
@@ -67,4 +67,4 @@ $(WIN32_LUA51)/include/lua.h:
         @echo "                  [MINGW_GCC=...mingw32-gcc]"
         @false
 
-.PROXY: all clean nslu2 win32
+.PHONY: all clean nslu2 win32