summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpasky <pasky@openttd.org>2004-11-19 22:29:30 +0000
committerpasky <pasky@openttd.org>2004-11-19 22:29:30 +0000
commitad068622fb920b64fe82a6317662eb58b8db991a (patch)
treeff6de126c15778be937c76d1b55a8cd4d1b71895
parent0f7e48ead23cc0df9fdf17eb18b2dde51d9f2285 (diff)
downloadopenttd-ad068622fb920b64fe82a6317662eb58b8db991a.tar.xz
(svn r681) Support for VERBOSE configuration variable which shows the commands actually used for compilation.
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 64d09b0c1..0e97621bc 100644
--- a/Makefile
+++ b/Makefile
@@ -65,6 +65,7 @@
# If unset, it will use the hardcoded path in the c code
# NOVERBOSE: supress all warnings and errors during compilation.
# It looks nicer, but you will not know what went wrong. Use it on released (stable) sources only
+# VERBOSE: actually show the commands used for compilation.
#
# Paths:
# INSTALL: If not set, the game uses the directory of the binary to
@@ -597,8 +598,8 @@ $(ENDIAN_CHECK): endian_check.c
$(TTD): table/strings.h $(ttd_OBJS) $(LANGS) $(MAKE_CONFIG)
- @echo 'Compiling and Linking $@'; \
- $(C_LINK) $@ $(TTDLDFLAGS) $(ttd_OBJS) $(LIBS) $(VERBOSE_FILTER)
+ $(if $(VERBOSE),@echo '$(C_LINK) $@ $(TTDLDFLAGS) $(ttd_OBJS) $(LIBS)';,@echo 'Compiling and Linking $@';) \
+ $(C_LINK) $@ $(TTDLDFLAGS) $(ttd_OBJS) $(LIBS) $(VERBOSE_FILTER)
$(OSX):
@mkdir -p $(OSXAPP)/Contents/MacOS
@@ -738,7 +739,7 @@ DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
%.o: %.c $(MAKE_CONFIG)
- @echo 'Compiling $(*F).o'; \
+ $(if $(VERBOSE),@echo '$(C_BUILD) $<',@echo 'Compiling $(*F).o'); \
$(C_BUILD) $< -Wp,-MD,.deps/$(*F).pp $(VERBOSE_FILTER)
@-cp .deps/$(*F).pp .deps/$(*F).P; \
tr ' ' '\012' < .deps/$(*F).pp \