Refactor .gyp files:

Makefile

 # Copyright 2011 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 20 matching lines @@
 LINK ?= "g++"
 OUTDIR ?= out
 TESTJOBS ?= -j16
 GYPFLAGS ?= -Dv8_can_use_vfp_instructions=true
 
 # Architectures and modes to be compiled.
 ARCHES = ia32 x64 arm
 MODES = release debug
 
 # List of files that trigger Makefile regeneration:
-GYPFILES = build/all.gyp build/common.gypi build/v8-features.gypi \
+GYPFILES = build/all.gyp build/common.gypi build/standalone.gypi \
            preparser/preparser.gyp samples/samples.gyp src/d8.gyp \
            test/cctest/cctest.gyp tools/gyp/v8.gyp
 
 # Generates all combinations of ARCHES and MODES, e.g. "ia32.release".
 BUILDS = $(foreach mode,$(MODES),$(addsuffix .$(mode),$(ARCHES)))
 CHECKS = $(addsuffix .check,$(BUILDS))
 # Generates corresponding test targets, e.g. "ia32.release.check".
 
 .PHONY: all release debug ia32 x64 arm $(BUILDS)
 
@@ skipping 31 matching lines @@
         @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) --arch=$(basename $@)
 
 $(CHECKS): $$(basename $$@)
         @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) --arch-and-mode=$(basename $@)
 
 # Clean targets. You can clean each architecture individually, or everything.
 $(addsuffix .clean,$(ARCHES)):
         rm -f $(OUTDIR)/Makefile-$(basename $@)
         rm -rf $(OUTDIR)/$(basename $@).release
         rm -rf $(OUTDIR)/$(basename $@).debug
+        find $(OUTDIR) -regex '.*\(host\|target\)-$(basename $@)\.mk' -delete
 
 clean: $(addsuffix .clean,$(ARCHES))
 
 # GYP file generation targets.
 $(OUTDIR)/Makefile-ia32: $(GYPFILES)
         build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
-                      -Ibuild/common.gypi --depth=. -Dtarget_arch=ia32 -S-ia32 \
+                      -Ibuild/standalone.gypi --depth=. -Dtarget_arch=ia32 -S-ia32 \
                       $(GYPFLAGS)
 
 $(OUTDIR)/Makefile-x64: $(GYPFILES)
         build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
-                      -Ibuild/common.gypi --depth=. -Dtarget_arch=x64 -S-x64 \
+                      -Ibuild/standalone.gypi --depth=. -Dtarget_arch=x64 -S-x64 \
                       $(GYPFLAGS)
 
 $(OUTDIR)/Makefile-arm: $(GYPFILES) build/armu.gypi
         build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
-                      -Ibuild/common.gypi --depth=. -Ibuild/armu.gypi -S-arm \
+                      -Ibuild/standalone.gypi --depth=. -Ibuild/armu.gypi -S-arm \
                       $(GYPFLAGS)