improved build tools

[chaz/yoink] / Makefile

diff --git a/Makefile b/Makefile
index d5718c2ca9f186a5810d8a3ea035a55f5e0d323d..5e9510c444aeb50529cbd40c399808fe896add4c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -69,22 +69,28 @@ include $(dir)/rules.mk
 #
 
 ifeq ($(DEP_TRACKING),true)
-COMPILE = ./tools/compile.lua
+COMPILE                = ./tools/compile.lua
 endif
 
+ifeq ($(AS_NEEDED),true)
+LINK           = ./tools/link.lua
+endif
+
+INSTALL                = ./tools/install.lua
+
 # Include current directory to allow sources to #include "config.h".
 CFLAGS            += -I.
 CXXFLAGS          += -I.
 
 COMMAND_CC         = $(COMPILE) $(CC)  $(CFLAGS)    $(CF_TGT) -o $@ -c $<
 COMMAND_CXX        = $(COMPILE) $(CXX) $(CXXFLAGS)  $(CF_TGT) -o $@ -c $<
-COMMAND_LD         = $(CC)  $(LDFLAGS) $(LF_TGT) -o $@ $^ $(LL_TGT) $(LIBS)
-COMMAND_LDX        = $(CXX) $(LDFLAGS) $(LF_TGT) -o $@ $^ $(LL_TGT) $(LIBS)
+COMMAND_LD         = $(LINK)    $(CC)  $(LDFLAGS)   $(LF_TGT) -o $@ $^ $(LL_TGT) $(LIBS)
+COMMAND_LDX        = $(LINK)    $(CXX) $(LDFLAGS)   $(LF_TGT) -o $@ $^ $(LL_TGT) $(LIBS)
 COMMAND_CCLD       = $(COMPILE) $(CC)  $(CFLAGS)    $(CF_TGT) $(LDFLAGS) $(LF_TGT) -o $@ $< $(LL_TGT) $(LIBS)
 COMMAND_CXXLD      = $(COMPILE) $(CXX) $(CXXFLAGS)  $(CF_TGT) $(LDFLAGS) $(LF_TGT) -o $@ $< $(LL_TGT) $(LIBS)
 COMMAND_AR         = $(AR) rcs $@ $^;  $(RANLIB)    $@
 COMMAND_RC         = $(WINDRES)        -I.          $(DF_TGT) -o $@ -i $<
-COMMAND_INSTALL    = ./tools/install.sh -m $1 $2 -d $3
+COMMAND_INSTALL    = $(INSTALL) -m $1 $2 $3/
 COMMAND_RM         = rm -f $1
 COMMAND_IN         = sed -f config.sed <"$1" >"$2"