cpp/openttd-patchpack/source Changeset - r10076:abc7bd0d29af

Changeset - r10076:abc7bd0d29af

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

truebrain - 16 years ago 2008-09-04 19:15:52
truebrain@openttd.org

(svn r14244) -Fix: add 'Auto-generated' text when autogenerated, not in template (complain by blathijs ;))

4 files changed with 6 insertions and 9 deletions:

Makefile.in

Makefile.lang.in

Makefile.src.in

config.lib

0 comments (0 inline, 0 general)

Makefile.in

➞

Show inline comments

 # Auto-generated file -- DO NOT EDIT
 # Check if we want to show what we are doing
 ifdef VERBOSE
 	Q =
 else
 	Q = @
 endif
 include Makefile.am
 SOURCE_LIST = !!SOURCE_LIST!!
 CONFIG_CACHE_SOURCE_LIST = !!CONFIG_CACHE_SOURCE_LIST!!
 CONFIG_CACHE_PWD = !!CONFIG_CACHE_PWD!!

Makefile.lang.in

➞

Show inline comments

 # Auto-generated file -- DO NOT EDIT
 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!!
 STRGEN_FLAGS = !!STRGEN_FLAGS!!
 STAGE        = !!STAGE!!
 LANG_SUPPRESS= !!LANG_SUPPRESS!!

Makefile.src.in

➞

Show inline comments

 # Auto-generated file -- DO NOT EDIT
 CC_HOST      = !!CC_HOST!!
 CXX_HOST     = !!CXX_HOST!!
 CC_BUILD     = !!CC_BUILD!!
 CXX_BUILD    = !!CXX_BUILD!!
 WINDRES      = !!WINDRES!!
 STRIP        = !!STRIP!!
 CC_CFLAGS    = !!CC_CFLAGS!!
 CFLAGS       = !!CFLAGS!!
 CFLAGS_BUILD = !!CFLAGS_BUILD!!
 LIBS         = !!LIBS!!
 LDFLAGS      = !!LDFLAGS!!
 BIN_DIR      = !!BIN_DIR!!

config.lib

➞

Show inline comments

@@ @@ -2366,25 +2366,26 @@ generate_menu_item() { @@
 	echo "Generating menu item..."
 	mkdir -p media
 	< $ROOT_DIR/media/openttd.desktop.in sed "$MENU_REPLACE" > media/openttd.desktop
+}
 generate_main() {
 	STAGE="[MAIN]"
 	make_sed
 	# Create the main Makefile
 	echo "Generating Makefile..."
 	< $ROOT_DIR/Makefile.in sed "$SRC_REPLACE" > Makefile
 	echo "# Auto-generated file from 'Makefile.in' -- DO NOT EDIT" > Makefile
 	< $ROOT_DIR/Makefile.in sed "$SRC_REPLACE" >> Makefile
 	cp $ROOT_DIR/Makefile.bundle.in Makefile.bundle
 	echo "# Auto-generated file -- DO NOT EDIT" > Makefile.am
 	echo >> Makefile.am
 	# Make the copy of the source-list, so we don't trigger an unwanted recompile
 	cp $SOURCE_LIST config.cache.source.list
 	# Add the current directory, so we don't trigger an unwanted recompile
 	echo "`pwd`" > config.cache.pwd
 	# Make sure config.cache is OLDER then config.cache.source.list
 	touch config.cache
 	touch config.pwd
 	if [ "$menu_dir" != "" ]; then
@@ @@ -2392,39 +2393,41 @@ generate_main() { @@
 	fi
+}
 generate_lang() {
 	STAGE="[LANG]"
 	make_sed
 	# Create the language file
 	mkdir -p $LANG_OBJS_DIR
 	echo "Generating lang/Makefile..."
 	< $ROOT_DIR/Makefile.lang.in sed "$SRC_REPLACE" > $LANG_OBJS_DIR/Makefile
 	echo "# Auto-generated file from 'Makefile.lang.in' -- DO NOT EDIT" > $LANG_OBJS_DIR/Makefile
 	< $ROOT_DIR/Makefile.lang.in sed "$SRC_REPLACE" >> $LANG_OBJS_DIR/Makefile
 	echo "DIRS += $LANG_OBJS_DIR" >> Makefile.am
 	echo "LANG_DIRS += $LANG_OBJS_DIR" >> Makefile.am
+}
 generate_src_normal() {
 	STAGE=$1
 	make_sed
 	# Create the source file
 	mkdir -p $SRC_OBJS_DIR
 	echo "Generating $2/Makefile..."
 	< $ROOT_DIR/Makefile.src.in sed "$SRC_REPLACE" > $SRC_OBJS_DIR/Makefile
 	echo "# Auto-generated file from 'Makefile.src.in' -- DO NOT EDIT" > $SRC_OBJS_DIR/Makefile
 	< $ROOT_DIR/Makefile.src.in sed "$SRC_REPLACE" >> $SRC_OBJS_DIR/Makefile
 	echo "DIRS += $SRC_OBJS_DIR" >> Makefile.am
 	echo "SRC_DIRS += $SRC_OBJS_DIR" >> Makefile.am
+}
 generate_src_osx() {
 	cc_host_orig="$cc_host"
 	cxx_host_orig="$cxx_host"
 	BASE_SRC_OBJS_DIR="$OBJS_DIR/ppc"
 	cc_host="$cc_host_orig -arch ppc"
 	cxx_host="$cxx_host_orig -arch ppc"
 	generate_src_normal "[PowerPC]" "objs/ppc"

0 comments (0 inline, 0 general)