Merge mozilla-central to build-system.

Makefile.in

@@ -21,43 +21,6 @@ include $(DEPTH)/config/autoconf.mk
 
 default::
 
-TIERS += base
-
-#
-# tier "base" - basic setup
-#
-tier_base_dirs = \
-  config \
-  build \
-  probes \
-  mfbt \
-  python \
-  $(NULL)
-
-ifndef LIBXUL_SDK
-ifeq (android,$(MOZ_WIDGET_TOOLKIT))
-tier_base_dirs += \
-  other-licenses/android \
-  $(NULL)
-endif
-ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
-tier_base_dirs += \
-  other-licenses/android \
-  $(NULL)
-endif
-
-ifdef MOZ_MEMORY
-tier_base_dirs += memory
-endif
-ifndef MOZ_NATIVE_ZLIB
-tier_base_dirs += modules/zlib
-endif
-tier_base_dirs += \
-  mozglue \
-  memory/mozalloc \
-  $(NULL)
-endif
-
 ifdef COMPILE_ENVIRONMENT
 include $(topsrcdir)/$(MOZ_BUILD_APP)/build.mk
 endif

accessible/Makefile.in

@@ -11,9 +11,6 @@ VPATH   = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE	= accessibility
-DIRS    = public src build
-
-TEST_DIRS += tests
 
 include $(topsrcdir)/config/rules.mk
 

accessible/build/moz.build

@@ -1,6 +1,5 @@
+# vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TIERS += js
-tier_js_dirs = js/src

accessible/moz.build

@@ -0,0 +1,7 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIRS += ['public', 'src', 'build']
+TEST_DIRS += ['tests']

accessible/public/Makefile.in

@@ -10,10 +10,6 @@ VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-DIRS = msaa ia2
-endif
-
 MODULE    = accessibility
 XPIDL_MODULE= accessibility
 GRE_MODULE	= 1

accessible/public/ia2/moz.build

@@ -1,8 +1,5 @@
-#! /bin/sh
+# vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-add_makefiles "
-  extensions/gio/Makefile
-"

accessible/public/moz.build

@@ -0,0 +1,7 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+    DIRS += ['msaa', 'ia2']

accessible/public/msaa/moz.build

@@ -1,8 +1,5 @@
-#! /bin/sh
+# vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-add_makefiles "
-  extensions/gnomevfs/Makefile
-"

accessible/src/Makefile.in

@@ -1,4 +1,3 @@
-#
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -19,35 +18,4 @@ ifeq (,$(filter aurora beta release esr,$(MOZ_UPDATE_CHANNEL)))
 endif
 export A11Y_LOG
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-PLATFORM_DIR = atk
-else
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-PLATFORM_DIR = \
-  msaa \
-  windows \
-  $(null)
-else
-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-PLATFORM_DIR += mac
-else
-PLATFORM_DIR += other
-endif
-endif
-endif
-
-DIRS += $(PLATFORM_DIR)
-
-DIRS += \
-  base \
-  generic \
-  html \
-  jsat \
-  xpcom \
-  $(null)
-
-ifdef MOZ_XUL
-DIRS +=   xul
-endif
-
 include $(topsrcdir)/config/rules.mk

accessible/src/atk/moz.build

@@ -1,8 +1,5 @@
-#! /bin/sh
+# vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-add_makefiles "
-  extensions/permissions/Makefile
-"

accessible/src/base/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/src/generic/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/src/html/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/src/jsat/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/src/mac/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/src/moz.build

@@ -0,0 +1,21 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
+
+if toolkit == 'gtk2':
+    DIRS += ['atk']
+elif toolkit == 'windows':
+    DIRS += ['msaa', 'windows']
+elif toolkit == 'cocoa':
+    DIRS += ['mac']
+else:
+    DIRS += ['other']
+
+
+DIRS += ['base', 'generic', 'html', 'jsat', 'xpcom']
+
+if CONFIG['MOZ_XUL']:
+    DIRS += ['xul']

accessible/src/msaa/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/src/other/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/src/windows/Makefile.in

@@ -10,12 +10,6 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS += \
-  ia2 \
-  sdn \
-  uia \
-  $(null)
-
 include $(topsrcdir)/config/rules.mk
 
 ifneq ($(A11Y_LOG),0)

accessible/src/windows/ia2/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/src/windows/moz.build

@@ -0,0 +1,7 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIRS += ['ia2', 'sdn', 'uia']
+

accessible/src/windows/sdn/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/src/windows/uia/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/src/xpcom/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/src/xul/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/tests/Makefile.in

@@ -12,7 +12,5 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE	= test_accessibility
 
-DIRS	= mochitest
-
 include $(topsrcdir)/config/rules.mk
 

accessible/tests/mochitest/Makefile.in

@@ -9,34 +9,6 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 relativesrcdir  = accessible
 
-DIRS	= \
-  actions \
-  attributes \
-  bounds \
-  editabletext \
-  elm \
-  events \
-  focus \
-  hittest \
-  hyperlink \
-  hypertext \
-  name \
-  pivot \
-  relations \
-  role \
-  scroll \
-  selectable \
-  states \
-  table \
-  text \
-  textattrs \
-  textcaret \
-  textselection \
-  tree \
-  treeupdate \
-  value \
-  $(null)
-
 include $(DEPTH)/config/autoconf.mk
 
 MOCHITEST_A11Y_FILES =\

accessible/tests/mochitest/actions/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/tests/mochitest/attributes/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/tests/mochitest/bounds/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/tests/mochitest/editabletext/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/tests/mochitest/elm/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/tests/mochitest/events/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/tests/mochitest/focus/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/tests/mochitest/hittest/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/tests/mochitest/hyperlink/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/tests/mochitest/hypertext/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/tests/mochitest/moz.build

@@ -0,0 +1,32 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIRS += [
+    'actions',
+    'attributes',
+    'bounds',
+    'editabletext',
+    'elm',
+    'events',
+    'focus',
+    'hittest',
+    'hyperlink',
+    'hypertext',
+    'name',
+    'pivot',
+    'relations',
+    'role',
+    'scroll',
+    'selectable',
+    'states',
+    'table',
+    'text',
+    'textattrs',
+    'textcaret',
+    'textselection',
+    'tree',
+    'treeupdate',
+    'value',
+]

accessible/tests/mochitest/name/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/tests/mochitest/pivot/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/tests/mochitest/relations/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/tests/mochitest/role/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/tests/mochitest/scroll/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/tests/mochitest/selectable/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/tests/mochitest/states/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/tests/mochitest/table/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/tests/mochitest/text/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/tests/mochitest/textattrs/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/tests/mochitest/textcaret/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/tests/mochitest/textselection/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/tests/mochitest/tree/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/tests/mochitest/treeupdate/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/tests/mochitest/value/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

accessible/tests/moz.build

@@ -0,0 +1,6 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIRS += ['mochitest']

addon-sdk/Makefile.in

@@ -9,8 +9,6 @@ VPATH     = @srcdir@
 
 include $(topsrcdir)/config/config.mk
 
-TEST_DIRS += test
-
 libs::
 	$(PYTHON) $(srcdir)/copy_source.py $(topsrcdir) $(srcdir)/source/lib $(FINAL_TARGET)/modules/commonjs >copy_source.mk
 	$(MAKE) -f copy_source.mk libs

addon-sdk/moz.build

@@ -0,0 +1,7 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+TEST_DIRS += ['test']
+

addon-sdk/test/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

allmakefiles.sh

@@ -1,187 +0,0 @@
-#! /bin/sh
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# allmakefiles.sh - List of all makefiles.
-#   Appends the list of makefiles to the variable, MAKEFILES.
-#   There is no need to rerun autoconf after adding makefiles.
-#   You only need to run configure.
-
-# Turn on exit on error
-set -o errexit
-
-MAKEFILES=""
-
-# add_makefiles - Shell function to add makefiles to MAKEFILES
-add_makefiles() {
-  MAKEFILES="$MAKEFILES $*"
-}
-
-if [ "$srcdir" = "" ]; then
-  srcdir=.
-fi
-
-# Common makefiles used by everyone
-add_makefiles "
-mozilla-config.h
-Makefile
-build/Makefile
-build/pgo/Makefile
-build/pgo/blueprint/Makefile
-build/pgo/js-input/Makefile
-config/Makefile
-config/autoconf.mk
-config/nspr/Makefile
-config/doxygen.cfg
-mfbt/Makefile
-probes/Makefile
-python/Makefile
-extensions/Makefile
-"
-
-if [ "$MOZ_WEBAPP_RUNTIME" ]; then
-  add_makefiles "
-webapprt/Makefile
-  "
-fi
-
-if [ ! "$LIBXUL_SDK" ]; then
-  if [ "$STLPORT_SOURCES" ]; then
-    add_makefiles "
-      build/stlport/Makefile
-      build/stlport/stl/config/_android.h
-    "
-  fi
-  add_makefiles "
-    memory/mozalloc/Makefile
-    mozglue/Makefile
-    mozglue/build/Makefile
-  "
-  if [ "$MOZ_JEMALLOC3" -o "$MOZ_REPLACE_MALLOC" ] && [ -z "$MOZ_NATIVE_JEMALLOC" ]; then
-    add_makefiles "
-      memory/jemalloc/Makefile
-    "
-  fi
-  if [ "$MOZ_MEMORY" ]; then
-    add_makefiles "
-      memory/Makefile
-      memory/mozjemalloc/Makefile
-      memory/build/Makefile
-    "
-  fi
-  if [ "$MOZ_REPLACE_MALLOC" ]; then
-    add_makefiles "
-      memory/replace/Makefile
-    "
-    if [ -z "$MOZ_JEMALLOC3" ]; then
-      add_makefiles "
-        memory/replace/jemalloc/Makefile
-      "
-    fi
-  fi
-  if [ "$MOZ_REPLACE_MALLOC_LINKAGE" = "dummy library" ]; then
-    add_makefiles "
-      memory/replace/dummy/Makefile
-    "
-  fi
-  if [ "$MOZ_WIDGET_TOOLKIT" = "android" ]; then
-    add_makefiles "
-      other-licenses/android/Makefile
-      other-licenses/skia-npapi/Makefile
-      mozglue/android/Makefile
-    "
-  fi
-  if [ "$MOZ_LINKER" ]; then
-    add_makefiles "
-      mozglue/linker/Makefile
-    "
-  fi
-fi
-
-if [ "$OS_ARCH" = "WINNT" ]; then
-  add_makefiles "
-    build/win32/Makefile
-    build/win32/crashinjectdll/Makefile
-  "
-fi
-
-if [ "$OS_ARCH" != "WINNT" -a "$OS_ARCH" != "OS2" ]; then
-  add_makefiles "
-    build/unix/Makefile
-  "
-  if [ "$STDCXX_COMPAT" ]; then
-    add_makefiles "
-      build/unix/stdc++compat/Makefile
-    "
-  fi
-  if [ "$USE_ELF_HACK" ]; then
-    add_makefiles "
-      build/unix/elfhack/Makefile
-    "
-  fi
-fi
-
-if [ "$ENABLE_MARIONETTE" ]; then
-  add_makefiles "
-    testing/marionette/Makefile
-    testing/marionette/components/Makefile
-  "
-fi
-
-if [ "$ENABLE_TESTS" ]; then
-  add_makefiles "
-    config/makefiles/test/Makefile
-    config/tests/makefiles/autodeps/Makefile
-    config/tests/src-simple/Makefile
-    mfbt/tests/Makefile
-  "
-  if [ ! "$LIBXUL_SDK" ]; then 
-    add_makefiles "
-      mozglue/tests/Makefile
-    "
-  fi
-  if [ "$_MSC_VER" -a "$OS_TEST" != "x86_64" ]; then
-    add_makefiles "
-      build/win32/vmwarerecordinghelper/Makefile
-    "
-  fi
-  if [ "$OS_ARCH" != "WINNT" -a "$OS_ARCH" != "OS2" ]; then 
-    add_makefiles "
-      build/unix/test/Makefile
-    "
-  fi
-  if [ "$MOZ_WIDGET_TOOLKIT" = "android" ]; then
-    add_makefiles "
-      build/mobile/robocop/Makefile
-      build/mobile/sutagent/android/Makefile
-      build/mobile/sutagent/android/fencp/Makefile
-      build/mobile/sutagent/android/ffxcp/Makefile
-      build/mobile/sutagent/android/watcher/Makefile
-    "
-  fi
-fi
-
-# Application-specific makefiles
-if [ -f "${srcdir}/${MOZ_BUILD_APP}/makefiles.sh" ]; then
-  . "${srcdir}/${MOZ_BUILD_APP}/makefiles.sh"
-fi
-
-# Extension makefiles
-for extension in $MOZ_EXTENSIONS; do
-  if [ -f "${srcdir}/extensions/${extension}/makefiles.sh" ]; then
-    . "${srcdir}/extensions/${extension}/makefiles.sh"
-  fi
-done
-
-# Toolkit makefiles
-if [ ! "$LIBXUL_SDK" ]; then
-  . "${srcdir}/toolkit/toolkit-makefiles.sh"
-fi
-
-# Services makefiles
-. "${srcdir}/services/makefiles.sh"
-
-# Turn off exit on error, since it breaks the rest of configure
-set +o errexit

b2g/Makefile.in

@@ -9,17 +9,5 @@ VPATH      = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = chrome components locales
-
-ifeq ($(OS_ARCH),WINNT)
-DIRS += $(DEPTH)/xulrunner/tools/redit
-endif
-
-ifneq ($(GAIADIR),)
-DIRS += gaia
-endif
-
-DIRS += app
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/testing/testsuite-targets.mk

b2g/app.mozbuild

@@ -0,0 +1,16 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+if not CONFIG['LIBXUL_SDK']:
+    app_libxul_dirs = []
+    include('/toolkit/toolkit.mozbuild')
+elif CONFIG['ENABLE_TESTS']:
+    add_tier_dir('testharness', 'testing/mochitest')
+
+if CONFIG['MOZ_EXTENSIONS']:
+    add_tier_dir('app', 'extensions')
+
+add_tier_dir('app', CONFIG['MOZ_BRANDING_DIRECTORY'])
+add_tier_dir('app', 'b2g')

b2g/app/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

b2g/branding/official/Makefile.in

@@ -9,9 +9,4 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = \
-	content \
-	locales \
-	$(NULL)
-
 include $(topsrcdir)/config/rules.mk

b2g/branding/official/content/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

b2g/branding/official/locales/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

b2g/branding/official/moz.build

@@ -0,0 +1,6 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIRS += ['content', 'locales']

b2g/branding/unofficial/Makefile.in

@@ -9,9 +9,4 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = \
-	content \
-	locales \
-	$(NULL)
-
 include $(topsrcdir)/config/rules.mk

b2g/branding/unofficial/content/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

b2g/branding/unofficial/locales/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

b2g/branding/unofficial/moz.build

@@ -0,0 +1,6 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIRS += ['content', 'locales']

b2g/build.mk

@@ -2,28 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-ifndef LIBXUL_SDK
-include $(topsrcdir)/toolkit/toolkit-tiers.mk
-else
-ifdef ENABLE_TESTS
-tier_testharness_dirs += \
-  testing/mochitest \
-  $(NULL)
-endif
-endif
-
-TIERS += app
-
-ifdef MOZ_EXTENSIONS
-tier_app_dirs += extensions
-endif
-
-tier_app_dirs += \
-  $(MOZ_BRANDING_DIRECTORY) \
-  b2g \
-  $(NULL)
-
-
 installer: 
 	@$(MAKE) -C b2g/installer installer
 

b2g/chrome/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

b2g/components/Makefile.in

@@ -40,10 +40,6 @@ EXTRA_JS_MODULES = \
 	SignInToWebsite.jsm \
 	$(NULL)
 
-TEST_DIRS = \
-	test \
-	$(NULL)
-
 ifdef MOZ_UPDATER
 EXTRA_PP_COMPONENTS += UpdatePrompt.js
 endif

b2g/components/moz.build

@@ -0,0 +1,6 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+TEST_DIRS += ['test']

b2g/components/test/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

b2g/gaia/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

b2g/installer/Makefile.in

@@ -8,6 +8,9 @@ srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
+
+STANDALONE_MAKEFILE := 1
+
 include $(topsrcdir)/config/rules.mk
 
 MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in

b2g/installer/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

b2g/locales/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

b2g/makefiles.sh

@@ -1,15 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-add_makefiles "
-b2g/app/Makefile
-$MOZ_BRANDING_DIRECTORY/Makefile
-$MOZ_BRANDING_DIRECTORY/content/Makefile
-$MOZ_BRANDING_DIRECTORY/locales/Makefile
-b2g/chrome/Makefile
-b2g/components/Makefile
-b2g/installer/Makefile
-b2g/locales/Makefile
-b2g/Makefile
-"

b2g/moz.build

@@ -0,0 +1,17 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+CONFIGURE_SUBST_FILES += ['installer/Makefile']
+
+DIRS += ['chrome', 'components', 'locales']
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    DIRS += ['/xulrunner/tools/redit']
+
+if CONFIG['GAIADIR']:
+    DIRS += ['gaia']
+
+DIRS += ['app']
+

browser/Makefile.in

@@ -9,29 +9,6 @@ VPATH     = @srcdir@
 
 include $(topsrcdir)/config/config.mk
 
-PARALLEL_DIRS = \
-  base \
-  components \
-  fuel \
-  locales \
-  modules \
-  themes \
-  extensions \
-  $(NULL)
-
-DIRS = \
-  devtools \
-  app \
-  $(NULL)
-
-ifdef MOZ_METRO
-DIRS += metro
-endif
-
-ifdef MAKENSISU
-DIRS += installer/windows
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 ifdef MAKENSISU

browser/app.mozbuild

@@ -0,0 +1,21 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+if not CONFIG['LIBXUL_SDK']:
+    app_libxul_dirs = []
+    include('/toolkit/toolkit.mozbuild')
+
+if CONFIG['MOZ_EXTENSIONS']:
+    add_tier_dir('app', 'extensions')
+
+add_tier_dir('app', [CONFIG['MOZ_BRANDING_DIRECTORY']])
+
+if CONFIG['MOZ_WEBAPP_RUNTIME']:
+    add_tier_dir('app', 'webapprt')
+
+# Never add tier dirs after browser because they apparently won't get
+# packaged properly on Mac.
+add_tier_dir('app', 'browser')
+

browser/app/Makefile.in

@@ -9,7 +9,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS        = profile/extensions
 dist_dest   = $(DIST)/$(MOZ_MACBUNDLE_NAME)
 
 ifdef ENABLE_MARIONETTE

browser/app/moz.build

@@ -0,0 +1,6 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIRS += ['profile/extensions']

browser/app/profile/extensions/Makefile.in

@@ -11,11 +11,6 @@ VPATH      = @srcdir@
 DISTROEXT = $(call core_abspath,$(FINAL_TARGET))/distribution/extensions
 
 include $(DEPTH)/config/autoconf.mk
-
-DIRS = \
-  {972ce4c6-7e08-4474-a285-3208198ce6fd} \
-  $(NULL)
-
 include $(topsrcdir)/config/config.mk
 
 ifneq (,$(filter beta,$(MOZ_UPDATE_CHANNEL)))

browser/app/profile/extensions/moz.build

@@ -0,0 +1,6 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIRS += ['{972ce4c6-7e08-4474-a285-3208198ce6fd}']

browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

browser/base/Makefile.in

@@ -16,8 +16,6 @@ abs_srcdir = $(call core_abspath,$(srcdir))
 
 CHROME_DEPS += $(abs_srcdir)/content/overrides/app-license.html
 
-TEST_DIRS += content/test
-
 include $(topsrcdir)/config/rules.mk
 
 PRE_RELEASE_SUFFIX := ""

browser/base/content/test/Makefile.in

@@ -8,11 +8,6 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 relativesrcdir  = @relativesrcdir@
 
-DIRS += \
-		newtab \
-		social \
-		$(NULL)
-
 include $(DEPTH)/config/autoconf.mk
 
 MOCHITEST_FILES = \

browser/base/content/test/moz.build

@@ -0,0 +1,7 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIRS += ['newtab', 'social']
+

browser/base/content/test/newtab/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

browser/base/content/test/social/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

browser/base/moz.build

@@ -0,0 +1,6 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+TEST_DIRS += ['content/test']

browser/branding/aurora/Makefile.in

@@ -10,11 +10,6 @@ VPATH = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
-DIRS = \
-	content \
-	locales \
-	$(NULL)
-
 PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js
 
 # On Windows only do this step for browser, skip for metro.

browser/branding/aurora/content/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

browser/branding/aurora/locales/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

browser/branding/aurora/moz.build

@@ -0,0 +1,7 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIRS += ['content', 'locales']
+

browser/branding/nightly/Makefile.in

@@ -10,11 +10,6 @@ VPATH = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
-DIRS = \
-	content \
-	locales \
-	$(NULL)
-
 PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js
 
 # On Windows only do this step for browser, skip for metro.

browser/branding/nightly/content/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

browser/branding/nightly/locales/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+