mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-03-06 06:15:04 +00:00
(svn r17454) -Codechange: some alignment in Makefile*.in
This commit is contained in:
smatz
parent
d916400521
commit
6e3591700f
52
Makefile.in
52
Makefile.in
@ -14,36 +14,36 @@ endif
|
|||||||
|
|
||||||
include Makefile.am
|
include Makefile.am
|
||||||
|
|
||||||
SOURCE_LIST = !!SOURCE_LIST!!
|
CONFIG_CACHE_PWD = !!CONFIG_CACHE_PWD!!
|
||||||
CONFIG_CACHE_SOURCE_LIST = !!CONFIG_CACHE_SOURCE_LIST!!
|
CONFIG_CACHE_SOURCE_LIST = !!CONFIG_CACHE_SOURCE_LIST!!
|
||||||
CONFIG_CACHE_PWD = !!CONFIG_CACHE_PWD!!
|
BIN_DIR = !!BIN_DIR!!
|
||||||
CONFIGURE_FILES = !!CONFIGURE_FILES!!
|
|
||||||
LIPO = !!LIPO!!
|
|
||||||
BIN_DIR = !!BIN_DIR!!
|
|
||||||
ICON_THEME_DIR = !!ICON_THEME_DIR!!
|
ICON_THEME_DIR = !!ICON_THEME_DIR!!
|
||||||
MAN_DIR = !!MAN_DIR!!
|
MAN_DIR = !!MAN_DIR!!
|
||||||
MENU_DIR = !!MENU_DIR!!
|
MENU_DIR = !!MENU_DIR!!
|
||||||
SRC_DIR = !!SRC_DIR!!
|
SRC_DIR = !!SRC_DIR!!
|
||||||
ROOT_DIR = !!ROOT_DIR!!
|
ROOT_DIR = !!ROOT_DIR!!
|
||||||
BUNDLE_DIR = "$(ROOT_DIR)/bundle"
|
BUNDLE_DIR = "$(ROOT_DIR)/bundle"
|
||||||
BUNDLES_DIR = "$(ROOT_DIR)/bundles"
|
BUNDLES_DIR = "$(ROOT_DIR)/bundles"
|
||||||
INSTALL_DIR = !!INSTALL_DIR!!
|
INSTALL_DIR = !!INSTALL_DIR!!
|
||||||
INSTALL_BINARY_DIR = "$(INSTALL_DIR)/"!!BINARY_DIR!!
|
INSTALL_BINARY_DIR = "$(INSTALL_DIR)/"!!BINARY_DIR!!
|
||||||
INSTALL_MAN_DIR = "$(INSTALL_DIR)/$(MAN_DIR)"
|
INSTALL_MAN_DIR = "$(INSTALL_DIR)/$(MAN_DIR)"
|
||||||
INSTALL_MENU_DIR = "$(INSTALL_DIR)/$(MENU_DIR)"
|
INSTALL_MENU_DIR = "$(INSTALL_DIR)/$(MENU_DIR)"
|
||||||
INSTALL_ICON_DIR = "$(INSTALL_DIR)/"!!ICON_DIR!!
|
INSTALL_ICON_DIR = "$(INSTALL_DIR)/"!!ICON_DIR!!
|
||||||
INSTALL_ICON_THEME_DIR = "$(INSTALL_DIR)/$(ICON_THEME_DIR)"
|
INSTALL_ICON_THEME_DIR = "$(INSTALL_DIR)/$(ICON_THEME_DIR)"
|
||||||
INSTALL_DATA_DIR = "$(INSTALL_DIR)/"!!DATA_DIR!!
|
INSTALL_DATA_DIR = "$(INSTALL_DIR)/"!!DATA_DIR!!
|
||||||
INSTALL_DOC_DIR = "$(INSTALL_DIR)/"!!DOC_DIR!!
|
INSTALL_DOC_DIR = "$(INSTALL_DIR)/"!!DOC_DIR!!
|
||||||
|
SOURCE_LIST = !!SOURCE_LIST!!
|
||||||
|
CONFIGURE_FILES = !!CONFIGURE_FILES!!
|
||||||
BINARY_NAME = !!BINARY_NAME!!
|
BINARY_NAME = !!BINARY_NAME!!
|
||||||
STRIP = !!STRIP!!
|
STRIP = !!STRIP!!
|
||||||
TTD = !!TTD!!
|
TTD = !!TTD!!
|
||||||
TTDS = $(SRC_DIRS:%=%/$(TTD))
|
TTDS = $(SRC_DIRS:%=%/$(TTD))
|
||||||
OS = !!OS!!
|
OS = !!OS!!
|
||||||
OSXAPP = !!OSXAPP!!
|
OSXAPP = !!OSXAPP!!
|
||||||
REVISION = !!REVISION!!
|
LIPO = !!LIPO!!
|
||||||
AWK = !!AWK!!
|
REVISION = !!REVISION!!
|
||||||
DISTCC = !!DISTCC!!
|
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_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 )
|
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 )
|
||||||
|
|||||||
@ -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.
|
# 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/>.
|
# 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!!
|
STRGEN = !!STRGEN!!
|
||||||
ENDIAN_CHECK = !!ENDIAN_CHECK!!
|
ENDIAN_CHECK = !!ENDIAN_CHECK!!
|
||||||
SRC_DIR = !!SRC_DIR!!
|
SRC_DIR = !!SRC_DIR!!
|
||||||
LANG_DIR = !!LANG_DIR!!
|
LANG_DIR = !!LANG_DIR!!
|
||||||
BIN_DIR = !!BIN_DIR!!
|
BIN_DIR = !!BIN_DIR!!
|
||||||
LANGS_SRC = $(shell ls $(LANG_DIR)/*.txt)
|
LANGS_SRC = $(shell ls $(LANG_DIR)/*.txt)
|
||||||
LANGS = $(LANGS_SRC:$(LANG_DIR)/%.txt=%.lng)
|
LANGS = $(LANGS_SRC:$(LANG_DIR)/%.txt=%.lng)
|
||||||
CXX_BUILD = !!CXX_BUILD!!
|
CXX_BUILD = !!CXX_BUILD!!
|
||||||
CFLAGS_BUILD = !!CFLAGS_BUILD!!
|
CFLAGS_BUILD = !!CFLAGS_BUILD!!
|
||||||
LDFLAGS_BUILD= !!LDFLAGS_BUILD!!
|
LDFLAGS_BUILD = !!LDFLAGS_BUILD!!
|
||||||
STRGEN_FLAGS = !!STRGEN_FLAGS!!
|
STRGEN_FLAGS = !!STRGEN_FLAGS!!
|
||||||
STAGE = !!STAGE!!
|
STAGE = !!STAGE!!
|
||||||
LANG_SUPPRESS= !!LANG_SUPPRESS!!
|
LANG_SUPPRESS = !!LANG_SUPPRESS!!
|
||||||
LANG_OBJS_DIR= !!LANG_OBJS_DIR!!
|
LANG_OBJS_DIR = !!LANG_OBJS_DIR!!
|
||||||
|
|
||||||
ifeq ($(LANG_SUPPRESS), yes)
|
ifeq ($(LANG_SUPPRESS), yes)
|
||||||
LANG_ERRORS = >/dev/null 2>&1
|
LANG_ERRORS = >/dev/null 2>&1
|
||||||
|
|||||||
@ -20,14 +20,14 @@ else
|
|||||||
Q = @
|
Q = @
|
||||||
endif
|
endif
|
||||||
|
|
||||||
AWK = "awk"
|
AWK = "awk"
|
||||||
ROOT_DIR := $(shell pwd)
|
ROOT_DIR := $(shell pwd)
|
||||||
BIN_DIR = "$(ROOT_DIR)/bin"
|
BIN_DIR = "$(ROOT_DIR)/bin"
|
||||||
SRC_DIR = "$(ROOT_DIR)/src"
|
SRC_DIR = "$(ROOT_DIR)/src"
|
||||||
BUNDLE_DIR = "$(ROOT_DIR)/bundle"
|
BUNDLE_DIR = "$(ROOT_DIR)/bundle"
|
||||||
BUNDLES_DIR = "$(ROOT_DIR)/bundles"
|
BUNDLES_DIR = "$(ROOT_DIR)/bundles"
|
||||||
TTD = openttd.exe
|
TTD = openttd.exe
|
||||||
TARGET := $(shell echo $(PLATFORM) | sed "s@win64@x64@;s@win32@Win32@")
|
TARGET := $(shell echo $(PLATFORM) | sed "s@win64@x64@;s@win32@Win32@")
|
||||||
|
|
||||||
all:
|
all:
|
||||||
$(Q)cp objs/$(TARGET)/Release/$(TTD) $(BIN_DIR)/$(TTD)
|
$(Q)cp objs/$(TARGET)/Release/$(TTD) $(BIN_DIR)/$(TTD)
|
||||||
|
|||||||
@ -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.
|
# 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/>.
|
# 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!!
|
CC_HOST = !!CC_HOST!!
|
||||||
CXX_HOST = !!CXX_HOST!!
|
CXX_HOST = !!CXX_HOST!!
|
||||||
CC_BUILD = !!CC_BUILD!!
|
CC_BUILD = !!CC_BUILD!!
|
||||||
CXX_BUILD = !!CXX_BUILD!!
|
CXX_BUILD = !!CXX_BUILD!!
|
||||||
WINDRES = !!WINDRES!!
|
WINDRES = !!WINDRES!!
|
||||||
STRIP = !!STRIP!!
|
STRIP = !!STRIP!!
|
||||||
CFLAGS = !!CFLAGS!!
|
CFLAGS = !!CFLAGS!!
|
||||||
CFLAGS_BUILD = !!CFLAGS_BUILD!!
|
CFLAGS_BUILD = !!CFLAGS_BUILD!!
|
||||||
LIBS = !!LIBS!!
|
LIBS = !!LIBS!!
|
||||||
LDFLAGS = !!LDFLAGS!!
|
LDFLAGS = !!LDFLAGS!!
|
||||||
LDFLAGS_BUILD= !!LDFLAGS_BUILD!!
|
LDFLAGS_BUILD = !!LDFLAGS_BUILD!!
|
||||||
ROOT_DIR = !!ROOT_DIR!!
|
ROOT_DIR = !!ROOT_DIR!!
|
||||||
BIN_DIR = !!BIN_DIR!!
|
BIN_DIR = !!BIN_DIR!!
|
||||||
LANG_DIR = !!LANG_DIR!!
|
LANG_DIR = !!LANG_DIR!!
|
||||||
SRC_OBJS_DIR = !!SRC_OBJS_DIR!!
|
SRC_OBJS_DIR = !!SRC_OBJS_DIR!!
|
||||||
LANG_OBJS_DIR= !!LANG_OBJS_DIR!!
|
LANG_OBJS_DIR = !!LANG_OBJS_DIR!!
|
||||||
SRC_DIR = !!SRC_DIR!!
|
SRC_DIR = !!SRC_DIR!!
|
||||||
SCRIPT_SRC_DIR=!!SCRIPT_SRC_DIR!!
|
SCRIPT_SRC_DIR = !!SCRIPT_SRC_DIR!!
|
||||||
MEDIA_DIR = !!MEDIA_DIR!!
|
MEDIA_DIR = !!MEDIA_DIR!!
|
||||||
TTD = !!TTD!!
|
TTD = !!TTD!!
|
||||||
STRGEN = !!STRGEN!!
|
STRGEN = !!STRGEN!!
|
||||||
ENDIAN_CHECK = !!ENDIAN_CHECK!!
|
ENDIAN_CHECK = !!ENDIAN_CHECK!!
|
||||||
DEPEND = !!DEPEND!!
|
DEPEND = !!DEPEND!!
|
||||||
ENDIAN_FORCE = !!ENDIAN_FORCE!!
|
ENDIAN_FORCE = !!ENDIAN_FORCE!!
|
||||||
OS = !!OS!!
|
OS = !!OS!!
|
||||||
STAGE = !!STAGE!!
|
STAGE = !!STAGE!!
|
||||||
MAKEDEPEND = !!MAKEDEPEND!!
|
MAKEDEPEND = !!MAKEDEPEND!!
|
||||||
CFLAGS_MAKEDEP= !!CFLAGS_MAKEDEP!!
|
CFLAGS_MAKEDEP = !!CFLAGS_MAKEDEP!!
|
||||||
SORT = !!SORT!!
|
SORT = !!SORT!!
|
||||||
REVISION = !!REVISION!!
|
REVISION = !!REVISION!!
|
||||||
AWK = !!AWK!!
|
AWK = !!AWK!!
|
||||||
CONFIG_CACHE_COMPILER = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_COMPILER!!
|
CONFIG_CACHE_COMPILER = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_COMPILER!!
|
||||||
CONFIG_CACHE_LINKER = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_LINKER!!
|
CONFIG_CACHE_LINKER = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_LINKER!!
|
||||||
CONFIG_CACHE_ENDIAN = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_ENDIAN!!
|
CONFIG_CACHE_ENDIAN = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_ENDIAN!!
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user