More makefile tweaks

4 files changed, 36 insertions, 33 deletions

diff --git a/Makefile b/Makefile
index 0eb485f..c620f0f 100644
--- a/Makefile
+++ b/Makefile
@@ -47,39 +47,40 @@ $(info _UNITTEST_TARGET: $(_UNITTEST_TARGET))
 _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"
+# setup LUA_PATH and LUA_CPATH so that requiring lanes and deep_userdata_example work without having to install them
+_PREFIX := LUA_CPATH="./src/?.$(_SO);./deep_userdata_example/?.$(_SO)" LUA_PATH="./src/?.lua;./tests/?.lua"
 
-.PHONY: all unit_tests
+.PHONY: all build_lanes build_unit_tests build_DUE
 
 # only build lanes itself by default
-all: $(_LANES_TARGET)
-
-# build the unit_tests and the side deep_userdata_example module 
-# also run the test that shows whether lanes is successfully loaded or not
-unit_tests: $(_UNITTEST_TARGET) $(_DUE_TARGET)
-        cd deep_userdata_example && $(MAKE) -f DUE.makefile LUA_LIBDIR=$(LUA_LIBDIR) install
-        $(_UNITTEST_TARGET) "lanes.require 'lanes'"
+all: build_lanes
 
 #---
 
-$(_LANES_TARGET): src/*.lua src/*.cpp src/*.h src/*.hpp
+build_lanes:
         @echo =========================================================================================
         cd src && $(MAKE) -f Lanes.makefile LUA=$(LUA)
         @echo ==================== $(_LANES_TARGET): DONE!
         @echo
 
-$(_UNITTEST_TARGET): $(_LANES_TARGET)
+build_unit_tests:
         @echo =========================================================================================
         cd unit_tests && $(MAKE) -f UnitTests.makefile 
         @echo ==================== $(_UNITTEST_TARGET): DONE!
         @echo
 
-$(_DUE_TARGET):
+build_DUE:
         @echo =========================================================================================
         cd deep_userdata_example && $(MAKE) -f DUE.makefile
         @echo ==================== $(_DUE_TARGET): DONE!
         @echo
 
+# build the unit_tests and the side deep_userdata_example module
+# also run a test that shows whether lanes is successfully loaded or not
+run_unit_tests: build_lanes build_unit_tests build_DUE
+        @echo =========================================================================================
+        $(_PREFIX) $(_UNITTEST_TARGET) "lanes.require 'lanes'"
+
 clean:
         cd src && $(MAKE) -f Lanes.makefile clean
         cd unit_tests && $(MAKE) -f UnitTests.makefile clean
diff --git a/deep_userdata_example/DUE.makefile b/deep_userdata_example/DUE.makefile
index 8fcc89e..b5c3a23 100644
--- a/deep_userdata_example/DUE.makefile
+++ b/deep_userdata_example/DUE.makefile
@@ -4,33 +4,33 @@
 
 include ../Shared.makefile
 
-_MODULE=deep_userdata_example.$(_SO)
+_TARGET := deep_userdata_example.$(_SO)
 
-_SRC:=$(wildcard *.cpp) ../src/compat.cpp ../src/deep.cpp
+_SRC := $(wildcard *.cpp) ../src/compat.cpp ../src/deep.cpp
 
-_OBJ:=$(_SRC:.cpp=.o)
+_OBJ := $(_SRC:.cpp=.o)
 
 #---
-all: $(_MODULE)
+all: $(_TARGET)
         $(info CC: $(CC))
-        $(info _MODULE: $(_MODULE))
+        $(info _TARGET: $(_TARGET))
         $(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 $<
+%.o: %.cpp _pch.hpp.gch DUE.makefile
+        $(CC) -I "../.." $(CFLAGS) -c $< -o $@
 
 # Note: Don't put $(LUA_LIBS) ahead of $^; MSYS will not like that (I think)
 #
-$(_MODULE): $(_OBJ)
+$(_TARGET): $(_OBJ)
         $(CC) $(LIBFLAG) $^ $(LIBS) $(LUA_LIBS) -o $@
 
 install:
-        install -m 644 $(_MODULE) $(LUA_LIBDIR)/
+        install -m 644 $(_TARGET) $(LUA_LIBDIR)/
 
 clean:
-        -rm -rf $(_MODULE) *.o *.map *.gch
+        -rm -rf $(_TARGET) *.o *.map *.gch
 
 .PHONY: all clean
diff --git a/src/Lanes.makefile b/src/Lanes.makefile
index d9127f7..9798848 100644
--- a/src/Lanes.makefile
+++ b/src/Lanes.makefile
@@ -16,7 +16,9 @@ _OBJ := $(_SRC:.cpp=.o)
 _MODULE_DIR = $(_MODULE)
 
 #---
-all: $(_MODULE)/core.$(_SO)
+all: info $(_MODULE)/core.$(_SO)
+
+info:
         $(info CC: $(CC))
         $(info _SRC: $(_SRC))
 
@@ -24,7 +26,7 @@ _pch.hpp.gch: _pch.hpp
         $(CC) $(CFLAGS) -x c++-header _pch.hpp -o _pch.hpp.gch
 
 %.o: %.cpp _pch.hpp.gch *.h *.hpp Lanes.makefile
-        $(CC) $(CFLAGS) -c $<
+        $(CC) $(CFLAGS) -c $< -o $@
 
 # Note: Don't put $(LUA_LIBS) ahead of $^; MSYS will not like that (I think)
 #
@@ -66,4 +68,4 @@ $(WIN32_LUA51)/include/lua.h:
         @echo "                  [MINGW_GCC=...mingw32-gcc]"
         @false
 
-.PHONY: all clean nslu2 win32
+.PHONY: all info clean nslu2 win32
diff --git a/unit_tests/UnitTests.makefile b/unit_tests/UnitTests.makefile
index b3d1c58..a383516 100644
--- a/unit_tests/UnitTests.makefile
+++ b/unit_tests/UnitTests.makefile
@@ -4,30 +4,30 @@
 
 include ../Shared.makefile
 
+_TARGET := UnitTests$(_LUAEXT)
+
 _SRC := $(wildcard *.cpp) ../src/deep.cpp ../src/compat.cpp
 
 _OBJ := $(_SRC:.cpp=.o)
 
-
-_UNITTEST_TARGET := UnitTests$(_LUAEXT)
-
 #---
-all: $(_UNITTEST_TARGET)
+all: $(_TARGET)
         $(info CC: $(CC))
+        $(info _TARGET: $(_TARGET))
         $(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 UnitTests.makefile
-        $(CC) -I "../.." $(CFLAGS) -c $<
+        $(CC) -I "../.." $(CFLAGS) -c $< -o $@
 
 # Note: Don't put $(LUA_LIBS) ahead of $^; MSYS will not like that (I think)
 #
-$(_UNITTEST_TARGET): $(_OBJ)
+$(_TARGET): $(_OBJ)
         $(CC) $^ $(LIBS) $(LUA_LIBS) -o $@
 
 clean:
-        -rm -rf $(_UNITTEST_TARGET) *.o *.map *.gch
+        -rm -rf $(_TARGET) *.o *.map *.gch
 
 .PHONY: all clean