From 3276c46c727f961d4fdf1255a8e0851fc3d530fb Mon Sep 17 00:00:00 2001
From: tron <tron@openttd.org>
Date: Tue, 25 Jan 2005 15:59:01 +0000
Subject: (svn r1670) Garbage collect some variables, because they are only
 used once and hide magic, like containing -o where a filename must be the
 next parameter

---
 Makefile | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index d9c5413d7..de1ac33fb 100644
--- a/Makefile
+++ b/Makefile
@@ -680,15 +680,6 @@ DEPS = $(DEPS1:%.o=%.P)
 LANG_TXT = $(filter-out %.unfinished.txt,$(wildcard lang/*.txt))
 LANGS = $(LANG_TXT:%.txt=%.lng)
 
-C_COMPILE = $(CC) $(CFLAGS) $(CDEFS)
-CXX_COMPILE = $(CXX) $(CFLAGS) $(CDEFS)
-
-C_BUILD = $(C_COMPILE) -c
-CXX_BUILD = $(CXX_COMPILE) -c
-
-C_LINK = $(CC) $(LDFLAGS) -o
-
-
 
 ##############################################################################
 #
@@ -717,7 +708,7 @@ $(ENDIAN_CHECK): endian_check.c
 
 $(TTD): table/strings.h $(OBJS) $(MAKE_CONFIG)
 	@echo '===> Linking $@'
-	@$(C_LINK) $@ $(TTDLDFLAGS) $(OBJS) $(LIBS)
+	@$(CC) $(LDFLAGS) $(TTDLDFLAGS) $(OBJS) $(LIBS) -o $@
 
 $(OSX): $(TTD)
 	@rm -fr "$(OSXAPP)"
@@ -931,7 +922,7 @@ DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
 
 %.o: %.c $(MAKE_CONFIG) endian.h table/strings.h
 	@echo '===> Compiling $<'
-	@$(C_BUILD) $< -Wp,-MD,.deps/$(*F).pp
+	@$(CC) $(CFLAGS) $(CDEFS) -Wp,-MD,.deps/$(*F).pp -c $< -o $@
 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
 		tr ' ' '\012' < .deps/$(*F).pp \
 		| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
@@ -941,7 +932,7 @@ DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
 # For DirectMusic build and BeOS specific parts
 %.o: %.cpp  $(MAKE_CONFIG) endian.h table/strings.h
 	@echo '===> Compiling $<'
-	@$(CXX_BUILD) $< -o $@
+	@$(CXX) $(CFLAGS) $(CDEFS) -c $< -o $@
 
 
 info:
-- 
cgit v1.2.3-54-g00ecf