--- a/Makefile.in Sat Jun 02 19:59:29 2007 +0000
+++ b/Makefile.in Sat Jul 14 19:42:58 2007 +0000
@@ -31,10 +31,14 @@
OSXAPP = !!OSXAPP!!
REVISION = !!REVISION!!
AWK = !!AWK!!
+DISTCC = !!DISTCC!!
RES := $(shell if ! [ -f $(CONFIG_CACHE_SOURCE_LIST) ] || [ -n "`cmp $(CONFIG_CACHE_SOURCE_LIST) $(SOURCE_LIST)`" ]; then cp $(SOURCE_LIST) $(CONFIG_CACHE_SOURCE_LIST); fi )
all: config.cache
+ifdef DISTCC
+ @if [ -z "`echo '$(MFLAGS)' | grep '\-j'`" ]; then echo; echo "WARNING: you enabled distcc support, but you don't seem to be using the -jN paramter"; echo; fi
+endif
@for dir in $(DIRS); do \
$(MAKE) -C $$dir all; \
done
@@ -48,6 +52,28 @@
$(Q)$(LIPO) -create -output $(BIN_DIR)/$(TTD) $(TTDS)
endif
+help:
+ @echo "Available make commands:"
+ @echo ""
+ @echo "Compilation:"
+ @echo " all compile the executable and the lang files"
+ @echo " lang compile the lang files only"
+ @echo "Clean up:"
+ @echo " clean remove the files generated during compilation"
+ @echo " mrproper remove the files generated during configuration and compilation"
+ @echo "Run after compilation:"
+ @echo " run execute openttd after the compilation"
+ @echo " run-gdb execute openttd in debug mode after the compilation"
+ @echo " run-prof execute openttd in profiling mode after the compilation"
+ @echo "Installation:"
+ @echo " install install the compiled files and the data-files after the compilation"
+ @echo " bundle create the base for an installation bundle"
+ @echo " bundle_zip create the zip installation bundle"
+ @echo " bundle_gzip create the gzip installation bundle"
+ @echo " bundle_bzip2 create the bzip2 installation bundle"
+ @echo " bundle_lha create the lha installation bundle"
+ @echo " bundle_dmg create the dmg installation bundle"
+
config.cache: $(CONFIG_CACHE_SOURCE_LIST) $(CONFIGURE_FILES)
ifeq ($(shell if test -f config.cache; then echo 1; fi), 1)
@echo "----------------"
@@ -99,6 +125,9 @@
run-gdb: all
$(Q)cd !!BIN_DIR!! && gdb --ex run --args ./!!TTD!! $(OPENTTD_ARGS)
+run-prof: all
+ $(Q)cd !!BIN_DIR!! && ./!!TTD!! $(OPENTTD_ARGS) && gprof !!TTD!! | less
+
%.o:
@for dir in $(SRC_DIRS); do \
$(MAKE) -C $$dir $(@:src/%=%); \
@@ -172,6 +201,7 @@
$(Q)cp "$(ROOT_DIR)/COPYING" "$(BUNDLE_DIR)/"
$(Q)cp "$(ROOT_DIR)/known-bugs.txt" "$(BUNDLE_DIR)/docs/"
$(Q)cp "$(ROOT_DIR)/docs/multiplayer.txt" "$(BUNDLE_DIR)/docs/"
+ $(Q)cp "$(ROOT_DIR)/docs/32bpp.txt" "$(BUNDLE_DIR)/docs/"
$(Q)cp "$(ROOT_DIR)/changelog.txt" "$(BUNDLE_DIR)/docs/"
$(Q)cp "$(ROOT_DIR)/media/openttd.64.png" "$(BUNDLE_DIR)/media/"
$(Q)cp "$(ROOT_DIR)/media/openttd.32.xpm" "$(BUNDLE_DIR)/media/"
@@ -221,11 +251,6 @@
$(Q)mkdir -p "$(BUNDLES_DIR)"
$(Q)hdiutil create -ov -format UDZO -srcfolder "$(BUNDLE_DIR)" "$(BUNDLES_DIR)/$(BUNDLE_NAME).dmg"
-# TODO: ENABLE_INSTALL should be removed when the search path patch has been applied
-ifeq ($(ENABLE_INSTALL), 0)
-install:
- @echo '[INSTALL] Cannot install. Not compiled with installation paths'
-else
ifdef OSXAPP
install:
@echo '[INSTALL] Cannot install the OSX Application Bundle'
@@ -250,4 +275,3 @@
$(Q)cp -R "$(BUNDLE_DIR)/scenario" "$(INSTALL_DATA_DIR)"
endif # INSTALL_PERSONAL_DIR
endif # OSXAPP
-endif # ENABLE_INSTALL