11 files changed, 196 insertions, 134 deletions

diff --git a/Lanes.vcxproj b/Lanes.vcxproj
index 1b3d224..740af04 100644
--- a/Lanes.vcxproj
+++ b/Lanes.vcxproj
@@ -1595,8 +1595,8 @@ xcopy /F /R /Y "$(OutputPath)core.pdb" $(SolutionDir)..\..\..\Lua52\bin\$(Platfo
     <None Include="lanes-4.0.0-0.rockspec" />
     <None Include="Lanes.slnenv" />
     <None Include="make-vc.cmd" />
-    <None Include="Shared.mk" />
-    <None Include="src\Makefile" />
+    <None Include="Shared.makefile" />
+    <None Include="src\Lanes.makefile" />
     <None Include="Makefile" />
     <None Include="tests\appendud.lua" />
     <None Include="tests\argtable.lua" />
diff --git a/Lanes.vcxproj.filters b/Lanes.vcxproj.filters
index 2479f1c..3014132 100644
--- a/Lanes.vcxproj.filters
+++ b/Lanes.vcxproj.filters
@@ -153,7 +153,7 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="src\Makefile">
+    <None Include="src\Lanes.makefile">
       <Filter>Resource Files\Make\src</Filter>
     </None>
     <None Include="tests\appendud.lua">
@@ -267,7 +267,7 @@
     <None Include="Makefile">
       <Filter>Resource Files\Make</Filter>
     </None>
-    <None Include="Shared.mk">
+    <None Include="Shared.makefile">
       <Filter>Resource Files\Make</Filter>
     </None>
     <None Include="make-vc.cmd">
diff --git a/Makefile b/Makefile
index df56dcd..7d6b2ce 100644
--- a/Makefile
+++ b/Makefile
@@ -15,56 +15,77 @@
 
 MODULE = lanes
 
-N=1000
+N = 1000
 
-_TARGET_DIR=src/lanes
-TIME=time
+TIME = time
 
 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
 
 # Autodetect LUA
 #
-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))")
+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))")
 
-$(info LUA is $(LUA))
-$(info LUA_VERSION is $(LUA_VERSION))
+$(info LUA: $(LUA))
+$(info LUA_VERSION: $(LUA_VERSION))
 
-_TARGET_SO:=$(_TARGET_DIR)/core.$(_SO)
+_LANES_TARGET := src/lanes/core.$(_SO)
+$(info _LANES_TARGET: $(_LANES_TARGET))
 
-_UNITTEST_TARGET:=$(_TARGET_DIR)/UnitTests$(_LUAEXT)
+_UNITTEST_TARGET := unit_tests/UnitTests$(_LUAEXT)
+$(info _UNITTEST_TARGET: $(_UNITTEST_TARGET))
 
-_PREFIX:=LUA_CPATH="./src/?.$(_SO)" LUA_PATH="./src/?.lua;./tests/?.lua"
+_DUE_TARGET := deep_userdata_example/deep_userdata_example.$(_SO)
+$(info _DUE_TARGET: $(_DUE_TARGET))
+
+_PREFIX := LUA_CPATH="./src/?.$(_SO)" LUA_PATH="./src/?.lua;./tests/?.lua"
+
+.PHONY: all unit_tests
+
+# only build lanes itself by default
+all: $(_LANES_TARGET)
+
+# build the unit_tests and the side deep_userdata_example module 
+unit_tests: $(_UNITTEST_TARGET) $(_DUE_TARGET)
+        cd deep_userdata_example && $(MAKE) -f DUE.makefile LUA_LIBDIR=$(LUA_LIBDIR) install
 
 #---
-all: $(_TARGET_SO) $(_UNITTEST_TARGET)
 
-$(_TARGET_SO): src/*.lua src/*.cpp src/*.h src/*.hpp
+$(_LANES_TARGET): src/*.lua src/*.cpp src/*.h src/*.hpp
         @echo =========================================================================================
-        cd src && $(MAKE) LUA=$(LUA)
-        @echo ========== $(_TARGET_SO): DONE!
+        cd src && $(MAKE) -f Lanes.makefile LUA=$(LUA)
+        @echo ==================== $(_LANES_TARGET): DONE!
+        @echo
 
-$(_UNITTEST_TARGET): $(_TARGET_SO)
+$(_UNITTEST_TARGET): $(_LANES_TARGET)
         @echo =========================================================================================
-        cd unit_tests && $(MAKE)
-        @echo ========== $(_UNITTEST_TARGET): DONE!
+        cd unit_tests && $(MAKE) -f UnitTests.makefile 
+        @echo ==================== $(_UNITTEST_TARGET): DONE!
+        @echo
+
+$(_DUE_TARGET):
+        @echo =========================================================================================
+        cd deep_userdata_example && $(MAKE) -f DUE.makefile
+        @echo ==================== $(_DUE_TARGET): DONE!
+        @echo
 
 clean:
-        cd src && $(MAKE) clean
-        cd unit_tests && $(MAKE) clean
+        cd src && $(MAKE) -f Lanes.makefile clean
+        cd unit_tests && $(MAKE) -f UnitTests.makefile clean
+        cd deep_userdata_example && $(MAKE) -f DUE.makefile clean
 
 debug:
         $(MAKE) clean
-        cd src && $(MAKE) LUA=$(LUA) OPT_FLAGS="-O0 -g"
+        cd src && $(MAKE) -f Lanes.makefile LUA=$(LUA) OPT_FLAGS="-O0 -g"
         @echo ""
         @echo "** Now, try 'make repetitive' or something and if it crashes, 'gdb $(LUA) ...core file...'"
         @echo "   Then 'bt' for a backtrace."
@@ -80,7 +101,7 @@ gdb:
 #--- LuaRocks automated build ---
 #
 rock:
-        cd src && $(MAKE) LUAROCKS=1 CFLAGS="$(CFLAGS)" LIBFLAG="$(LIBFLAG)" LUA=$(LUA)
+        cd src && $(MAKE) -f Lanes.makefile LUAROCKS=1 CFLAGS="$(CFLAGS)" LIBFLAG="$(LIBFLAG)" LUA=$(LUA)
 
 
 #--- Testing ---
@@ -114,117 +135,117 @@ test:
         $(MAKE) timer
         $(MAKE) track_lanes
 
-appendud: tests/appendud.lua $(_TARGET_SO)
+appendud: tests/appendud.lua $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $<
 
-atexit: tests/atexit.lua $(_TARGET_SO)
+atexit: tests/atexit.lua $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $<
 
-atomic: tests/atomic.lua $(_TARGET_SO)
+atomic: tests/atomic.lua $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $<
 
-basic: tests/basic.lua $(_TARGET_SO)
+basic: tests/basic.lua $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $<
 
-cancel: tests/cancel.lua $(_TARGET_SO)
+cancel: tests/cancel.lua $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $<
 
-cyclic: tests/cyclic.lua $(_TARGET_SO)
+cyclic: tests/cyclic.lua $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $<
 
-deadlock: tests/deadlock.lua $(_TARGET_SO)
+deadlock: tests/deadlock.lua $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $<
 
-ehynes: tests/ehynes.lua $(_TARGET_SO)
+ehynes: tests/ehynes.lua $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $<
 
-errhangtest: tests/errhangtest.lua $(_TARGET_SO)
+errhangtest: tests/errhangtest.lua $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $<
 
-error: tests/error.lua $(_TARGET_SO)
+error: tests/error.lua $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $<
 
-fibonacci: tests/fibonacci.lua $(_TARGET_SO)
+fibonacci: tests/fibonacci.lua $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $<
 
-fifo: tests/fifo.lua $(_TARGET_SO)
+fifo: tests/fifo.lua $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $<
 
-finalizer: tests/finalizer.lua $(_TARGET_SO)
+finalizer: tests/finalizer.lua $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $<
 
-func_is_string: tests/func_is_string.lua $(_TARGET_SO)
+func_is_string: tests/func_is_string.lua $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $<
 
-hangtest: tests/hangtest.lua $(_TARGET_SO)
+hangtest: tests/hangtest.lua $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $<
 
-irayo_closure: tests/irayo_closure.lua $(_TARGET_SO)
+irayo_closure: tests/irayo_closure.lua $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $<
 
-irayo_recursive: tests/irayo_recursive.lua $(_TARGET_SO)
+irayo_recursive: tests/irayo_recursive.lua $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $<
 
-keeper: tests/keeper.lua $(_TARGET_SO)
+keeper: tests/keeper.lua $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $<
 
-launchtest: tests/launchtest.lua $(_TARGET_SO)
+launchtest: tests/launchtest.lua $(_LANES_TARGET)
         $(MAKE) _perftest ARGS="$< $(N)"
 
-linda_perf: tests/linda_perf.lua $(_TARGET_SO)
+linda_perf: tests/linda_perf.lua $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $<
 
-manual_register: tests/manual_register.lua $(_TARGET_SO)
+manual_register: tests/manual_register.lua $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $<
 
-nameof: tests/nameof.lua $(_TARGET_SO)
+nameof: tests/nameof.lua $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $<
 
-objects: tests/objects.lua $(_TARGET_SO)
+objects: tests/objects.lua $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $<
 
-package: tests/package.lua $(_TARGET_SO)
+package: tests/package.lua $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $<
 
-perftest: tests/perftest.lua $(_TARGET_SO)
+perftest: tests/perftest.lua $(_LANES_TARGET)
         $(MAKE) _perftest ARGS="$< $(N)"
 
-perftest-even: tests/perftest.lua $(_TARGET_SO)
+perftest-even: tests/perftest.lua $(_LANES_TARGET)
         $(MAKE) _perftest ARGS="$< $(N) -prio=-2"
 
-perftest-odd: tests/perftest.lua $(_TARGET_SO)
+perftest-odd: tests/perftest.lua $(_LANES_TARGET)
         $(MAKE) _perftest ARGS="$< $(N) -prio=+2"
 
-perftest-plain: tests/perftest.lua $(_TARGET_SO)
+perftest-plain: tests/perftest.lua $(_LANES_TARGET)
         $(MAKE) _perftest ARGS="$< $(N) -plain"
 
-pingpong: tests/pingpong.lua $(_TARGET_SO)
+pingpong: tests/pingpong.lua $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $<
 
-recursive: tests/recursive.lua $(_TARGET_SO)
+recursive: tests/recursive.lua $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $<
 
-require: tests/require.lua $(_TARGET_SO)
+require: tests/require.lua $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $<
 
-rupval: tests/rupval.lua $(_TARGET_SO)
+rupval: tests/rupval.lua $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $<
 
-timer: tests/timer.lua $(_TARGET_SO)
+timer: tests/timer.lua $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $<
 
-track_lanes: tests/track_lanes.lua $(_TARGET_SO)
+track_lanes: tests/track_lanes.lua $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $<
 #
 # This tries to show out a bug which happens in lane cleanup (multicore CPU's only)
 #
 REP_ARGS=-llanes -e "print'say aaa'; for i=1,10 do print(i) end"
-repetitive: $(_TARGET_SO)
+repetitive: $(_LANES_TARGET)
         for i in 1 2 3 4 5 6 7 8 9 10 a b c d e f g h i j k l m n o p q r s t u v w x y z; \
                 do $(_PREFIX) $(LUA) $(REP_ARGS); \
         done
 
-repetitive1: $(_TARGET_SO)
+repetitive1: $(_LANES_TARGET)
         $(_PREFIX) $(LUA) $(REP_ARGS)
 
 #---
@@ -246,15 +267,15 @@ LUA_SHAREDIR:=$(DESTDIR)/share/lua/$(LUA_VERSION)
 #
 # AKa 17-Oct: changed to use 'install -m 644' and 'cp -p'
 #
-install: $(_TARGET_SO) src/lanes.lua
+install: $(_LANES_TARGET) src/lanes.lua
         mkdir -p $(LUA_LIBDIR) $(LUA_LIBDIR)/lanes $(LUA_SHAREDIR)
-        install -m 644 $(_TARGET_SO) $(LUA_LIBDIR)/lanes
+        install -m 644 $(_LANES_TARGET) $(LUA_LIBDIR)/lanes
         cp -p src/lanes.lua $(LUA_SHAREDIR)
 
 uninstall:
         rm $(LUA_LIBDIR)/lanes/core.$(_SO)
         rm $(LUA_SHAREDIR)/lanes.lua
-
+        rm $(LUA_LIBDIR)/deep_userdata_example.$(_SO)
 
 #--- Packaging ---
 #
@@ -289,14 +310,14 @@ endif
 # 2.0.1: Running this (instant exit of the main Lua state) occasionally
 #        segfaults (1:15 or so on OS X PowerPC G4).
 #
-require_module: $(_TARGET_SO)
+require_module: $(_LANES_TARGET)
         $(_PREFIX) $(LUA) -e "require '$(MODULE)'"
 
-run: $(_TARGET_SO)
+run: $(_LANES_TARGET)
         $(_PREFIX) $(LUA) -e "require '$(MODULE)'" -i
 
 echo:
         @echo $(PROGRAMFILES:C=X)
 
-.PHONY: all clean debug gdb rock test require install uninstall _nodemo _notest
+.PHONY: clean debug gdb rock test require install uninstall _nodemo _notest
 
diff --git a/Shared.mk b/Shared.makefile
index f6941e1..492c05d 100644
--- a/Shared.mk
+++ b/Shared.makefile
@@ -1,21 +1,21 @@
-CC= g++ -std=c++20
+CC := g++ -std=c++20
 
 # LuaRocks gives 'LIBFLAG' from the outside
 #
-LIBFLAG=-shared
+LIBFLAG := -shared
 
-OPT_FLAGS=-O2
+OPT_FLAGS := -O2
 #         -O0 -g
 
 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)" ""
@@ -29,42 +29,43 @@ ifeq "$(LUAROCKS)" ""
     ifeq "$(LUA_DEV)" ""
       $(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) 2>/dev/null) $(shell which lua53.$(_SO) 2>/dev/null) $(shell which lua52.$(_SO) 2>/dev/null) $(shell which lua51$(_SO) 2>/dev/null))
+      LUA_FLAGS := -I "/usr/local/include"
+      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))
+      $(info detected LUA_LIBS as $(LUA_LIBS))
     else
-      LUA_FLAGS:=-I "$(LUA_DEV)/include"
-      LUA_LIBS:="$(LUA_DEV)/lua5.1.dll" -lgcc
+      LUA_FLAGS := -I "$(LUA_DEV)/include"
+      LUA_LIBS := "$(LUA_DEV)/lua5.1.dll" -lgcc
     endif
-    LIBFLAG=-shared -Wl,-Map,lanes.map
+    LIBFLAG := -shared -Wl,-Map,lanes.map
   else
     # Autodetect LUA_FLAGS and/or LUA_LIBS
     #
     ifneq "$(shell which pkg-config)" ""
       ifeq "$(shell pkg-config --exists luajit && echo 1)" "1"
-        LUA_FLAGS:=$(shell pkg-config --cflags luajit)
-        LUA_LIBS:=$(shell pkg-config --libs luajit)
+        LUA_FLAGS := $(shell pkg-config --cflags luajit)
+        LUA_LIBS := $(shell pkg-config --libs luajit)
           #
           # Debian: -I/usr/include/luajit-2.0
           #         -lluajit-5.1
       else
         ifeq "$(shell pkg-config --exists lua5.1 && echo 1)" "1"
-          LUA_FLAGS:=$(shell pkg-config --cflags lua5.1)
-          LUA_LIBS:=$(shell pkg-config --libs lua5.1)
+          LUA_FLAGS := $(shell pkg-config --cflags lua5.1)
+          LUA_LIBS := $(shell pkg-config --libs lua5.1)
             #
             # Ubuntu: -I/usr/include/lua5.1 
             #         -llua5.1
         else
           ifeq "$(shell pkg-config --exists lua && echo 1)" "1"
-            LUA_FLAGS:=$(shell pkg-config --cflags lua)
-            LUA_LIBS:=$(shell pkg-config --libs lua)
+            LUA_FLAGS := $(shell pkg-config --cflags lua)
+            LUA_LIBS := $(shell pkg-config --libs lua)
               #
               # OS X fink with pkg-config:
               #      -I/sw/include 
               #      -L/sw/lib -llua -lm
           else
             $(warning *** 'pkg-config' existed but did not know of 'lua[5.1]' - Good luck!)
-            LUA_FLAGS:=
-            LUA_LIBS:=-llua
+            LUA_FLAGS :=
+            LUA_LIBS := -llua
           endif
         endif
       endif
@@ -73,12 +74,12 @@ ifeq "$(LUAROCKS)" ""
       #
       ifeq "$(shell uname -s)" "Darwin"
         $(warning *** Assuming 'fink' at default path)
-        LUA_FLAGS:=-I/sw/include
-        LUA_LIBS:=-L/sw/lib -llua
+        LUA_FLAGS := -I/sw/include
+        LUA_LIBS := -L/sw/lib -llua
       else
         $(warning *** Assuming an arbitrary Lua installation; try installing 'pkg-config')
-        LUA_FLAGS:=
-        LUA_LIBS:=-llua
+        LUA_FLAGS :=
+        LUA_LIBS := -llua
       endif
     endif
   endif
@@ -87,12 +88,12 @@ ifeq "$(LUAROCKS)" ""
     # Some machines need 'MACOSX_DEPLOYMENT_TARGET=10.3' for using '-undefined dynamic_lookup'
     # (at least PowerPC running 10.4.11); does not harm the others
     #
-    CC = MACOSX_DEPLOYMENT_TARGET=10.3 gcc
-    LIBFLAG = -bundle -undefined dynamic_lookup
+    CC := MACOSX_DEPLOYMENT_TARGET=10.3 gcc
+    LIBFLAG := -bundle -undefined dynamic_lookup
   endif
   
-  CFLAGS=-Wall -Werror $(OPT_FLAGS) $(LUA_FLAGS)
-  LIBS=$(LUA_LIBS)
+  CFLAGS := -Wall -Werror $(OPT_FLAGS) $(LUA_FLAGS)
+  LIBS :=
 endif
 
 #---
diff --git a/deep_userdata_example/DUE.makefile b/deep_userdata_example/DUE.makefile
new file mode 100644
index 0000000..8fcc89e
--- /dev/null
+++ b/deep_userdata_example/DUE.makefile
@@ -0,0 +1,36 @@
+#
+# Lanes/deep_userdata_example/DUE.makefile
+#
+
+include ../Shared.makefile
+
+_MODULE=deep_userdata_example.$(_SO)
+
+_SRC:=$(wildcard *.cpp) ../src/compat.cpp ../src/deep.cpp
+
+_OBJ:=$(_SRC:.cpp=.o)
+
+#---
+all: $(_MODULE)
+        $(info CC: $(CC))
+        $(info _MODULE: $(_MODULE))
+        $(info _SRC: $(_SRC))
+        
+_pch.hpp.gch: ../src/_pch.hpp
+        $(CC) -I "../.." $(CFLAGS) -x c++-header $< -o _pch.hpp.gch
+
+%.o: %.cpp  _pch.hpp.gch DUE.makefile
+        $(CC) -I "../.." $(CFLAGS) -c $<
+
+# Note: Don't put $(LUA_LIBS) ahead of $^; MSYS will not like that (I think)
+#
+$(_MODULE): $(_OBJ)
+        $(CC) $(LIBFLAG) $^ $(LIBS) $(LUA_LIBS) -o $@
+
+install:
+        install -m 644 $(_MODULE) $(LUA_LIBDIR)/
+
+clean:
+        -rm -rf $(_MODULE) *.o *.map *.gch
+
+.PHONY: all clean
diff --git a/deep_userdata_example/deep_userdata_example.vcxproj b/deep_userdata_example/deep_userdata_example.vcxproj
index 74d8e76..ec40f30 100644
--- a/deep_userdata_example/deep_userdata_example.vcxproj
+++ b/deep_userdata_example/deep_userdata_example.vcxproj
@@ -855,7 +855,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="deeptest.lua" />
-    <None Include="Makefile" />
+    <None Include="DUE.makefile" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/deep_userdata_example/deep_userdata_example.vcxproj.filters b/deep_userdata_example/deep_userdata_example.vcxproj.filters
index e3fd9bf..ecb3c60 100644
--- a/deep_userdata_example/deep_userdata_example.vcxproj.filters
+++ b/deep_userdata_example/deep_userdata_example.vcxproj.filters
@@ -5,14 +5,17 @@
       <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
     </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
     <Filter Include="Lanes">
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
     </Filter>
+    <Filter Include="Make">
+      <UniqueIdentifier>{e3eeb49e-1b60-4885-b634-80e39d11acc7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="test">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\compat.cpp">
@@ -47,10 +50,10 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="deeptest.lua">
-      <Filter>Resource Files</Filter>
+      <Filter>test</Filter>
     </None>
-    <None Include="Makefile">
-      <Filter>Resource Files</Filter>
+    <None Include="DUE.makefile">
+      <Filter>Make</Filter>
     </None>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Makefile b/src/Lanes.makefile
index 39b98e6..d9127f7 100644
--- a/src/Makefile
+++ b/src/Lanes.makefile
@@ -1,40 +1,39 @@
 #
-# Lanes/src/Makefile
+# Lanes/src/Lanes.makefile
 #
 #   make                                    Manual build
 #   make LUAROCKS=1 CFLAGS=... LIBFLAG=...  LuaRocks automated build
 #
 
-include ../Shared.mk
+include ../Shared.makefile
 
-MODULE=lanes
+_MODULE=lanes
 
-CC:= g++ -std=c++20
+_SRC := $(wildcard *.cpp)
 
-SRC:=$(wildcard *.cpp)
+_OBJ := $(_SRC:.cpp=.o)
 
-OBJ:=$(SRC:.cpp=.o)
-
-
-MODULE_DIR=$(MODULE)
+_MODULE_DIR = $(_MODULE)
 
 #---
-all: $(MODULE)/core.$(_SO)
+all: $(_MODULE)/core.$(_SO)
+        $(info CC: $(CC))
+        $(info _SRC: $(_SRC))
 
 _pch.hpp.gch: _pch.hpp
         $(CC) $(CFLAGS) -x c++-header _pch.hpp -o _pch.hpp.gch
 
-%.o: %.cpp _pch.hpp.gch *.h *.hpp Makefile
+%.o: %.cpp _pch.hpp.gch *.h *.hpp Lanes.makefile
         $(CC) $(CFLAGS) -c $<
 
 # Note: Don't put $(LUA_LIBS) ahead of $^; MSYS will not like that (I think)
 #
-$(MODULE_DIR)/core.$(_SO): $(OBJ)
-        mkdir -p $(MODULE_DIR)
+$(_MODULE_DIR)/core.$(_SO): $(_OBJ)
+        mkdir -p $(_MODULE_DIR)
         $(CC) $(LIBFLAG) $^ $(LIBS) $(LUA_LIBS) -o $@
 
 clean:
-        -rm -rf $(MODULE)/core.$(_SO) *.o *.map *.gch
+        -rm -rf $(_MODULE)/core.$(_SO) *.o *.map *.gch
 
 #---
 # NSLU2 "slug" Linux ARM
@@ -52,7 +51,7 @@ nslu2:
 #
 # EXPERIMENTAL; NOT TESTED OF LATE.
 #
-MINGW_GCC=mingw32-gcc
+MINGW_GCC = mingw32-gcc
 # i686-pc-mingw32-gcc
 
 win32: $(WIN32_LUA51)/include/lua.h
diff --git a/unit_tests/Makefile b/unit_tests/UnitTests.makefile
index 89106b9..b3d1c58 100644
--- a/unit_tests/Makefile
+++ b/unit_tests/UnitTests.makefile
@@ -1,31 +1,33 @@
 #
-# Lanes/unit_tests/Makefile
+# Lanes/unit_tests/UnitTests.makefile
 #
 
-include ../Shared.mk
+include ../Shared.makefile
 
-SRC=$(wildcard *.cpp) ../src/deep.cpp ../src/compat.cpp
+_SRC := $(wildcard *.cpp) ../src/deep.cpp ../src/compat.cpp
 
-OBJ=$(SRC:.cpp=.o)
+_OBJ := $(_SRC:.cpp=.o)
 
 
-_UNITTEST_TARGET=UnitTests$(_LUAEXT)
+_UNITTEST_TARGET := UnitTests$(_LUAEXT)
 
 #---
 all: $(_UNITTEST_TARGET)
+        $(info CC: $(CC))
+        $(info _SRC: $(_SRC))
 
 _pch.hpp.gch: _pch.hpp
         $(CC) -I "../.." $(CFLAGS) -x c++-header _pch.hpp -o _pch.hpp.gch
 
-%.o: %.cpp _pch.hpp.gch *.h *.hpp Makefile
+%.o: %.cpp _pch.hpp.gch *.h *.hpp UnitTests.makefile
         $(CC) -I "../.." $(CFLAGS) -c $<
 
 # Note: Don't put $(LUA_LIBS) ahead of $^; MSYS will not like that (I think)
 #
-$(_UNITTEST_TARGET): $(OBJ)
+$(_UNITTEST_TARGET): $(_OBJ)
         $(CC) $^ $(LIBS) $(LUA_LIBS) -o $@
 
 clean:
         -rm -rf $(_UNITTEST_TARGET) *.o *.map *.gch
 
-.PROXY: all clean
+.PHONY: all clean
diff --git a/unit_tests/UnitTests.vcxproj b/unit_tests/UnitTests.vcxproj
index 9645a30..013a84f 100644
--- a/unit_tests/UnitTests.vcxproj
+++ b/unit_tests/UnitTests.vcxproj
@@ -939,7 +939,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="Catch2.runsettings" />
-    <None Include="Makefile" />
+    <None Include="UnitTests.makefile" />
     <None Include="scripts\coro\basics.lua" />
     <None Include="scripts\coro\error_handling.lua" />
     <None Include="scripts\lane\cooperative_shutdown.lua" />
diff --git a/unit_tests/UnitTests.vcxproj.filters b/unit_tests/UnitTests.vcxproj.filters
index c4e85c5..eb02d19 100644
--- a/unit_tests/UnitTests.vcxproj.filters
+++ b/unit_tests/UnitTests.vcxproj.filters
@@ -110,7 +110,7 @@
     <None Include="Catch2.runsettings">
       <Filter>Catch2</Filter>
     </None>
-    <None Include="Makefile">
+    <None Include="UnitTests.makefile">
       <Filter>Make</Filter>
     </None>
   </ItemGroup>