From 6a944f06b3dcb7c102ae26894277fffc20a79b91 Mon Sep 17 00:00:00 2001
From: smatz <smatz@openttd.org>
Date: Mon, 7 Sep 2009 13:33:45 +0000
Subject: [PATCH] (svn r17454) -Codechange: some alignment in Makefile*.in

---
 Makefile.in      | 52 ++++++++++++++++++++--------------------
 Makefile.lang.in | 28 +++++++++++-----------
 Makefile.msvc    | 14 +++++------
 Makefile.src.in  | 62 ++++++++++++++++++++++++------------------------
 4 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 4ff3671f48..685cf786fa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,36 +14,36 @@ endif
 
 include Makefile.am
 
-SOURCE_LIST = !!SOURCE_LIST!!
+CONFIG_CACHE_PWD         = !!CONFIG_CACHE_PWD!!
 CONFIG_CACHE_SOURCE_LIST = !!CONFIG_CACHE_SOURCE_LIST!!
-CONFIG_CACHE_PWD = !!CONFIG_CACHE_PWD!!
-CONFIGURE_FILES = !!CONFIGURE_FILES!!
-LIPO = !!LIPO!!
-BIN_DIR = !!BIN_DIR!!
+BIN_DIR        = !!BIN_DIR!!
 ICON_THEME_DIR = !!ICON_THEME_DIR!!
-MAN_DIR = !!MAN_DIR!!
-MENU_DIR = !!MENU_DIR!!
-SRC_DIR = !!SRC_DIR!!
-ROOT_DIR = !!ROOT_DIR!!
-BUNDLE_DIR = "$(ROOT_DIR)/bundle"
-BUNDLES_DIR = "$(ROOT_DIR)/bundles"
-INSTALL_DIR = !!INSTALL_DIR!!
-INSTALL_BINARY_DIR = "$(INSTALL_DIR)/"!!BINARY_DIR!!
-INSTALL_MAN_DIR = "$(INSTALL_DIR)/$(MAN_DIR)"
-INSTALL_MENU_DIR = "$(INSTALL_DIR)/$(MENU_DIR)"
-INSTALL_ICON_DIR = "$(INSTALL_DIR)/"!!ICON_DIR!!
+MAN_DIR        = !!MAN_DIR!!
+MENU_DIR       = !!MENU_DIR!!
+SRC_DIR        = !!SRC_DIR!!
+ROOT_DIR       = !!ROOT_DIR!!
+BUNDLE_DIR     = "$(ROOT_DIR)/bundle"
+BUNDLES_DIR    = "$(ROOT_DIR)/bundles"
+INSTALL_DIR    = !!INSTALL_DIR!!
+INSTALL_BINARY_DIR     = "$(INSTALL_DIR)/"!!BINARY_DIR!!
+INSTALL_MAN_DIR        = "$(INSTALL_DIR)/$(MAN_DIR)"
+INSTALL_MENU_DIR       = "$(INSTALL_DIR)/$(MENU_DIR)"
+INSTALL_ICON_DIR       = "$(INSTALL_DIR)/"!!ICON_DIR!!
 INSTALL_ICON_THEME_DIR = "$(INSTALL_DIR)/$(ICON_THEME_DIR)"
-INSTALL_DATA_DIR = "$(INSTALL_DIR)/"!!DATA_DIR!!
-INSTALL_DOC_DIR = "$(INSTALL_DIR)/"!!DOC_DIR!!
+INSTALL_DATA_DIR       = "$(INSTALL_DIR)/"!!DATA_DIR!!
+INSTALL_DOC_DIR        = "$(INSTALL_DIR)/"!!DOC_DIR!!
+SOURCE_LIST     = !!SOURCE_LIST!!
+CONFIGURE_FILES = !!CONFIGURE_FILES!!
 BINARY_NAME = !!BINARY_NAME!!
-STRIP = !!STRIP!!
-TTD = !!TTD!!
-TTDS = $(SRC_DIRS:%=%/$(TTD))
-OS = !!OS!!
-OSXAPP = !!OSXAPP!!
-REVISION = !!REVISION!!
-AWK = !!AWK!!
-DISTCC = !!DISTCC!!
+STRIP       = !!STRIP!!
+TTD         = !!TTD!!
+TTDS        = $(SRC_DIRS:%=%/$(TTD))
+OS          = !!OS!!
+OSXAPP      = !!OSXAPP!!
+LIPO        = !!LIPO!!
+REVISION    = !!REVISION!!
+AWK         = !!AWK!!
+DISTCC      = !!DISTCC!!
 
 RES := $(shell if [ ! -f $(CONFIG_CACHE_PWD) ] || [ "`pwd`" != "`cat $(CONFIG_CACHE_PWD)`" ]; then echo "`pwd`" > $(CONFIG_CACHE_PWD); fi )
 RES := $(shell if [ ! -f $(CONFIG_CACHE_SOURCE_LIST) ] || [ -n "`cmp $(CONFIG_CACHE_SOURCE_LIST) $(SOURCE_LIST) 2>/dev/null`" ]; then cp $(SOURCE_LIST) $(CONFIG_CACHE_SOURCE_LIST); fi )
diff --git a/Makefile.lang.in b/Makefile.lang.in
index 3d32c26287..27d3910232 100644
--- a/Makefile.lang.in
+++ b/Makefile.lang.in
@@ -5,20 +5,20 @@
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 # See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 
-STRGEN       = !!STRGEN!!
-ENDIAN_CHECK = !!ENDIAN_CHECK!!
-SRC_DIR      = !!SRC_DIR!!
-LANG_DIR     = !!LANG_DIR!!
-BIN_DIR      = !!BIN_DIR!!
-LANGS_SRC    = $(shell ls $(LANG_DIR)/*.txt)
-LANGS        = $(LANGS_SRC:$(LANG_DIR)/%.txt=%.lng)
-CXX_BUILD    = !!CXX_BUILD!!
-CFLAGS_BUILD = !!CFLAGS_BUILD!!
-LDFLAGS_BUILD= !!LDFLAGS_BUILD!!
-STRGEN_FLAGS = !!STRGEN_FLAGS!!
-STAGE        = !!STAGE!!
-LANG_SUPPRESS= !!LANG_SUPPRESS!!
-LANG_OBJS_DIR= !!LANG_OBJS_DIR!!
+STRGEN        = !!STRGEN!!
+ENDIAN_CHECK  = !!ENDIAN_CHECK!!
+SRC_DIR       = !!SRC_DIR!!
+LANG_DIR      = !!LANG_DIR!!
+BIN_DIR       = !!BIN_DIR!!
+LANGS_SRC     = $(shell ls $(LANG_DIR)/*.txt)
+LANGS         = $(LANGS_SRC:$(LANG_DIR)/%.txt=%.lng)
+CXX_BUILD     = !!CXX_BUILD!!
+CFLAGS_BUILD  = !!CFLAGS_BUILD!!
+LDFLAGS_BUILD = !!LDFLAGS_BUILD!!
+STRGEN_FLAGS  = !!STRGEN_FLAGS!!
+STAGE         = !!STAGE!!
+LANG_SUPPRESS = !!LANG_SUPPRESS!!
+LANG_OBJS_DIR = !!LANG_OBJS_DIR!!
 
 ifeq ($(LANG_SUPPRESS), yes)
 LANG_ERRORS = >/dev/null 2>&1
diff --git a/Makefile.msvc b/Makefile.msvc
index 729847ffc9..8ee1e7088d 100644
--- a/Makefile.msvc
+++ b/Makefile.msvc
@@ -20,14 +20,14 @@ else
 	Q = @
 endif
 
-AWK = "awk"
-ROOT_DIR := $(shell pwd)
-BIN_DIR = "$(ROOT_DIR)/bin"
-SRC_DIR = "$(ROOT_DIR)/src"
-BUNDLE_DIR = "$(ROOT_DIR)/bundle"
+AWK         = "awk"
+ROOT_DIR   := $(shell pwd)
+BIN_DIR     = "$(ROOT_DIR)/bin"
+SRC_DIR     = "$(ROOT_DIR)/src"
+BUNDLE_DIR  = "$(ROOT_DIR)/bundle"
 BUNDLES_DIR = "$(ROOT_DIR)/bundles"
-TTD = openttd.exe
-TARGET := $(shell echo $(PLATFORM) | sed "s@win64@x64@;s@win32@Win32@")
+TTD         = openttd.exe
+TARGET     := $(shell echo $(PLATFORM) | sed "s@win64@x64@;s@win32@Win32@")
 
 all:
 	$(Q)cp objs/$(TARGET)/Release/$(TTD) $(BIN_DIR)/$(TTD)
diff --git a/Makefile.src.in b/Makefile.src.in
index e0083ce2a6..8f6ce81d05 100644
--- a/Makefile.src.in
+++ b/Makefile.src.in
@@ -5,37 +5,37 @@
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 # See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 
-CC_HOST      = !!CC_HOST!!
-CXX_HOST     = !!CXX_HOST!!
-CC_BUILD     = !!CC_BUILD!!
-CXX_BUILD    = !!CXX_BUILD!!
-WINDRES      = !!WINDRES!!
-STRIP        = !!STRIP!!
-CFLAGS       = !!CFLAGS!!
-CFLAGS_BUILD = !!CFLAGS_BUILD!!
-LIBS         = !!LIBS!!
-LDFLAGS      = !!LDFLAGS!!
-LDFLAGS_BUILD= !!LDFLAGS_BUILD!!
-ROOT_DIR     = !!ROOT_DIR!!
-BIN_DIR      = !!BIN_DIR!!
-LANG_DIR     = !!LANG_DIR!!
-SRC_OBJS_DIR = !!SRC_OBJS_DIR!!
-LANG_OBJS_DIR= !!LANG_OBJS_DIR!!
-SRC_DIR      = !!SRC_DIR!!
-SCRIPT_SRC_DIR=!!SCRIPT_SRC_DIR!!
-MEDIA_DIR    = !!MEDIA_DIR!!
-TTD          = !!TTD!!
-STRGEN       = !!STRGEN!!
-ENDIAN_CHECK = !!ENDIAN_CHECK!!
-DEPEND       = !!DEPEND!!
-ENDIAN_FORCE = !!ENDIAN_FORCE!!
-OS           = !!OS!!
-STAGE        = !!STAGE!!
-MAKEDEPEND   = !!MAKEDEPEND!!
-CFLAGS_MAKEDEP= !!CFLAGS_MAKEDEP!!
-SORT         = !!SORT!!
-REVISION     = !!REVISION!!
-AWK          = !!AWK!!
+CC_HOST        = !!CC_HOST!!
+CXX_HOST       = !!CXX_HOST!!
+CC_BUILD       = !!CC_BUILD!!
+CXX_BUILD      = !!CXX_BUILD!!
+WINDRES        = !!WINDRES!!
+STRIP          = !!STRIP!!
+CFLAGS         = !!CFLAGS!!
+CFLAGS_BUILD   = !!CFLAGS_BUILD!!
+LIBS           = !!LIBS!!
+LDFLAGS        = !!LDFLAGS!!
+LDFLAGS_BUILD  = !!LDFLAGS_BUILD!!
+ROOT_DIR       = !!ROOT_DIR!!
+BIN_DIR        = !!BIN_DIR!!
+LANG_DIR       = !!LANG_DIR!!
+SRC_OBJS_DIR   = !!SRC_OBJS_DIR!!
+LANG_OBJS_DIR  = !!LANG_OBJS_DIR!!
+SRC_DIR        = !!SRC_DIR!!
+SCRIPT_SRC_DIR = !!SCRIPT_SRC_DIR!!
+MEDIA_DIR      = !!MEDIA_DIR!!
+TTD            = !!TTD!!
+STRGEN         = !!STRGEN!!
+ENDIAN_CHECK   = !!ENDIAN_CHECK!!
+DEPEND         = !!DEPEND!!
+ENDIAN_FORCE   = !!ENDIAN_FORCE!!
+OS             = !!OS!!
+STAGE          = !!STAGE!!
+MAKEDEPEND     = !!MAKEDEPEND!!
+CFLAGS_MAKEDEP = !!CFLAGS_MAKEDEP!!
+SORT           = !!SORT!!
+REVISION       = !!REVISION!!
+AWK            = !!AWK!!
 CONFIG_CACHE_COMPILER = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_COMPILER!!
 CONFIG_CACHE_LINKER   = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_LINKER!!
 CONFIG_CACHE_ENDIAN   = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_ENDIAN!!