X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=Makefile;h=95ed652182519087c4f7a07274c73df624013ff5;hp=caf10e3daf15bdb421f14dba85d0536f7948c48e;hb=1da520638918096276158ecdfaeebc14a3d70be7;hpb=a97500609dc3c1b11f9786d32bc458eb00de4c36

diff --git a/Makefile b/Makefile
index caf10e3..95ed652 100644
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,8 @@
 # http://www.xs4all.nl/~evbergen/nonrecursive-make.html
 #
 
-# Set this to `yes' to echo each build command in full.
-verbose		:= no
+# Set this to `true' to echo each build command in full.
+verbose		:= false
 
 
 #
@@ -69,6 +69,10 @@ ifeq ($(DEP_TRACKING),true)
 COMPILE = ./tools/compile.lua
 endif
 
+# 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)
@@ -81,7 +85,7 @@ COMMAND_INSTALL    = ./tools/install.sh -m $1 $2 -d $3
 COMMAND_RM         = rm -f $1
 COMMAND_IN         = sed -f config.sed <"$1" >"$2"
 
-ifeq ($(verbose),yes)
+ifeq ($(verbose),true)
 DO_CC              = $(COMMAND_CC)
 DO_CXX             = $(COMMAND_CXX)
 DO_LD              = $(COMMAND_LD)
@@ -95,17 +99,17 @@ DO_RM              = $(COMMAND_RM)
 DO_IN              = $(COMMAND_IN)
 SHELL_LINE_PREFIX  =
 else
-DO_CC              = @echo -e " CC \t$@";    $(COMMAND_CC)
-DO_CXX             = @echo -e " CXX \t$@";   $(COMMAND_CXX)
-DO_LD              = @echo -e " LD \t$@";    $(COMMAND_LD)
-DO_LDX             = @echo -e " LD \t$@";    $(COMMAND_LDX)
-DO_CCLD            = @echo -e " CCLD \t$@";  $(COMMAND_CCLD)
-DO_CXXLD           = @echo -e " CXXLD \t$@"; $(COMMAND_CXXLD)
-DO_AR              = @echo -e " AR \t$@";    $(COMMAND_AR)
-DO_RC              = @echo -e " RC \t$@";    $(COMMAND_RC)
-DO_INSTALL         = @echo -e " CP \t$2";    $(COMMAND_INSTALL)
-DO_RM              = @echo -e " RM \t$1";    $(COMMAND_RM)
-DO_IN              = @echo -e " MAKE \t$2";  $(COMMAND_IN)
+DO_CC              = @echo " CC     $@"; $(COMMAND_CC)
+DO_CXX             = @echo " CXX    $@"; $(COMMAND_CXX)
+DO_LD              = @echo " LD     $@"; $(COMMAND_LD)
+DO_LDX             = @echo " LD     $@"; $(COMMAND_LDX)
+DO_CCLD            = @echo " CCLD   $@"; $(COMMAND_CCLD)
+DO_CXXLD           = @echo " CXXLD  $@"; $(COMMAND_CXXLD)
+DO_AR              = @echo " AR     $@"; $(COMMAND_AR)
+DO_RC              = @echo " RC     $@"; $(COMMAND_RC)
+DO_INSTALL         = @echo " CP     $2"; $(COMMAND_INSTALL)
+DO_RM              = @echo " RM     $1"; $(COMMAND_RM)
+DO_IN              = @echo " MAKE   $2"; $(COMMAND_IN)
 SHELL_LINE_PREFIX  = @
 endif
 
@@ -122,17 +126,17 @@ endif
 	$(DO_CXX)
 %.o: %.rc
 	$(DO_RC)
-%: %.o
+%$(EXEEXT): %.o
 	$(DO_LD)
-%: %.c
+%$(EXEEXT): %.c
 	$(DO_CCLD)
-%: %.cc
+%$(EXEEXT): %.cc
 	$(DO_CXXLD)
-%: %.cpp
+%$(EXEEXT): %.cpp
 	$(DO_CXXLD)
 %.a: %.o
 	$(DO_AR)
-%: %.in
+%: %.in config.sed
 	$(call DO_IN,$<,$@)