diff options
| author | rubidium <rubidium@openttd.org> | 2010-02-05 16:20:04 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2010-02-05 16:20:04 +0000 |
| commit | a80eb0a1c00136ca3c4bbbe94842f386fdd2a334 (patch) | |
| tree | 4c6ebd697d4eb3bd9b44facba2e80c9bc3c5477e | |
| parent | 7c1170668a715ec11d21bcb58e2ae005e1202768 (diff) | |
| download | openttd-a80eb0a1c00136ca3c4bbbe94842f386fdd2a334.tar.xz | |
(svn r19018) -Change: [Makefile] Make test an alias for regression, distclean an alias for mrproper and update mrproper to really delete all generated files/directories.
| -rw-r--r-- | Makefile.in | 17 | ||||
| -rw-r--r-- | Makefile.lang.in | 1 | ||||
| -rw-r--r-- | config.lib | 1 |
3 files changed, 18 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 685cf786f..c4200b833 100644 --- a/Makefile.in +++ b/Makefile.in @@ -129,10 +129,22 @@ mrproper: done $(Q)rm -rf objs $(Q)rm -f Makefile Makefile.am Makefile.bundle - $(Q)rm -f media/openttd.desktop + $(Q)rm -f media/openttd.desktop media/openttd.desktop.install $(Q)rm -f $(CONFIG_CACHE_SOURCE_LIST) config.cache config.pwd config.log $(CONFIG_CACHE_PWD) +# directories for bundle generation $(Q)rm -rf $(BUNDLE_DIR) $(Q)rm -rf $(BUNDLES_DIR) +# output of profiling + $(Q)rm -f $(BIN_DIR)/gmon.out +# output of generating 'API' documentation + $(Q)rm -f $(ROOT_DIR)/openttd.tag + $(Q)rm -rf $(ROOT_DIR)/docs/source +# output of generating AI API documentation + $(Q)rm -f $(SRC_DIR)/ai/api/openttd.tag + $(Q)rm -rf $(ROOT_DIR)/docs/aidocs +# directories created by OpenTTD on regression testing + $(Q)rm -rf $(BIN_DIR)/ai/regression/content_download $(BIN_DIR)/ai/regression/save $(BIN_DIR)/ai/regression/scenario +distclean: mrproper depend: @for dir in $(SRC_DIRS); do \ @@ -150,6 +162,7 @@ run-prof: all regression: all $(Q)cd !!BIN_DIR!! && sh ai/regression/run.sh +test: regression %.o: @for dir in $(SRC_DIRS); do \ @@ -161,4 +174,6 @@ regression: all $(MAKE) -C $$dir $@; \ done +.PHONY: test distclean mrproper clean + include Makefile.bundle diff --git a/Makefile.lang.in b/Makefile.lang.in index 4f2acc68a..cec40e77e 100644 --- a/Makefile.lang.in +++ b/Makefile.lang.in @@ -88,6 +88,7 @@ clean: $(Q)rm -f strgen.o string.o table/strings.h $(STRGEN) $(LANGS) $(LANGS:%=$(BIN_DIR)/lang/%) lang/english.* $(ENDIAN_TARGETS) mrproper: clean + $(Q)rm -rf $(BIN_DIR)/lang %.lng: @echo '$(STAGE) No such language: $(@:%.lng=%)' diff --git a/config.lib b/config.lib index 0c258454e..348d4bae9 100644 --- a/config.lib +++ b/config.lib @@ -274,6 +274,7 @@ detect_params() { --enable-ipo=*) enable_lto="$optarg";; --enable-dedicated) enable_dedicated="1";; --enable-dedicated=*) enable_dedicated="$optarg";; + --enable-network) enable_network="2";; --enable-network=*) enable_network="$optarg";; --disable-network) enable_network="0";; --disable-static) enable_static="0";; |