Index: Makefile |
diff --git a/Makefile b/Makefile |
index 8dc5b10f5804b2dc95026bf6e4547ff16b758e6b..5468d913341e31c34b214079c3e72187d0bec6ae 100644 |
--- a/Makefile |
+++ b/Makefile |
@@ -266,7 +266,7 @@ NACL_CHECKS = $(addsuffix .check,$(NACL_BUILDS)) |
# File where previously used GYPFLAGS are stored. |
ENVFILE = $(OUTDIR)/environment |
-.PHONY: all check clean builddeps dependencies $(ENVFILE).new native version \ |
+.PHONY: all check clean builddeps dependencies $(ENVFILE).new native \ |
qc quickcheck $(QUICKCHECKS) turbocheck \ |
$(addsuffix .quickcheck,$(MODES)) $(addsuffix .quickcheck,$(ARCHES)) \ |
$(ARCHES) $(MODES) $(BUILDS) $(CHECKS) $(addsuffix .clean,$(ARCHES)) \ |
@@ -279,13 +279,9 @@ ENVFILE = $(OUTDIR)/environment |
# Target definitions. "all" is the default. |
all: $(DEFAULT_MODES) |
-# Target for generating the v8 version file from git tags. |
-version: |
- build/generate_version.py |
- |
# Special target for the buildbots to use. Depends on $(OUTDIR)/Makefile |
# having been created before. |
-buildbot: version |
+buildbot: |
$(MAKE) -C "$(OUTDIR)" BUILDTYPE=$(BUILDTYPE) \ |
builddir="$(abspath $(OUTDIR))/$(BUILDTYPE)" |
@@ -296,14 +292,14 @@ $(MODES): $(addsuffix .$$@,$(DEFAULT_ARCHES)) |
$(ARCHES): $(addprefix $$@.,$(DEFAULT_MODES)) |
# Defines how to build a particular target (e.g. ia32.release). |
-$(BUILDS): $(OUTDIR)/Makefile.$$@ version |
+$(BUILDS): $(OUTDIR)/Makefile.$$@ |
@$(MAKE) -C "$(OUTDIR)" -f Makefile.$@ \ |
BUILDTYPE=$(shell echo $(subst .,,$(suffix $@)) | \ |
python -c "print \ |
raw_input().replace('opt', '').capitalize()") \ |
builddir="$(shell pwd)/$(OUTDIR)/$@" |
-native: $(OUTDIR)/Makefile.native version |
+native: $(OUTDIR)/Makefile.native |
@$(MAKE) -C "$(OUTDIR)" -f Makefile.native \ |
BUILDTYPE=Release \ |
builddir="$(shell pwd)/$(OUTDIR)/$@" |
@@ -311,8 +307,7 @@ native: $(OUTDIR)/Makefile.native version |
$(ANDROID_ARCHES): $(addprefix $$@.,$(MODES)) |
$(ANDROID_BUILDS): $(GYPFILES) $(ENVFILE) build/android.gypi \ |
- must-set-ANDROID_NDK_ROOT_OR_TOOLCHAIN Makefile.android \ |
- version |
+ must-set-ANDROID_NDK_ROOT_OR_TOOLCHAIN Makefile.android |
@$(MAKE) -f Makefile.android $@ \ |
ARCH="$(basename $@)" \ |
MODE="$(subst .,,$(suffix $@))" \ |
@@ -322,7 +317,7 @@ $(ANDROID_BUILDS): $(GYPFILES) $(ENVFILE) build/android.gypi \ |
$(NACL_ARCHES): $(addprefix $$@.,$(MODES)) |
$(NACL_BUILDS): $(GYPFILES) $(ENVFILE) \ |
- Makefile.nacl must-set-NACL_SDK_ROOT version |
+ Makefile.nacl must-set-NACL_SDK_ROOT |
@$(MAKE) -f Makefile.nacl $@ \ |
ARCH="$(basename $@)" \ |
MODE="$(subst .,,$(suffix $@))" \ |
@@ -422,10 +417,7 @@ native.clean: |
rm -rf $(OUTDIR)/native |
find $(OUTDIR) -regex '.*\(host\|target\)\.native\.mk' -delete |
-version.clean: |
- rm -f src/version_gen.cc |
- |
-clean: $(addsuffix .clean, $(ARCHES) $(ANDROID_ARCHES) $(NACL_ARCHES)) native.clean gtags.clean version.clean |
+clean: $(addsuffix .clean, $(ARCHES) $(ANDROID_ARCHES) $(NACL_ARCHES)) native.clean gtags.clean |
# GYP file generation targets. |
OUT_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(BUILDS)) |