Bug 912293 - Remove now redundant boilerplate from Makefile.in. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 05 Sep 2013 09:01:46 +0900
changeset 158516 45097bc3a578
parent 158515 92ee006ec0a5
child 158517 d9ad02ac2fcb
push id2961
push userlsblakk@mozilla.com
push dateMon, 28 Oct 2013 21:59:28 +0000
treeherdermozilla-beta@73ef4f13486f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs912293
milestone26.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 912293 - Remove now redundant boilerplate from Makefile.in. r=gps
Makefile.in
accessible/public/ia2/Makefile.in
accessible/public/msaa/Makefile.in
accessible/src/Makefile.in
accessible/src/atk/Makefile.in
accessible/src/base/Makefile.in
accessible/src/generic/Makefile.in
accessible/src/html/Makefile.in
accessible/src/jsat/Makefile.in
accessible/src/mac/Makefile.in
accessible/src/other/Makefile.in
accessible/src/windows/Makefile.in
accessible/src/windows/ia2/Makefile.in
accessible/src/windows/msaa/Makefile.in
accessible/src/windows/sdn/Makefile.in
accessible/src/windows/uia/Makefile.in
accessible/src/xpcom/Makefile.in
accessible/src/xul/Makefile.in
accessible/tests/mochitest/Makefile.in
accessible/tests/mochitest/actions/Makefile.in
accessible/tests/mochitest/attributes/Makefile.in
accessible/tests/mochitest/bounds/Makefile.in
accessible/tests/mochitest/editabletext/Makefile.in
accessible/tests/mochitest/elm/Makefile.in
accessible/tests/mochitest/events/Makefile.in
accessible/tests/mochitest/focus/Makefile.in
accessible/tests/mochitest/hittest/Makefile.in
accessible/tests/mochitest/hyperlink/Makefile.in
accessible/tests/mochitest/hypertext/Makefile.in
accessible/tests/mochitest/jsat/Makefile.in
accessible/tests/mochitest/name/Makefile.in
accessible/tests/mochitest/pivot/Makefile.in
accessible/tests/mochitest/relations/Makefile.in
accessible/tests/mochitest/role/Makefile.in
accessible/tests/mochitest/scroll/Makefile.in
accessible/tests/mochitest/selectable/Makefile.in
accessible/tests/mochitest/states/Makefile.in
accessible/tests/mochitest/table/Makefile.in
accessible/tests/mochitest/text/Makefile.in
accessible/tests/mochitest/textattrs/Makefile.in
accessible/tests/mochitest/textcaret/Makefile.in
accessible/tests/mochitest/textselection/Makefile.in
accessible/tests/mochitest/tree/Makefile.in
accessible/tests/mochitest/treeupdate/Makefile.in
accessible/tests/mochitest/value/Makefile.in
addon-sdk/Makefile.in
b2g/Makefile.in
b2g/app/Makefile.in
b2g/branding/official/locales/Makefile.in
b2g/branding/unofficial/locales/Makefile.in
b2g/chrome/Makefile.in
b2g/gaia/Makefile.in
b2g/installer/Makefile.in
b2g/locales/Makefile.in
browser/Makefile.in
browser/app/Makefile.in
browser/app/profile/extensions/Makefile.in
browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
browser/base/Makefile.in
browser/base/content/test/Makefile.in
browser/base/content/test/newtab/Makefile.in
browser/base/content/test/social/Makefile.in
browser/base/content/test/social/opengraph/Makefile.in
browser/branding/aurora/Makefile.in
browser/branding/aurora/content/Makefile.in
browser/branding/aurora/locales/Makefile.in
browser/branding/nightly/Makefile.in
browser/branding/nightly/content/Makefile.in
browser/branding/nightly/locales/Makefile.in
browser/branding/official/Makefile.in
browser/branding/official/content/Makefile.in
browser/branding/official/locales/Makefile.in
browser/branding/unofficial/Makefile.in
browser/branding/unofficial/content/Makefile.in
browser/branding/unofficial/locales/Makefile.in
browser/components/about/Makefile.in
browser/components/build/Makefile.in
browser/components/certerror/test/Makefile.in
browser/components/dirprovider/Makefile.in
browser/components/downloads/test/browser/Makefile.in
browser/components/feeds/src/Makefile.in
browser/components/feeds/test/Makefile.in
browser/components/feeds/test/chrome/Makefile.in
browser/components/migration/src/Makefile.in
browser/components/places/tests/browser/Makefile.in
browser/components/places/tests/chrome/Makefile.in
browser/components/preferences/Makefile.in
browser/components/preferences/in-content/Makefile.in
browser/components/preferences/in-content/tests/Makefile.in
browser/components/preferences/tests/Makefile.in
browser/components/privatebrowsing/test/browser/Makefile.in
browser/components/safebrowsing/content/test/Makefile.in
browser/components/search/test/Makefile.in
browser/components/sessionstore/test/Makefile.in
browser/components/shell/src/Makefile.in
browser/components/shell/test/Makefile.in
browser/components/tabview/Makefile.in
browser/components/tabview/test/Makefile.in
browser/components/test/Makefile.in
browser/devtools/Makefile.in
browser/devtools/app-manager/Makefile.in
browser/devtools/app-manager/test/Makefile.in
browser/devtools/commandline/Makefile.in
browser/devtools/commandline/test/Makefile.in
browser/devtools/debugger/Makefile.in
browser/devtools/debugger/test/Makefile.in
browser/devtools/fontinspector/test/Makefile.in
browser/devtools/framework/Makefile.in
browser/devtools/framework/test/Makefile.in
browser/devtools/inspector/Makefile.in
browser/devtools/inspector/test/Makefile.in
browser/devtools/layoutview/test/Makefile.in
browser/devtools/markupview/Makefile.in
browser/devtools/markupview/test/Makefile.in
browser/devtools/netmonitor/test/Makefile.in
browser/devtools/profiler/Makefile.in
browser/devtools/profiler/test/Makefile.in
browser/devtools/responsivedesign/Makefile.in
browser/devtools/responsivedesign/test/Makefile.in
browser/devtools/scratchpad/Makefile.in
browser/devtools/scratchpad/test/Makefile.in
browser/devtools/shared/Makefile.in
browser/devtools/shared/test/Makefile.in
browser/devtools/sourceeditor/test/Makefile.in
browser/devtools/styleeditor/Makefile.in
browser/devtools/styleeditor/test/Makefile.in
browser/devtools/styleinspector/Makefile.in
browser/devtools/styleinspector/test/Makefile.in
browser/devtools/tilt/Makefile.in
browser/devtools/tilt/test/Makefile.in
browser/devtools/webconsole/Makefile.in
browser/devtools/webconsole/test/Makefile.in
browser/extensions/Makefile.in
browser/extensions/pdfjs/test/Makefile.in
browser/fuel/test/Makefile.in
browser/installer/Makefile.in
browser/installer/windows/Makefile.in
browser/locales/Makefile.in
browser/metro/Makefile.in
browser/metro/base/Makefile.in
browser/metro/base/tests/Makefile.in
browser/metro/base/tests/mochiperf/Makefile.in
browser/metro/base/tests/mochiperf/res/Makefile.in
browser/metro/base/tests/mochitest/Makefile.in
browser/metro/base/tests/mochitest/res/Makefile.in
browser/metro/locales/Makefile.in
browser/metro/locales/import/Makefile.in
browser/metro/profile/Makefile.in
browser/metro/shell/Makefile.in
browser/metro/shell/commandexecutehandler/Makefile.in
browser/metro/shell/linktool/Makefile.in
browser/metro/shell/testing/Makefile.in
browser/modules/Makefile.in
browser/modules/test/Makefile.in
browser/modules/test/chrome/Makefile.in
browser/themes/linux/Makefile.in
browser/themes/osx/Makefile.in
browser/themes/windows/Makefile.in
build/Makefile.in
build/mobile/robocop/Makefile.in
build/mobile/sutagent/android/Makefile.in
build/mobile/sutagent/android/fencp/Makefile.in
build/mobile/sutagent/android/ffxcp/Makefile.in
build/mobile/sutagent/android/watcher/Makefile.in
build/package/Makefile.in
build/stlport/Makefile.in
build/unix/Makefile.in
build/unix/elfhack/Makefile.in
build/unix/elfhack/inject/Makefile.in
build/unix/stdc++compat/Makefile.in
build/unix/test/Makefile.in
build/win32/Makefile.in
build/win32/crashinjectdll/Makefile.in
build/win32/vmwarerecordinghelper/Makefile.in
caps/src/Makefile.in
caps/tests/mochitest/Makefile.in
chrome/src/Makefile.in
config/Makefile.in
config/makefiles/precompile/Makefile.in
config/makefiles/test/Makefile.in
config/makefiles/xpidl/Makefile.in
config/nspr/Makefile.in
config/tests/makefiles/autodeps/Makefile.in
config/tests/src-simple/Makefile.in
content/base/src/Makefile.in
content/base/test/Makefile.in
content/base/test/chrome/Makefile.in
content/base/test/websocket_hybi/Makefile.in
content/canvas/compiledtest/Makefile.in
content/canvas/src/Makefile.in
content/canvas/test/Makefile.in
content/canvas/test/chrome/Makefile.in
content/canvas/test/crossorigin/Makefile.in
content/canvas/test/webgl/Makefile.in
content/canvas/test/webgl/non-conf-tests/Makefile.in
content/events/src/Makefile.in
content/events/test/Makefile.in
content/html/content/src/Makefile.in
content/html/content/test/Makefile.in
content/html/content/test/bug649134/Makefile.in
content/html/content/test/forms/Makefile.in
content/html/document/src/Makefile.in
content/html/document/test/Makefile.in
content/mathml/content/src/Makefile.in
content/media/Makefile.in
content/media/dash/Makefile.in
content/media/directshow/Makefile.in
content/media/gstreamer/Makefile.in
content/media/mediasource/Makefile.in
content/media/mediasource/test/Makefile.in
content/media/omx/Makefile.in
content/media/omx/mediaresourcemanager/Makefile.in
content/media/plugins/Makefile.in
content/media/raw/Makefile.in
content/media/test/Makefile.in
content/media/webaudio/Makefile.in
content/media/webaudio/blink/Makefile.in
content/media/webaudio/compiledtest/Makefile.in
content/media/webaudio/test/Makefile.in
content/media/webaudio/test/blink/Makefile.in
content/media/webm/Makefile.in
content/media/webrtc/Makefile.in
content/media/webspeech/recognition/Makefile.in
content/media/webspeech/recognition/test/Makefile.in
content/media/webspeech/synth/Makefile.in
content/media/webspeech/synth/ipc/test/Makefile.in
content/media/webspeech/synth/test/Makefile.in
content/media/wmf/Makefile.in
content/smil/Makefile.in
content/smil/test/Makefile.in
content/svg/content/src/Makefile.in
content/svg/content/test/Makefile.in
content/svg/document/src/Makefile.in
content/xbl/src/Makefile.in
content/xbl/test/Makefile.in
content/xml/content/src/Makefile.in
content/xml/document/src/Makefile.in
content/xml/document/test/Makefile.in
content/xslt/src/base/Makefile.in
content/xslt/src/xml/Makefile.in
content/xslt/src/xpath/Makefile.in
content/xslt/src/xslt/Makefile.in
content/xslt/tests/mochitest/Makefile.in
content/xul/content/src/Makefile.in
content/xul/content/test/Makefile.in
content/xul/document/src/Makefile.in
content/xul/document/test/Makefile.in
content/xul/templates/src/Makefile.in
content/xul/templates/tests/chrome/Makefile.in
db/sqlite3/src/Makefile.in
docshell/base/Makefile.in
docshell/build/Makefile.in
docshell/shistory/src/Makefile.in
docshell/test/Makefile.in
docshell/test/browser/Makefile.in
docshell/test/chrome/Makefile.in
docshell/test/navigation/Makefile.in
dom/activities/src/Makefile.in
dom/alarm/Makefile.in
dom/alarm/test/Makefile.in
dom/apps/tests/Makefile.in
dom/audiochannel/Makefile.in
dom/base/Makefile.in
dom/base/test/Makefile.in
dom/battery/Makefile.in
dom/battery/test/Makefile.in
dom/bindings/Makefile.in
dom/bindings/test/Makefile.in
dom/bluetooth/Makefile.in
dom/browser-element/Makefile.in
dom/browser-element/mochitest/Makefile.in
dom/browser-element/mochitest/priority/Makefile.in
dom/camera/Makefile.in
dom/cellbroadcast/interfaces/Makefile.in
dom/cellbroadcast/src/Makefile.in
dom/contacts/Makefile.in
dom/contacts/tests/Makefile.in
dom/devicestorage/Makefile.in
dom/devicestorage/ipc/Makefile.in
dom/devicestorage/test/Makefile.in
dom/encoding/Makefile.in
dom/encoding/test/Makefile.in
dom/encoding/test/unit/Makefile.in
dom/file/Makefile.in
dom/file/test/Makefile.in
dom/fmradio/ipc/Makefile.in
dom/gamepad/Makefile.in
dom/icc/interfaces/Makefile.in
dom/icc/src/Makefile.in
dom/imptests/Makefile.in
dom/imptests/editing/Makefile.in
dom/imptests/editing/conformancetest/Makefile.in
dom/imptests/editing/css/Makefile.in
dom/imptests/editing/selecttest/Makefile.in
dom/imptests/failures/editing/conformancetest/Makefile.in
dom/imptests/failures/editing/selecttest/Makefile.in
dom/imptests/failures/html/html/browsers/the-window-object/Makefile.in
dom/imptests/failures/html/html/browsers/the-window-object/named-access-on-the-window-object/Makefile.in
dom/imptests/failures/html/html/dom/documents/dta/Makefile.in
dom/imptests/failures/html/html/dom/documents/dta/doc.gEBN/Makefile.in
dom/imptests/failures/html/html/dom/elements/global-attributes/Makefile.in
dom/imptests/failures/html/html/obsolete/implreq/oeaaa/Makefile.in
dom/imptests/failures/html/html/semantics/forms/the-form-element/Makefile.in
dom/imptests/failures/html/html/semantics/forms/the-option-element/Makefile.in
dom/imptests/failures/html/html/semantics/forms/the-select-element/Makefile.in
dom/imptests/failures/html/html/semantics/scripting-1/the-script-element/Makefile.in
dom/imptests/failures/html/html/semantics/tabular-data/the-table-element/Makefile.in
dom/imptests/failures/html/html/webappapis/atob/Makefile.in
dom/imptests/failures/html/js/builtins/Makefile.in
dom/imptests/failures/html/old-tests/submission/Opera/microdata/Makefile.in
dom/imptests/failures/html/typedarrays/Makefile.in
dom/imptests/failures/webapps/DOMCore/tests/approved/Makefile.in
dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/Makefile.in
dom/imptests/failures/webapps/DOMCore/tests/submissions/Opera/Makefile.in
dom/imptests/failures/webapps/WebStorage/tests/submissions/Infraware/Makefile.in
dom/imptests/failures/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in
dom/imptests/failures/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in
dom/imptests/html/domxpath/Makefile.in
dom/imptests/html/html/browsers/browsing-the-web/read-media/Makefile.in
dom/imptests/html/html/browsers/the-window-object/Makefile.in
dom/imptests/html/html/browsers/the-window-object/named-access-on-the-window-object/Makefile.in
dom/imptests/html/html/dom/documents/dta/Makefile.in
dom/imptests/html/html/dom/documents/dta/doc.gEBN/Makefile.in
dom/imptests/html/html/dom/elements/global-attributes/Makefile.in
dom/imptests/html/html/editing/the-hidden-attribute/Makefile.in
dom/imptests/html/html/obsolete/implreq/oeaaa/Makefile.in
dom/imptests/html/html/semantics/document-metadata/the-title-element/Makefile.in
dom/imptests/html/html/semantics/forms/the-form-element/Makefile.in
dom/imptests/html/html/semantics/forms/the-option-element/Makefile.in
dom/imptests/html/html/semantics/forms/the-select-element/Makefile.in
dom/imptests/html/html/semantics/scripting-1/the-script-element/Makefile.in
dom/imptests/html/html/semantics/tabular-data/the-table-element/Makefile.in
dom/imptests/html/html/semantics/text-level-semantics/the-time-element/Makefile.in
dom/imptests/html/html/webappapis/atob/Makefile.in
dom/imptests/html/html/webappapis/scripting/events/Makefile.in
dom/imptests/html/html/webappapis/scripting/processing-model-2/Makefile.in
dom/imptests/html/html/webappapis/timers/Makefile.in
dom/imptests/html/js/builtins/Makefile.in
dom/imptests/html/old-tests/submission/Opera/microdata/Makefile.in
dom/imptests/html/typedarrays/Makefile.in
dom/imptests/html/webgl/Makefile.in
dom/imptests/webapps/DOMCore/tests/approved/Makefile.in
dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/Makefile.in
dom/imptests/webapps/DOMCore/tests/submissions/Opera/Makefile.in
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/Makefile.in
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/Makefile.in
dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in
dom/imptests/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in
dom/imptests/writeBuildFiles.py
dom/indexedDB/Makefile.in
dom/indexedDB/ipc/Makefile.in
dom/indexedDB/test/Makefile.in
dom/indexedDB/test/unit/Makefile.in
dom/interfaces/devicestorage/Makefile.in
dom/ipc/Makefile.in
dom/ipc/tests/Makefile.in
dom/locales/Makefile.in
dom/media/Makefile.in
dom/media/bridge/Makefile.in
dom/media/tests/mochitest/Makefile.in
dom/messages/interfaces/Makefile.in
dom/mobilemessage/interfaces/Makefile.in
dom/mobilemessage/src/Makefile.in
dom/mobilemessage/tests/Makefile.in
dom/network/interfaces/Makefile.in
dom/network/src/Makefile.in
dom/network/tests/Makefile.in
dom/permission/tests/Makefile.in
dom/phonenumberutils/tests/Makefile.in
dom/plugins/base/Makefile.in
dom/plugins/base/android/Makefile.in
dom/plugins/ipc/Makefile.in
dom/plugins/ipc/hangui/Makefile.in
dom/plugins/ipc/interpose/Makefile.in
dom/plugins/test/mochitest/Makefile.in
dom/plugins/test/testplugin/Makefile.in
dom/plugins/test/testplugin/secondplugin/Makefile.in
dom/power/Makefile.in
dom/power/test/Makefile.in
dom/promise/Makefile.in
dom/promise/tests/Makefile.in
dom/quota/Makefile.in
dom/settings/tests/Makefile.in
dom/src/events/Makefile.in
dom/src/geolocation/Makefile.in
dom/src/json/Makefile.in
dom/src/json/test/Makefile.in
dom/src/jsurl/Makefile.in
dom/src/jsurl/test/Makefile.in
dom/src/notification/Makefile.in
dom/src/offline/Makefile.in
dom/src/storage/Makefile.in
dom/system/Makefile.in
dom/system/android/Makefile.in
dom/system/gonk/Makefile.in
dom/system/mac/Makefile.in
dom/system/tests/Makefile.in
dom/system/unix/Makefile.in
dom/system/windows/Makefile.in
dom/telephony/Makefile.in
dom/tests/browser/Makefile.in
dom/tests/mochitest/ajax/jquery/Makefile.in
dom/tests/mochitest/ajax/jquery/dist/Makefile.in
dom/tests/mochitest/ajax/jquery/test/Makefile.in
dom/tests/mochitest/ajax/jquery/test/data/Makefile.in
dom/tests/mochitest/ajax/jquery/test/data/offset/Makefile.in
dom/tests/mochitest/ajax/jquery/test/unit/Makefile.in
dom/tests/mochitest/ajax/lib/Makefile.in
dom/tests/mochitest/ajax/mochikit/Makefile.in
dom/tests/mochitest/ajax/mochikit/MochiKit/Makefile.in
dom/tests/mochitest/ajax/mochikit/tests/Makefile.in
dom/tests/mochitest/ajax/mochikit/tests/SimpleTest/Makefile.in
dom/tests/mochitest/ajax/offline/Makefile.in
dom/tests/mochitest/ajax/offline/namespace1/Makefile.in
dom/tests/mochitest/ajax/offline/namespace1/sub/Makefile.in
dom/tests/mochitest/ajax/offline/namespace1/sub2/Makefile.in
dom/tests/mochitest/ajax/offline/namespace2/Makefile.in
dom/tests/mochitest/ajax/prototype/Makefile.in
dom/tests/mochitest/ajax/prototype/dist/Makefile.in
dom/tests/mochitest/ajax/prototype/test/Makefile.in
dom/tests/mochitest/ajax/prototype/test/functional/Makefile.in
dom/tests/mochitest/ajax/prototype/test/lib/Makefile.in
dom/tests/mochitest/ajax/prototype/test/unit/Makefile.in
dom/tests/mochitest/ajax/prototype/test/unit/fixtures/Makefile.in
dom/tests/mochitest/ajax/prototype/test/unit/tmp/Makefile.in
dom/tests/mochitest/ajax/scriptaculous/Makefile.in
dom/tests/mochitest/ajax/scriptaculous/lib/Makefile.in
dom/tests/mochitest/ajax/scriptaculous/src/Makefile.in
dom/tests/mochitest/ajax/scriptaculous/test/unit/Makefile.in
dom/tests/mochitest/bugs/Makefile.in
dom/tests/mochitest/chrome/Makefile.in
dom/tests/mochitest/crypto/Makefile.in
dom/tests/mochitest/dom-level0/Makefile.in
dom/tests/mochitest/dom-level1-core/Makefile.in
dom/tests/mochitest/dom-level1-core/files/Makefile.in
dom/tests/mochitest/dom-level2-core/Makefile.in
dom/tests/mochitest/dom-level2-core/files/Makefile.in
dom/tests/mochitest/dom-level2-html/Makefile.in
dom/tests/mochitest/dom-level2-html/files/Makefile.in
dom/tests/mochitest/dom-level2-html/files/applets/org/w3c/domts/Makefile.in
dom/tests/mochitest/gamepad/Makefile.in
dom/tests/mochitest/general/Makefile.in
dom/tests/mochitest/geolocation/Makefile.in
dom/tests/mochitest/localstorage/Makefile.in
dom/tests/mochitest/notification/Makefile.in
dom/tests/mochitest/orientation/Makefile.in
dom/tests/mochitest/pointerlock/Makefile.in
dom/tests/mochitest/sessionstorage/Makefile.in
dom/tests/mochitest/storageevent/Makefile.in
dom/tests/mochitest/webapps/Makefile.in
dom/tests/mochitest/webapps/apps/Makefile.in
dom/tests/mochitest/webcomponents/Makefile.in
dom/tests/mochitest/whatwg/Makefile.in
dom/time/Makefile.in
dom/voicemail/Makefile.in
dom/wifi/Makefile.in
dom/workers/Makefile.in
dom/workers/test/Makefile.in
dom/workers/test/extensions/bootstrap/Makefile.in
dom/workers/test/extensions/traditional/Makefile.in
dom/workers/test/subdir/Makefile.in
editor/composer/src/Makefile.in
editor/composer/test/Makefile.in
editor/libeditor/base/Makefile.in
editor/libeditor/base/tests/Makefile.in
editor/libeditor/html/Makefile.in
editor/libeditor/html/tests/Makefile.in
editor/libeditor/text/Makefile.in
editor/libeditor/text/tests/Makefile.in
editor/txmgr/src/Makefile.in
embedding/browser/build/Makefile.in
embedding/browser/webBrowser/Makefile.in
embedding/components/build/Makefile.in
embedding/components/printingui/src/mac/Makefile.in
embedding/components/printingui/src/os2/Makefile.in
embedding/components/printingui/src/unixshared/Makefile.in
embedding/components/printingui/src/win/Makefile.in
embedding/components/webbrowserpersist/src/Makefile.in
embedding/components/windowwatcher/src/Makefile.in
embedding/test/Makefile.in
embedding/tests/winEmbed/Makefile.in
extensions/auth/Makefile.in
extensions/cookie/Makefile.in
extensions/cookie/test/Makefile.in
extensions/gio/Makefile.in
extensions/gnomevfs/Makefile.in
extensions/permissions/Makefile.in
extensions/pref/autoconfig/src/Makefile.in
extensions/spellcheck/hunspell/src/Makefile.in
extensions/spellcheck/locales/Makefile.in
extensions/spellcheck/src/Makefile.in
extensions/spellcheck/tests/chrome/Makefile.in
extensions/spellcheck/tests/chrome/base/Makefile.in
extensions/spellcheck/tests/chrome/map/Makefile.in
extensions/universalchardet/src/xpcom/Makefile.in
extensions/universalchardet/tests/Makefile.in
extensions/widgetutils/Makefile.in
extensions/widgetutils/src/Makefile.in
gfx/2d/Makefile.in
gfx/angle/Makefile.in
gfx/angle/src/libEGL/Makefile.in
gfx/angle/src/libGLESv2/Makefile.in
gfx/cairo/cairo/src/Makefile.in
gfx/cairo/libpixman/src/Makefile.in
gfx/gl/Makefile.in
gfx/graphite2/src/Makefile.in
gfx/harfbuzz/src/Makefile.in
gfx/ipc/Makefile.in
gfx/layers/Makefile.in
gfx/ots/src/Makefile.in
gfx/qcms/Makefile.in
gfx/skia/Makefile.in
gfx/src/Makefile.in
gfx/tests/Makefile.in
gfx/tests/gtest/Makefile.in
gfx/thebes/Makefile.in
gfx/ycbcr/Makefile.in
hal/Makefile.in
hal/tests/Makefile.in
image/build/Makefile.in
image/decoders/Makefile.in
image/decoders/icon/Makefile.in
image/decoders/icon/android/Makefile.in
image/decoders/icon/gtk/Makefile.in
image/decoders/icon/qt/Makefile.in
image/encoders/bmp/Makefile.in
image/encoders/ico/Makefile.in
image/encoders/png/Makefile.in
image/src/Makefile.in
image/test/browser/Makefile.in
image/test/mochitest/Makefile.in
intl/build/Makefile.in
intl/chardet/src/Makefile.in
intl/locale/src/Makefile.in
intl/locale/src/mac/Makefile.in
intl/locale/src/os2/Makefile.in
intl/locale/src/unix/Makefile.in
intl/locale/src/windows/Makefile.in
intl/locales/Makefile.in
intl/lwbrk/src/Makefile.in
intl/lwbrk/tests/Makefile.in
intl/uconv/src/Makefile.in
intl/uconv/tests/Makefile.in
intl/uconv/tools/Makefile.in
intl/uconv/ucvcn/Makefile.in
intl/uconv/ucvibm/Makefile.in
intl/uconv/ucvja/Makefile.in
intl/uconv/ucvko/Makefile.in
intl/uconv/ucvlatin/Makefile.in
intl/uconv/ucvtw/Makefile.in
intl/uconv/ucvtw2/Makefile.in
intl/uconv/util/Makefile.in
intl/unicharutil/tables/Makefile.in
intl/unicharutil/tests/Makefile.in
intl/unicharutil/tools/Makefile.in
intl/unicharutil/util/Makefile.in
intl/unicharutil/util/internal/Makefile.in
ipc/app/Makefile.in
ipc/chromium/Makefile.in
ipc/dbus/Makefile.in
ipc/glue/Makefile.in
ipc/ipdl/Makefile.in
ipc/ipdl/test/cxx/Makefile.in
ipc/ipdl/test/cxx/app/Makefile.in
ipc/ipdl/test/ipdl/Makefile.in
ipc/netd/Makefile.in
ipc/nfc/Makefile.in
ipc/ril/Makefile.in
ipc/testshell/Makefile.in
ipc/unixsocket/Makefile.in
js/ductwork/debugger/Makefile.in
js/ipc/Makefile.in
js/jsd/Makefile.in
js/jsd/test/Makefile.in
js/src/Makefile.in
js/src/config/Makefile.in
js/src/devtools/rootAnalysis/Makefile.in
js/src/editline/Makefile.in
js/src/gdb/Makefile.in
js/src/jsapi-tests/Makefile.in
js/src/shell/Makefile.in
js/src/tests/Makefile.in
js/xpconnect/loader/Makefile.in
js/xpconnect/shell/Makefile.in
js/xpconnect/src/Makefile.in
js/xpconnect/tests/Makefile.in
js/xpconnect/tests/browser/Makefile.in
js/xpconnect/tests/chrome/Makefile.in
js/xpconnect/tests/components/js/Makefile.in
js/xpconnect/tests/components/native/Makefile.in
js/xpconnect/tests/idl/Makefile.in
js/xpconnect/tests/mochitest/Makefile.in
js/xpconnect/wrappers/Makefile.in
layout/base/Makefile.in
layout/base/tests/Makefile.in
layout/base/tests/chrome/Makefile.in
layout/build/Makefile.in
layout/forms/Makefile.in
layout/forms/test/Makefile.in
layout/generic/Makefile.in
layout/generic/test/Makefile.in
layout/inspector/src/Makefile.in
layout/inspector/tests/Makefile.in
layout/inspector/tests/chrome/Makefile.in
layout/ipc/Makefile.in
layout/mathml/Makefile.in
layout/mathml/tests/Makefile.in
layout/media/Makefile.in
layout/printing/Makefile.in
layout/reftests/fonts/Makefile.in
layout/reftests/fonts/mplus/Makefile.in
layout/style/Makefile.in
layout/style/test/Makefile.in
layout/style/test/chrome/Makefile.in
layout/svg/Makefile.in
layout/tables/Makefile.in
layout/tables/test/Makefile.in
layout/tools/layout-debug/src/Makefile.in
layout/tools/reftest/Makefile.in
layout/xul/base/src/Makefile.in
layout/xul/base/test/Makefile.in
layout/xul/grid/Makefile.in
layout/xul/test/Makefile.in
layout/xul/tree/Makefile.in
media/kiss_fft/Makefile.in
media/libcubeb/src/Makefile.in
media/libjpeg/Makefile.in
media/libnestegg/src/Makefile.in
media/libogg/src/Makefile.in
media/libopus/Makefile.in
media/libpng/Makefile.in
media/libsoundtouch/src/Makefile.in
media/libspeex_resampler/src/Makefile.in
media/libtheora/lib/Makefile.in
media/libtremor/lib/Makefile.in
media/libvorbis/lib/Makefile.in
media/libvpx/Makefile.in
media/mtransport/build/Makefile.in
media/mtransport/standalone/Makefile.in
media/mtransport/test/Makefile.in
media/mtransport/third_party/Makefile.in
media/omx-plugin/Makefile.in
media/omx-plugin/froyo/Makefile.in
media/omx-plugin/gb/Makefile.in
media/omx-plugin/gb235/Makefile.in
media/omx-plugin/hc/Makefile.in
media/omx-plugin/lib/froyo/libstagefright/Makefile.in
media/omx-plugin/lib/gb/libstagefright/Makefile.in
media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in
media/omx-plugin/lib/gb/libutils/Makefile.in
media/omx-plugin/lib/gb235/libstagefright/Makefile.in
media/omx-plugin/lib/hc/libstagefright/Makefile.in
media/omx-plugin/lib/ics/libstagefright/Makefile.in
media/omx-plugin/lib/ics/libutils/Makefile.in
media/webrtc/Makefile.in
media/webrtc/signaling/test/Makefile.in
memory/build/Makefile.in
memory/jemalloc/Makefile.in
memory/mozalloc/Makefile.in
memory/mozjemalloc/Makefile.in
memory/replace/dmd/Makefile.in
memory/replace/dummy/Makefile.in
memory/replace/jemalloc/Makefile.in
mfbt/Makefile.in
mfbt/tests/Makefile.in
mobile/android/Makefile.in
mobile/android/app/Makefile.in
mobile/android/base/Makefile.in
mobile/android/base/locales/Makefile.in
mobile/android/branding/aurora/locales/Makefile.in
mobile/android/branding/beta/locales/Makefile.in
mobile/android/branding/nightly/locales/Makefile.in
mobile/android/branding/official/locales/Makefile.in
mobile/android/branding/unofficial/locales/Makefile.in
mobile/android/chrome/Makefile.in
mobile/android/components/Makefile.in
mobile/android/components/build/Makefile.in
mobile/android/fonts/Makefile.in
mobile/android/installer/Makefile.in
mobile/android/locales/Makefile.in
mobile/locales/Makefile.in
modules/libbz2/src/Makefile.in
modules/libjar/Makefile.in
modules/libjar/test/chrome/Makefile.in
modules/libjar/test/mochitest/Makefile.in
modules/libjar/zipwriter/src/Makefile.in
modules/libmar/sign/Makefile.in
modules/libmar/src/Makefile.in
modules/libmar/tests/Makefile.in
modules/libmar/tool/Makefile.in
modules/libmar/verify/Makefile.in
modules/libpref/src/Makefile.in
modules/zlib/src/Makefile.in
mozglue/android/Makefile.in
mozglue/build/Makefile.in
mozglue/linker/Makefile.in
mozglue/tests/Makefile.in
netwerk/Makefile.in
netwerk/base/public/Makefile.in
netwerk/base/src/Makefile.in
netwerk/build/Makefile.in
netwerk/cache/Makefile.in
netwerk/cookie/Makefile.in
netwerk/dash/mpd/Makefile.in
netwerk/dns/Makefile.in
netwerk/ipc/Makefile.in
netwerk/locales/Makefile.in
netwerk/protocol/about/Makefile.in
netwerk/protocol/data/Makefile.in
netwerk/protocol/device/Makefile.in
netwerk/protocol/file/Makefile.in
netwerk/protocol/ftp/Makefile.in
netwerk/protocol/http/Makefile.in
netwerk/protocol/res/Makefile.in
netwerk/protocol/viewsource/Makefile.in
netwerk/protocol/websocket/Makefile.in
netwerk/protocol/wyciwyg/Makefile.in
netwerk/sctp/datachannel/Makefile.in
netwerk/sctp/src/Makefile.in
netwerk/srtp/src/Makefile.in
netwerk/streamconv/converters/Makefile.in
netwerk/streamconv/test/Makefile.in
netwerk/system/android/Makefile.in
netwerk/system/qt/Makefile.in
netwerk/test/Makefile.in
netwerk/test/browser/Makefile.in
netwerk/test/httpserver/Makefile.in
netwerk/test/mochitests/Makefile.in
netwerk/wifi/Makefile.in
other-licenses/android/Makefile.in
other-licenses/bsdiff/Makefile.in
other-licenses/skia-npapi/Makefile.in
other-licenses/snappy/Makefile.in
parser/expat/lib/Makefile.in
parser/html/Makefile.in
parser/htmlparser/src/Makefile.in
parser/htmlparser/tests/mochitest/Makefile.in
parser/htmlparser/tests/mochitest/dir_bug534293/Makefile.in
parser/htmlparser/tests/mochitest/html5lib_tree_construction/Makefile.in
parser/htmlparser/tests/mochitest/html5lib_tree_construction/scripted/Makefile.in
parser/xml/src/Makefile.in
probes/Makefile.in
profile/dirserviceprovider/src/Makefile.in
profile/dirserviceprovider/standalone/Makefile.in
python/Makefile.in
python/mozbuild/mozbuild/test/backend/data/stub0/dir1/Makefile.in
python/mozbuild/mozbuild/test/backend/data/stub0/dir3/Makefile.in
rdf/build/Makefile.in
rdf/datasource/src/Makefile.in
rdf/tests/dsds/Makefile.in
rdf/tests/rdfcat/Makefile.in
rdf/tests/rdfpoll/Makefile.in
rdf/tests/triplescat/Makefile.in
rdf/util/src/Makefile.in
rdf/util/src/internal/Makefile.in
security/build/Makefile.in
security/manager/boot/src/Makefile.in
security/manager/locales/Makefile.in
security/manager/pki/src/Makefile.in
security/manager/ssl/src/Makefile.in
security/manager/ssl/tests/mochitest/browser/Makefile.in
security/manager/ssl/tests/mochitest/bugs/Makefile.in
security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in
security/manager/ssl/tests/mochitest/stricttransportsecurity/Makefile.in
security/manager/ssl/tests/unit/test_ocsp_stapling/Makefile.in
security/sandbox/Makefile.in
services/common/Makefile.in
services/crypto/Makefile.in
services/crypto/component/Makefile.in
services/datareporting/Makefile.in
services/healthreport/Makefile.in
services/metrics/Makefile.in
services/sync/Makefile.in
services/sync/locales/Makefile.in
startupcache/Makefile.in
startupcache/test/Makefile.in
storage/build/Makefile.in
storage/src/Makefile.in
storage/test/Makefile.in
testing/gtest/Makefile.in
testing/marionette/Makefile.in
testing/marionette/components/Makefile.in
testing/mochitest/Makefile.in
testing/mochitest/MochiKit/Makefile.in
testing/mochitest/chrome/Makefile.in
testing/mochitest/dynamic/Makefile.in
testing/mochitest/roboextender/Makefile.in
testing/mochitest/ssltunnel/Makefile.in
testing/mochitest/static/Makefile.in
testing/mochitest/tests/Makefile.in
testing/mochitest/tests/MochiKit-1.4.2/MochiKit/Makefile.in
testing/mochitest/tests/MochiKit-1.4.2/tests/Makefile.in
testing/mochitest/tests/MochiKit-1.4.2/tests/SimpleTest/Makefile.in
testing/mochitest/tests/SimpleTest/Makefile.in
testing/mochitest/tests/browser/Makefile.in
testing/modules/Makefile.in
testing/mozbase/Makefile.in
testing/peptest/Makefile.in
testing/profiles/Makefile.in
testing/specialpowers/Makefile.in
testing/tools/screenshot/Makefile.in
testing/xpcshell/Makefile.in
toolkit/Makefile.in
toolkit/components/aboutmemory/tests/Makefile.in
toolkit/components/alerts/Makefile.in
toolkit/components/alerts/test/Makefile.in
toolkit/components/autocomplete/Makefile.in
toolkit/components/build/Makefile.in
toolkit/components/commandlines/Makefile.in
toolkit/components/console/tests/Makefile.in
toolkit/components/ctypes/Makefile.in
toolkit/components/ctypes/tests/Makefile.in
toolkit/components/diskspacewatcher/Makefile.in
toolkit/components/downloads/Makefile.in
toolkit/components/downloads/test/browser/Makefile.in
toolkit/components/feeds/Makefile.in
toolkit/components/feeds/test/Makefile.in
toolkit/components/filepicker/Makefile.in
toolkit/components/jsdownloads/src/Makefile.in
toolkit/components/jsdownloads/test/data/Makefile.in
toolkit/components/maintenanceservice/Makefile.in
toolkit/components/mediasniffer/Makefile.in
toolkit/components/microformats/tests/Makefile.in
toolkit/components/osfile/tests/mochi/Makefile.in
toolkit/components/passwordmgr/test/Makefile.in
toolkit/components/passwordmgr/test/auth2/Makefile.in
toolkit/components/passwordmgr/test/browser/Makefile.in
toolkit/components/perf/Makefile.in
toolkit/components/places/Makefile.in
toolkit/components/places/tests/Makefile.in
toolkit/components/places/tests/browser/Makefile.in
toolkit/components/places/tests/chrome/Makefile.in
toolkit/components/places/tests/mochitest/bug_411966/Makefile.in
toolkit/components/places/tests/mochitest/bug_461710/Makefile.in
toolkit/components/prompts/test/Makefile.in
toolkit/components/protobuf/Makefile.in
toolkit/components/reflect/Makefile.in
toolkit/components/remote/Makefile.in
toolkit/components/satchel/Makefile.in
toolkit/components/satchel/test/Makefile.in
toolkit/components/satchel/test/browser/Makefile.in
toolkit/components/search/Makefile.in
toolkit/components/social/test/browser/Makefile.in
toolkit/components/startup/tests/browser/Makefile.in
toolkit/components/telemetry/Makefile.in
toolkit/components/thumbnails/test/Makefile.in
toolkit/components/url-classifier/Makefile.in
toolkit/components/url-classifier/tests/Makefile.in
toolkit/components/url-classifier/tests/mochitest/Makefile.in
toolkit/components/urlformatter/Makefile.in
toolkit/components/viewsource/test/Makefile.in
toolkit/components/viewsource/test/browser/Makefile.in
toolkit/components/workerloader/Makefile.in
toolkit/components/workerloader/tests/Makefile.in
toolkit/content/Makefile.in
toolkit/content/tests/browser/Makefile.in
toolkit/content/tests/browser/common/Makefile.in
toolkit/content/tests/browser/data/Makefile.in
toolkit/content/tests/chrome/Makefile.in
toolkit/content/tests/chrome/rtlchrome/Makefile.in
toolkit/content/tests/chrome/rtltest/Makefile.in
toolkit/content/tests/chrome/rtltest/content/Makefile.in
toolkit/content/tests/widgets/Makefile.in
toolkit/crashreporter/Makefile.in
toolkit/crashreporter/breakpad-windows-libxul/Makefile.in
toolkit/crashreporter/breakpad-windows-standalone/Makefile.in
toolkit/crashreporter/client/Makefile.in
toolkit/crashreporter/google-breakpad/src/client/Makefile.in
toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/Makefile.in
toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in
toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/Makefile.in
toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/Makefile.in
toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile.in
toolkit/crashreporter/google-breakpad/src/client/solaris/handler/Makefile.in
toolkit/crashreporter/google-breakpad/src/common/Makefile.in
toolkit/crashreporter/google-breakpad/src/common/dwarf/Makefile.in
toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in
toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in
toolkit/crashreporter/google-breakpad/src/common/solaris/Makefile.in
toolkit/crashreporter/google-breakpad/src/processor/Makefile.in
toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/Makefile.in
toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/Makefile.in
toolkit/crashreporter/injector/Makefile.in
toolkit/crashreporter/test/Makefile.in
toolkit/devtools/Makefile.in
toolkit/devtools/client/Makefile.in
toolkit/devtools/gcli/Makefile.in
toolkit/devtools/server/Makefile.in
toolkit/devtools/server/tests/mochitest/Makefile.in
toolkit/devtools/sourcemap/Makefile.in
toolkit/devtools/webconsole/Makefile.in
toolkit/devtools/webconsole/test/Makefile.in
toolkit/forgetaboutsite/test/browser/Makefile.in
toolkit/identity/Makefile.in
toolkit/identity/tests/chrome/Makefile.in
toolkit/library/Makefile.in
toolkit/library/winvccorlib/Makefile.in
toolkit/locales/Makefile.in
toolkit/modules/Makefile.in
toolkit/modules/tests/browser/Makefile.in
toolkit/modules/tests/chrome/Makefile.in
toolkit/mozapps/downloads/tests/Makefile.in
toolkit/mozapps/downloads/tests/chrome/Makefile.in
toolkit/mozapps/extensions/Makefile.in
toolkit/mozapps/extensions/test/Makefile.in
toolkit/mozapps/extensions/test/browser/Makefile.in
toolkit/mozapps/extensions/test/mochitest/Makefile.in
toolkit/mozapps/extensions/test/xpinstall/Makefile.in
toolkit/mozapps/plugins/tests/Makefile.in
toolkit/mozapps/update/common/Makefile.in
toolkit/mozapps/update/test/Makefile.in
toolkit/mozapps/update/test/chrome/Makefile.in
toolkit/mozapps/update/test_svc/Makefile.in
toolkit/mozapps/update/updater/Makefile.in
toolkit/profile/Makefile.in
toolkit/profile/test/Makefile.in
toolkit/system/androidproxy/Makefile.in
toolkit/system/dbus/Makefile.in
toolkit/system/gnome/Makefile.in
toolkit/system/osxproxy/Makefile.in
toolkit/system/unixproxy/Makefile.in
toolkit/system/windowsproxy/Makefile.in
toolkit/themes/osx/mochitests/Makefile.in
toolkit/xre/Makefile.in
toolkit/xre/test/Makefile.in
toolkit/xre/test/win/Makefile.in
tools/jprof/Makefile.in
tools/jprof/stub/Makefile.in
tools/profiler/Makefile.in
tools/trace-malloc/Makefile.in
tools/trace-malloc/lib/Makefile.in
tools/update-packaging/Makefile.in
uriloader/exthandler/Makefile.in
uriloader/exthandler/tests/Makefile.in
uriloader/exthandler/tests/mochitest/Makefile.in
uriloader/prefetch/Makefile.in
view/src/Makefile.in
webapprt/Makefile.in
webapprt/gtk2/Makefile.in
webapprt/locales/Makefile.in
webapprt/mac/Makefile.in
webapprt/test/chrome/Makefile.in
webapprt/test/content/Makefile.in
webapprt/win/Makefile.in
widget/android/Makefile.in
widget/cocoa/Makefile.in
widget/gonk/Makefile.in
widget/gonk/libdisplay/Makefile.in
widget/gonk/nativewindow/Makefile.in
widget/gtk2/Makefile.in
widget/gtkxtbin/Makefile.in
widget/os2/Makefile.in
widget/qt/Makefile.in
widget/qt/faststartupqt/Makefile.in
widget/shared/Makefile.in
widget/shared/x11/Makefile.in
widget/tests/Makefile.in
widget/windows/Makefile.in
widget/windows/winrt/Makefile.in
widget/xpwidgets/Makefile.in
widget/xremoteclient/Makefile.in
xpcom/Makefile.in
xpcom/analysis/Makefile.in
xpcom/base/Makefile.in
xpcom/build/Makefile.in
xpcom/components/Makefile.in
xpcom/ds/Makefile.in
xpcom/glue/Makefile.in
xpcom/glue/nomozalloc/Makefile.in
xpcom/glue/standalone/Makefile.in
xpcom/glue/standalone/staticruntime/Makefile.in
xpcom/glue/staticruntime/Makefile.in
xpcom/glue/tests/gtest/Makefile.in
xpcom/idl-parser/Makefile.in
xpcom/io/Makefile.in
xpcom/reflect/xptcall/src/Makefile.in
xpcom/reflect/xptcall/src/md/os2/Makefile.in
xpcom/reflect/xptcall/src/md/unix/Makefile.in
xpcom/reflect/xptcall/src/md/win32/Makefile.in
xpcom/reflect/xptcall/tests/Makefile.in
xpcom/reflect/xptinfo/public/Makefile.in
xpcom/reflect/xptinfo/src/Makefile.in
xpcom/reflect/xptinfo/tests/Makefile.in
xpcom/sample/Makefile.in
xpcom/sample/program/Makefile.in
xpcom/string/src/Makefile.in
xpcom/tests/Makefile.in
xpcom/tests/bug656331_component/Makefile.in
xpcom/tests/component/Makefile.in
xpcom/tests/component_no_aslr/Makefile.in
xpcom/tests/external/Makefile.in
xpcom/tests/static-checker/Makefile.in
xpcom/tests/windows/Makefile.in
xpcom/threads/Makefile.in
xpcom/typelib/xpt/src/Makefile.in
xpcom/typelib/xpt/tests/Makefile.in
xpcom/typelib/xpt/tools/Makefile.in
xpcom/windbgdlg/Makefile.in
xpfe/appshell/src/Makefile.in
xpfe/appshell/src/test/Makefile.in
xpfe/components/build/Makefile.in
xpfe/components/windowds/Makefile.in
xulrunner/app/Makefile.in
xulrunner/app/profile/Makefile.in
xulrunner/app/profile/chrome/Makefile.in
xulrunner/examples/simple/Makefile.in
xulrunner/examples/simple/components/public/Makefile.in
xulrunner/examples/simple/components/src/Makefile.in
xulrunner/installer/Makefile.in
xulrunner/installer/windows/Makefile.in
xulrunner/setup/Makefile.in
xulrunner/stub/Makefile.in
xulrunner/tools/redit/Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,31 +1,24 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
 ifndef .PYMAKE
 ifeq (,$(MAKE_VERSION))
 $(error GNU Make is required)
 endif
 ifeq (,$(filter-out 3.78 3.79,$(MAKE_VERSION)))
 $(error GNU Make 3.80 or higher is required)
 endif
 endif
 
 export TOPLEVEL_BUILD := 1
 
-include $(DEPTH)/config/autoconf.mk
-
 default::
 
 ifdef COMPILE_ENVIRONMENT
 include $(topsrcdir)/$(MOZ_BUILD_APP)/build.mk
 endif
 
 
 include $(topsrcdir)/config/config.mk
--- a/accessible/public/ia2/Makefile.in
+++ b/accessible/public/ia2/Makefile.in
@@ -1,23 +1,16 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
 DEFFILE       = $(win_srcdir)/IA2Marshal.def
 
 IA2DIR        = $(topsrcdir)/other-licenses/ia2
 
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES       += -DREGISTER_PROXY_DLL
 
 GARBAGE       += $(MIDL_GENERATED_FILES)
 
 FORCE_SHARED_LIB = 1
 
 # Please keep this list in sync with the moz.build file until the rest of this
 # Makefile is ported over.
@@ -92,9 +85,8 @@ midl_done : $(addprefix $(IA2DIR)/,$(MID
 	for idl in $(sort $(subst FORCE,,$?) $(addsuffix .idl,$(addprefix $(IA2DIR)/,$(missing_base)))); do \
 	  $(MIDL) $(MIDL_FLAGS) -app_config -I $(IA2DIR) -Oicf $$idl; \
 	done
 	touch $@
 
 # This marshall dll is also registered in the installer
 register::
 	regsvr32 -s $(DIST)/bin/$(SHARED_LIBRARY)
-
--- a/accessible/public/msaa/Makefile.in
+++ b/accessible/public/msaa/Makefile.in
@@ -1,21 +1,14 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
 DEFFILE = $(win_srcdir)/AccessibleMarshal.def
 
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DREGISTER_PROXY_DLL
 
 GARBAGE += $(MIDL_GENERATED_FILES) done_gen dlldata.c
 
 FORCE_SHARED_LIB = 1
 
 CSRCS	= \
 	dlldata.c \
@@ -68,11 +61,8 @@ midl_exports := \
     ISimpleDOMText.h \
     ISimpleDOMText_i.c \
     $(NULL)
 
 INSTALL_TARGETS += midl_exports
 midl_exports_FILES := $(midl_exports)
 midl_exports_DEST = $(DIST)/include
 midl_exports_TARGET := export
-
-include $(topsrcdir)/config/rules.mk
-
--- a/accessible/src/Makefile.in
+++ b/accessible/src/Makefile.in
@@ -1,21 +1,12 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 A11Y_LOG = 0
 ifdef MOZ_DEBUG
   A11Y_LOG = 1
 endif
 ifeq (,$(filter aurora beta release esr,$(MOZ_UPDATE_CHANNEL)))
   A11Y_LOG = 1
 endif
 export A11Y_LOG
-
-include $(topsrcdir)/config/rules.mk
--- a/accessible/src/atk/Makefile.in
+++ b/accessible/src/atk/Makefile.in
@@ -1,19 +1,12 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = ..
 include $(topsrcdir)/config/rules.mk
 
 ifdef MOZ_ENABLE_GTK
 CFLAGS      += $(TK_CFLAGS)
 CXXFLAGS    += $(TK_CFLAGS)
 endif
 
--- a/accessible/src/base/Makefile.in
+++ b/accessible/src/base/Makefile.in
@@ -1,19 +1,12 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
   -I$(srcdir) \
   -I$(srcdir)/../generic \
   -I$(srcdir)/../html \
   -I$(srcdir)/../xpcom \
   -I$(srcdir)/../xul \
--- a/accessible/src/generic/Makefile.in
+++ b/accessible/src/generic/Makefile.in
@@ -1,19 +1,12 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../xpcom \
   -I$(srcdir)/../base \
   -I$(srcdir)/../html \
   -I$(srcdir)/../xul \
   -I$(srcdir)/../../../content/base/src \
--- a/accessible/src/html/Makefile.in
+++ b/accessible/src/html/Makefile.in
@@ -1,20 +1,13 @@
 #
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../base \
   -I$(srcdir)/../generic \
   -I$(srcdir)/../xpcom \
   -I$(srcdir)/../../../content/base/src \
   -I$(srcdir)/../../../content/html/content/src \
--- a/accessible/src/jsat/Makefile.in
+++ b/accessible/src/jsat/Makefile.in
@@ -1,29 +1,19 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 INSTALL_TARGETS += ACCESSFU
 
 ACCESSFU_FILES := \
   AccessFu.jsm \
   EventManager.jsm \
   jar.mn \
   Makefile.in \
   OutputGenerator.jsm \
   Presentation.jsm \
   TouchAdapter.jsm \
   TraversalRules.jsm \
   Utils.jsm \
   $(NULL)
 
 ACCESSFU_DEST = $(FINAL_TARGET)/modules/accessibility
-
-include $(topsrcdir)/config/rules.mk
-
--- a/accessible/src/mac/Makefile.in
+++ b/accessible/src/mac/Makefile.in
@@ -1,19 +1,12 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = ..
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
   -I$(srcdir) \
   -I$(srcdir)/../base \
   -I$(srcdir)/../generic \
   -I$(srcdir)/../html \
--- a/accessible/src/other/Makefile.in
+++ b/accessible/src/other/Makefile.in
@@ -1,19 +1,12 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = ..
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
   -I$(srcdir) \
   -I$(srcdir)/../base \
   -I$(srcdir)/../generic \
   -I$(srcdir)/../html \
--- a/accessible/src/windows/Makefile.in
+++ b/accessible/src/windows/Makefile.in
@@ -1,17 +1,10 @@
 #
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 ifneq ($(A11Y_LOG),0)
   DEFINES += -DA11Y_LOG
 endif
--- a/accessible/src/windows/ia2/Makefile.in
+++ b/accessible/src/windows/ia2/Makefile.in
@@ -1,19 +1,12 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 
 # The midl generated code include Windows headers which defines min and max
 # macros which conflicts with std::min/max.  Suppress the macros:
 OS_CXXFLAGS += -DNOMINMAX
 
 include $(topsrcdir)/config/rules.mk
 
--- a/accessible/src/windows/msaa/Makefile.in
+++ b/accessible/src/windows/msaa/Makefile.in
@@ -1,19 +1,12 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 LOCAL_INCLUDES += \
   -I$(srcdir) \
   -I$(srcdir)/../../base \
   -I$(srcdir)/../../generic \
--- a/accessible/src/windows/sdn/Makefile.in
+++ b/accessible/src/windows/sdn/Makefile.in
@@ -1,19 +1,12 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 
 # The midl generated code include Windows headers which defines min and max
 # macros which conflicts with std::min/max.  Suppress the macros:
 OS_CXXFLAGS += -DNOMINMAX
 
 include $(topsrcdir)/config/rules.mk
 
--- a/accessible/src/windows/uia/Makefile.in
+++ b/accessible/src/windows/uia/Makefile.in
@@ -1,19 +1,12 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = ..
 
 # The midl generated code include Windows headers which defines min and max
 # macros which conflicts with std::min/max.  Suppress the macros:
 OS_CXXFLAGS += -DNOMINMAX
 
 include $(topsrcdir)/config/rules.mk
 
--- a/accessible/src/xpcom/Makefile.in
+++ b/accessible/src/xpcom/Makefile.in
@@ -1,19 +1,12 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXTRA_MDDEPEND_FILES = xpcAccEvents.pp
 
 INSTALL_TARGETS += xpcaccevents
 xpcaccevents_FILES := xpcAccEvents.h
 xpcaccevents_DEST = $(DIST)/include
 xpcaccevents_TARGET := export
 
 include $(topsrcdir)/config/rules.mk
--- a/accessible/src/xul/Makefile.in
+++ b/accessible/src/xul/Makefile.in
@@ -1,20 +1,13 @@
 #
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \
   -I$(srcdir) \
   -I$(srcdir)/../base \
   -I$(srcdir)/../generic \
   -I$(srcdir)/../html \
   -I$(srcdir)/../xpcom \
--- a/accessible/tests/mochitest/Makefile.in
+++ b/accessible/tests/mochitest/Makefile.in
@@ -1,21 +1,13 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		dumbfile.xpi \
 		formimage.png \
 		letters.gif \
 		moz.png \
 		$(topsrcdir)/content/media/test/bug461281.ogg \
 		longdesc_src.html \
 		actions.js \
@@ -42,10 +34,8 @@ MOCHITEST_A11Y_FILES =\
 		test_OuterDocAccessible.html \
 		test_textboxes.html \
 		test_textboxes.xul \
 		testTextboxes.js \
 		text.js \
 		treeview.css \
 		treeview.js \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/accessible/tests/mochitest/actions/Makefile.in
+++ b/accessible/tests/mochitest/actions/Makefile.in
@@ -1,29 +1,19 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		test_anchors.html \
 		test_aria.html \
 		test_general.html \
 		test_general.xul \
 		test_controls.html \
 		test_keys_menu.xul \
 		test_keys.html \
 		test_link.html \
 		test_media.html \
 		test_select.html \
 		test_tree.xul \
 		test_treegrid.xul \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/accessible/tests/mochitest/attributes/Makefile.in
+++ b/accessible/tests/mochitest/attributes/Makefile.in
@@ -1,25 +1,15 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		test_obj.html \
 		test_obj_css.html \
 		test_obj_css.xul \
 		test_obj_group.html \
 		test_obj_group.xul \
 		test_obj_group_tree.xul \
 		test_tag.html \
 		test_xml-roles.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/accessible/tests/mochitest/bounds/Makefile.in
+++ b/accessible/tests/mochitest/bounds/Makefile.in
@@ -1,21 +1,11 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		test_list.html \
 		test_select.html \
 		test_zoom_text.html \
 		test_zoom.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/accessible/tests/mochitest/editabletext/Makefile.in
+++ b/accessible/tests/mochitest/editabletext/Makefile.in
@@ -1,20 +1,10 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		editabletext.js \
 		test_1.html \
 		test_2.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/accessible/tests/mochitest/elm/Makefile.in
+++ b/accessible/tests/mochitest/elm/Makefile.in
@@ -1,22 +1,12 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		test_figure.html \
 		test_HTMLSpec.html \
 		test_listbox.xul \
 		test_nsApplicationAcc.html \
 		test_plugin.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/accessible/tests/mochitest/events/Makefile.in
+++ b/accessible/tests/mochitest/events/Makefile.in
@@ -1,21 +1,13 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		docload_wnd.html \
 		focus.html \
 		scroll.html \
 		test_aria_alert.html \
 		test_aria_menu.html \
 		test_aria_objattr.html \
 		test_aria_statechange.html \
@@ -62,10 +54,8 @@ MOCHITEST_A11Y_FILES =\
 		$(NULL)
 
 # Disabled on Linux and Windows due to frequent failures - bug 695019, bug 890795
 ifeq (,$(filter Linux WINNT,$(OS_ARCH)))
 MOCHITEST_A11Y_FILES += \
 		test_focus_autocomplete.xul \
 		$(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
--- a/accessible/tests/mochitest/focus/Makefile.in
+++ b/accessible/tests/mochitest/focus/Makefile.in
@@ -1,20 +1,10 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		test_focusedChild.html \
 		test_takeFocus.html \
 		test_takeFocus.xul \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/accessible/tests/mochitest/hittest/Makefile.in
+++ b/accessible/tests/mochitest/hittest/Makefile.in
@@ -1,24 +1,14 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES = \
 		test_browser.html \
 		test_general.html \
 		test_menu.xul \
 		test_zoom_text.html \
 		test_zoom_tree.xul \
 		test_zoom.html \
 		zoom_tree.xul \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/accessible/tests/mochitest/hyperlink/Makefile.in
+++ b/accessible/tests/mochitest/hyperlink/Makefile.in
@@ -1,20 +1,10 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		hyperlink.js \
 		test_general.html \
 		test_general.xul \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/accessible/tests/mochitest/hypertext/Makefile.in
+++ b/accessible/tests/mochitest/hypertext/Makefile.in
@@ -1,19 +1,9 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES = \
 		test_general.html \
 		test_update.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/accessible/tests/mochitest/jsat/Makefile.in
+++ b/accessible/tests/mochitest/jsat/Makefile.in
@@ -1,26 +1,16 @@
 #
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 jsatcommon.js \
 output.js \
 test_alive.html \
 test_braille.html \
 test_explicit_names.html \
 test_landmarks.html \
 test_live_regions.html \
 test_tables.html \
 test_utterance_order.html \
 $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/accessible/tests/mochitest/name/Makefile.in
+++ b/accessible/tests/mochitest/name/Makefile.in
@@ -1,21 +1,13 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		general.css \
 		general.xbl \
 		markup.js \
 		test_general.html \
 		test_general.xul \
 		test_link.html \
 		test_list.html \
@@ -24,10 +16,8 @@ MOCHITEST_A11Y_FILES =\
 		test_browserui.xul \
 		markuprules.xml \
 		$(NULL)
 
 # Disabled on mac while bug 905909 is sorted out.
 ifneq ($(OS_ARCH), Darwin)
 MOCHITEST_A11Y_FILES += test_tree.xul
 endif
-
-include $(topsrcdir)/config/rules.mk
--- a/accessible/tests/mochitest/pivot/Makefile.in
+++ b/accessible/tests/mochitest/pivot/Makefile.in
@@ -1,21 +1,11 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES = \
 		doc_virtualcursor.html \
 		doc_virtualcursor_text.html \
 		test_virtualcursor.html \
 		test_virtualcursor_text.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/accessible/tests/mochitest/relations/Makefile.in
+++ b/accessible/tests/mochitest/relations/Makefile.in
@@ -1,25 +1,15 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		test_bindings.xhtml \
 		test_embeds.xul \
 		test_general.html \
 		test_general.xul \
 		test_tabbrowser.xul \
 		test_tree.xul \
 		test_ui_modalprompt.html \
 		test_update.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/accessible/tests/mochitest/role/Makefile.in
+++ b/accessible/tests/mochitest/role/Makefile.in
@@ -1,21 +1,11 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		test_aria.html \
 		test_aria.xul \
 		test_general.html \
 		test_general.xul \
 		test_svg.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/accessible/tests/mochitest/scroll/Makefile.in
+++ b/accessible/tests/mochitest/scroll/Makefile.in
@@ -1,19 +1,9 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		test_zoom_text.html \
 		test_zoom.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/accessible/tests/mochitest/selectable/Makefile.in
+++ b/accessible/tests/mochitest/selectable/Makefile.in
@@ -1,23 +1,13 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		test_aria.html \
 		test_listbox.xul \
 		test_menu.xul \
 		test_menulist.xul \
 		test_select.html \
 		test_tree.xul \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/accessible/tests/mochitest/states/Makefile.in
+++ b/accessible/tests/mochitest/states/Makefile.in
@@ -1,21 +1,13 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		test_aria.html \
 		test_aria_imgmap.html \
 		test_aria_widgetitems.html \
 		test_buttons.html \
 		test_controls.html \
 		test_controls.xul \
 		test_doc.html \
@@ -39,10 +31,8 @@ MOCHITEST_A11Y_FILES =\
 		z_frames_textbox.html \
 		z_frames_update.html \
 		$(NULL)
 
 # Disabled on mac while bug 905909 is sorted out.
 ifneq ($(OS_ARCH), Darwin)
 MOCHITEST_A11Y_FILES += test_tree.xul
 endif
-
-include $(topsrcdir)/config/rules.mk
--- a/accessible/tests/mochitest/table/Makefile.in
+++ b/accessible/tests/mochitest/table/Makefile.in
@@ -1,21 +1,13 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES = \
 		test_headers_ariagrid.html \
 		test_headers_listbox.xul \
 		test_headers_table.html \
 		test_headers_tree.xul \
 		test_indexes_ariagrid.html \
 		test_indexes_listbox.xul \
 		test_indexes_table.html \
@@ -28,10 +20,8 @@ MOCHITEST_A11Y_FILES = \
 		test_struct_ariagrid.html \
 		test_struct_ariatreegrid.html \
 		test_struct_listbox.xul \
 		test_struct_table.html \
 		test_struct_tree.xul \
 		test_table_1.html \
 		test_table_2.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/accessible/tests/mochitest/text/Makefile.in
+++ b/accessible/tests/mochitest/text/Makefile.in
@@ -1,29 +1,19 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES = \
 		doc.html \
 		test_atcaretoffset.html \
 		test_charboundary.html \
 		test_doc.html \
 		test_general.xul \
 		test_gettext.html \
 		test_hypertext.html \
 		test_lineboundary.html \
 		test_passwords.html \
 		test_selection.html \
 		test_wordboundary.html \
 		test_words.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/accessible/tests/mochitest/textattrs/Makefile.in
+++ b/accessible/tests/mochitest/textattrs/Makefile.in
@@ -1,19 +1,9 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		test_general.html \
 		test_invalid.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/accessible/tests/mochitest/textcaret/Makefile.in
+++ b/accessible/tests/mochitest/textcaret/Makefile.in
@@ -1,19 +1,9 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES = \
 		test_browserui.xul \
 		test_general.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/accessible/tests/mochitest/textselection/Makefile.in
+++ b/accessible/tests/mochitest/textselection/Makefile.in
@@ -1,19 +1,9 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES = \
 		test_general.html \
 		test_userinput.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/accessible/tests/mochitest/tree/Makefile.in
+++ b/accessible/tests/mochitest/tree/Makefile.in
@@ -1,21 +1,13 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		dockids.html \
 		$(filter disabled-temporarily--bug-561508, test_applicationacc.xul) \
 		test_aria_globals.html \
 		test_aria_grid.html \
 		test_aria_imgmap.html \
 		test_aria_list.html \
 		test_aria_menu.html \
@@ -44,10 +36,8 @@ MOCHITEST_A11Y_FILES =\
 		test_tabbrowser.xul \
 		test_table.html \
 		test_tree.xul \
 		test_txtcntr.html \
 		test_txtctrl.html \
 		test_txtctrl.xul \
 		wnd.xul \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/accessible/tests/mochitest/treeupdate/Makefile.in
+++ b/accessible/tests/mochitest/treeupdate/Makefile.in
@@ -1,21 +1,13 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		test_ariadialog.html \
 		test_canvas.html \
 		test_colorpicker.xul \
 		test_cssoverflow.html \
 		test_contextmenu.xul \
 		test_deck.xul \
 		test_doc.html \
@@ -30,10 +22,8 @@ MOCHITEST_A11Y_FILES =\
 	test_optgroup.html \
 		test_recreation.html \
 		test_select.html \
 		test_bug852150.xhtml \
 		test_textleaf.html \
 		test_visibility.html \
 		test_whitespace.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/accessible/tests/mochitest/value/Makefile.in
+++ b/accessible/tests/mochitest/value/Makefile.in
@@ -1,21 +1,11 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		test_general.html \
 		test_progress.html \
 		test_progress.xul \
 		test_range.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/addon-sdk/Makefile.in
+++ b/addon-sdk/Makefile.in
@@ -1,17 +1,12 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
 include $(topsrcdir)/config/config.mk
 
 export PYMAKE = $(.PYMAKE)
 
 libs::
 	$(PYTHON) $(srcdir)/copy_source.py $(topsrcdir) $(srcdir)/source/lib $(FINAL_TARGET)/modules/commonjs >copy_source.mk
 	$(MAKE) -f copy_source.mk libs
 
--- a/b2g/Makefile.in
+++ b/b2g/Makefile.in
@@ -1,13 +1,6 @@
 # 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/.
 
-DEPTH      = @DEPTH@
-topsrcdir  = @top_srcdir@
-srcdir     = @srcdir@
-VPATH      = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/testing/testsuite-targets.mk
--- a/b2g/app/Makefile.in
+++ b/b2g/app/Makefile.in
@@ -1,18 +1,12 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 USE_RCS_MK := 1
 include $(topsrcdir)/config/makefiles/rcs.mk
 
 PREF_JS_EXPORTS = $(srcdir)/b2g.js
 
 ifdef ENABLE_MARIONETTE
 DEFINES += -DENABLE_MARIONETTE=1
 endif
--- a/b2g/branding/official/locales/Makefile.in
+++ b/b2g/branding/official/locales/Makefile.in
@@ -1,15 +1,5 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DAB_CD=$(AB_CD)
-
-include $(topsrcdir)/config/rules.mk
--- a/b2g/branding/unofficial/locales/Makefile.in
+++ b/b2g/branding/unofficial/locales/Makefile.in
@@ -1,15 +1,5 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DAB_CD=$(AB_CD)
-
-include $(topsrcdir)/config/rules.mk
--- a/b2g/chrome/Makefile.in
+++ b/b2g/chrome/Makefile.in
@@ -1,17 +1,8 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DAB_CD=$(MOZ_UI_LOCALE) \
            -DPACKAGE=browser \
            -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
            $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/b2g/gaia/Makefile.in
+++ b/b2g/gaia/Makefile.in
@@ -1,19 +1,12 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 GAIA_PATH := gaia/profile
 
 ifeq ($(OS_ARCH),WINNT)
 DEFINES += \
   -DB2G_NAME=L\"$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)\" \
   -DGAIA_PATH=L\"$(subst /,\\\\,$(GAIA_PATH))\" \
   $(NULL)
 GAIA_MAKE=make
@@ -32,9 +25,8 @@ WRAP_LDFLAGS :=
 GENERATED_DIRS += $(DIST)/bin/$(GAIA_PATH)
 
 include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(GAIA_MAKE) -j1 -C $(GAIADIR) clean
 	$(GAIA_MAKE) -j1 -C $(GAIADIR) profile
 	(cd $(GAIADIR)/profile && tar $(TAR_CREATE_FLAGS) - .) | (cd $(abspath $(DIST))/bin/$(GAIA_PATH) && tar -xf -)
-
--- a/b2g/installer/Makefile.in
+++ b/b2g/installer/Makefile.in
@@ -1,19 +1,12 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 STANDALONE_MAKEFILE := 1
 
 include $(topsrcdir)/config/rules.mk
 
 MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
 
 MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
 
--- a/b2g/locales/Makefile.in
+++ b/b2g/locales/Makefile.in
@@ -1,21 +1,13 @@
 # vim:set ts=8 sw=8 sts=8 noet:
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/config.mk
 
 SUBMAKEFILES += \
 	$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \
 	$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \
 	$(NULL)
 
 # This makefile uses variable overrides from the libs-% target to
--- a/browser/Makefile.in
+++ b/browser/Makefile.in
@@ -1,17 +1,12 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
 include $(topsrcdir)/config/rules.mk
 
 ifdef MAKENSISU
 
 # For Windows build the uninstaller during the application build since the
 # uninstaller is included with the application for mar file generation.
 libs::
 	$(MAKE) -C installer/windows uninstaller
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -1,19 +1,12 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 dist_dest   = $(DIST)/$(MOZ_MACBUNDLE_NAME)
 
 ifdef ENABLE_MARIONETTE
 DEFINES += -DENABLE_MARIONETTE=1
 endif
 
 PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js \
 		  $(NULL)
--- a/browser/app/profile/extensions/Makefile.in
+++ b/browser/app/profile/extensions/Makefile.in
@@ -1,21 +1,15 @@
 #
 # 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/.
 
-DEPTH      = @DEPTH@
-topsrcdir  = @top_srcdir@
-srcdir     = @srcdir@
-VPATH      = @srcdir@
-
 DISTROEXT = $(call core_abspath,$(FINAL_TARGET))/distribution/extensions
 
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 ifneq (,$(filter beta,$(MOZ_UPDATE_CHANNEL)))
 EXTENSIONS = \
   $(NULL)
 
 all_xpis = $(foreach dir,$(EXTENSIONS),$(DISTROEXT)/$(dir).xpi)
 libs:: $(all_xpis)
--- a/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
+++ b/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
@@ -1,19 +1,10 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FILES := \
 	install.rdf.in \
 	$(NULL)
 FILES_PATH = $(FINAL_TARGET)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
 PP_TARGETS := FILES
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/base/Makefile.in
+++ b/browser/base/Makefile.in
@@ -1,20 +1,13 @@
 #
 # 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/.
 
-DEPTH   = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/config.mk
 
 abs_srcdir = $(call core_abspath,$(srcdir))
 
 CHROME_DEPS += $(abs_srcdir)/content/overrides/app-license.html
 
 include $(topsrcdir)/config/rules.mk
 
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -1,20 +1,12 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
         head_plain.js \
         bug364677-data.xml \
         bug364677-data.xml^headers^ \
         bug395533-data.txt \
         ctxmenu-image.png \
         feed_discovery.html \
         gZipOfflineChild.cacheManifest \
@@ -376,10 +368,8 @@ MOCHITEST_BROWSER_FILES += \
 endif
 
 # browser_CTP_context_menu.js fails intermittently on Linux (bug 909342)
 ifndef MOZ_WIDGET_GTK
 MOCHITEST_BROWSER_FILES += \
   browser_CTP_context_menu.js \
   $(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/base/content/test/newtab/Makefile.in
+++ b/browser/base/content/test/newtab/Makefile.in
@@ -1,20 +1,12 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
 	browser_newtab_block.js \
 	browser_newtab_disable.js \
 	browser_newtab_drag_drop.js \
 	browser_newtab_drag_drop_ext.js \
 	browser_newtab_drop_preview.js \
 	browser_newtab_focus.js \
 	browser_newtab_reset.js \
@@ -29,10 +21,8 @@ MOCHITEST_BROWSER_FILES = \
 	browser_newtab_bug734043.js \
 	browser_newtab_bug735987.js \
 	browser_newtab_bug752841.js \
 	browser_newtab_bug765628.js \
 	browser_newtab_bug876313.js \
 	browser_newtab_perwindow_private_browsing.js \
 	head.js \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/base/content/test/social/Makefile.in
+++ b/browser/base/content/test/social/Makefile.in
@@ -1,20 +1,12 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
                  head.js \
 		 blocklist.xml \
 		 browser_blocklist.js \
 		 browser_defaults.js \
 		 browser_addons.js \
 		 browser_chat_tearoff.js \
                  browser_social_activation.js \
@@ -39,10 +31,8 @@ MOCHITEST_BROWSER_FILES = \
                  social_mark_image.png \
                  social_sidebar.html \
                  social_chat.html \
                  social_flyout.html \
                  social_window.html \
                  social_worker.js \
                  share.html \
                  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/base/content/test/social/opengraph/Makefile.in
+++ b/browser/base/content/test/social/opengraph/Makefile.in
@@ -1,21 +1,11 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES := \
                  opengraph.html \
                  og_invalid_url.html \
                  shortlink_linkrel.html \
                  shorturl_link.html \
                  shorturl_linkrel.html \
                  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/branding/aurora/Makefile.in
+++ b/browser/branding/aurora/Makefile.in
@@ -1,18 +1,12 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js
 
 # On Windows only do this step for browser, skip for metro.
 ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows browser)
 BRANDING_FILES := \
 	firefox.ico \
@@ -65,10 +59,8 @@ BRANDING_TARGET := export
 INSTALL_TARGETS += BRANDING
 
 ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
 VISUALMANIFEST := VisualElementsManifest.xml
 VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME}
 VISUALMANIFEST_PATH := $(DIST)/bin
 PP_TARGETS += VISUALMANIFEST
 endif
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/branding/aurora/content/Makefile.in
+++ b/browser/branding/aurora/content/Makefile.in
@@ -1,22 +1,13 @@
 # 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/.
 
 # Branding Makefile
 #  - jars chrome artwork
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # resources needed for the metro tile interface
 ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
 TILE_FILES := $(wildcard $(srcdir)/VisualElements*)
 TILE_DEST := $(DIST)/bin/tileresources
 INSTALL_TARGETS += TILE
 endif
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/branding/aurora/locales/Makefile.in
+++ b/browser/branding/aurora/locales/Makefile.in
@@ -1,15 +1,5 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID)
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/branding/nightly/Makefile.in
+++ b/browser/branding/nightly/Makefile.in
@@ -1,18 +1,12 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js
 
 # On Windows only do this step for browser, skip for metro.
 ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows browser)
 BRANDING_FILES := \
 	firefox.ico \
@@ -65,10 +59,8 @@ BRANDING_TARGET := export
 INSTALL_TARGETS += BRANDING
 
 ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
 VISUALMANIFEST := VisualElementsManifest.xml
 VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME}
 VISUALMANIFEST_PATH := $(DIST)/bin
 PP_TARGETS += VISUALMANIFEST
 endif
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/branding/nightly/content/Makefile.in
+++ b/browser/branding/nightly/content/Makefile.in
@@ -1,22 +1,13 @@
 # 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/.
 
 # Branding Makefile
 #  - jars chrome artwork
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # resources needed for the metro tile interface
 ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
 TILE_FILES := $(wildcard $(srcdir)/VisualElements*)
 TILE_DEST := $(DIST)/bin/tileresources
 INSTALL_TARGETS += TILE
 endif
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/branding/nightly/locales/Makefile.in
+++ b/browser/branding/nightly/locales/Makefile.in
@@ -1,15 +1,5 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID)
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/branding/official/Makefile.in
+++ b/browser/branding/official/Makefile.in
@@ -1,18 +1,12 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js
 
 # On Windows only do this step for browser, skip for metro.
 ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows browser)
 BRANDING_FILES := \
 	firefox.ico \
@@ -65,10 +59,8 @@ BRANDING_TARGET := export
 INSTALL_TARGETS += BRANDING
 
 ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
 VISUALMANIFEST := VisualElementsManifest.xml
 VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME}
 VISUALMANIFEST_PATH := $(DIST)/bin
 PP_TARGETS += VISUALMANIFEST
 endif
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/branding/official/content/Makefile.in
+++ b/browser/branding/official/content/Makefile.in
@@ -1,22 +1,13 @@
 # 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/.
 
 # Branding Makefile
 #  - jars chrome artwork
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # resources needed for the metro tile interface
 ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
 TILE_FILES := $(wildcard $(srcdir)/VisualElements*)
 TILE_DEST := $(DIST)/bin/tileresources
 INSTALL_TARGETS += TILE
 endif
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/branding/official/locales/Makefile.in
+++ b/browser/branding/official/locales/Makefile.in
@@ -1,15 +1,5 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DAB_CD=$(AB_CD)
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/branding/unofficial/Makefile.in
+++ b/browser/branding/unofficial/Makefile.in
@@ -1,18 +1,12 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js
 
 # On Windows only do this step for browser, skip for metro.
 ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows browser)
 BRANDING_FILES := \
 	firefox.ico \
@@ -65,10 +59,8 @@ BRANDING_TARGET := export
 INSTALL_TARGETS += BRANDING
 
 ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
 VISUALMANIFEST := VisualElementsManifest.xml
 VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME}
 VISUALMANIFEST_PATH := $(DIST)/bin
 PP_TARGETS += VISUALMANIFEST
 endif
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/branding/unofficial/content/Makefile.in
+++ b/browser/branding/unofficial/content/Makefile.in
@@ -1,22 +1,13 @@
 # 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/.
 
 # Branding Makefile
 #  - jars chrome artwork
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # resources needed for the metro tile interface
 ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
 TILE_FILES := $(wildcard $(srcdir)/VisualElements*)
 TILE_DEST := $(DIST)/bin/tileresources
 INSTALL_TARGETS += TILE
 endif
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/branding/unofficial/locales/Makefile.in
+++ b/browser/branding/unofficial/locales/Makefile.in
@@ -1,15 +1,5 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID)
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/components/about/Makefile.in
+++ b/browser/components/about/Makefile.in
@@ -1,17 +1,8 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 
 LOCAL_INCLUDES = -I$(srcdir)/../build
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/components/build/Makefile.in
+++ b/browser/components/build/Makefile.in
@@ -1,19 +1,12 @@
 # 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/.
 
-DEPTH=@DEPTH@
-topsrcdir=@top_srcdir@
-srcdir=@srcdir@
-VPATH=@srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 SHORT_LIBNAME = brwsrcmp
 IS_COMPONENT = 1
 MODULE_NAME = nsBrowserCompsModule
 FORCE_SHARED_LIB = 1
 
 USE_STATIC_LIBS = 1
 
 ifeq ($(OS_ARCH),WINNT)
--- a/browser/components/certerror/test/Makefile.in
+++ b/browser/components/certerror/test/Makefile.in
@@ -1,19 +1,9 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES := \
   browser_bug431826.js \
   browser_bug633691.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/components/dirprovider/Makefile.in
+++ b/browser/components/dirprovider/Makefile.in
@@ -1,22 +1,13 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 
 LOCAL_INCLUDES = -I$(srcdir)/../build
 
 EXTRA_DSO_LDOPTS = \
 	$(XPCOM_GLUE_LDOPTS) \
 	$(NSPR_LIBS) \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/components/downloads/test/browser/Makefile.in
+++ b/browser/components/downloads/test/browser/Makefile.in
@@ -1,19 +1,8 @@
 # Any copyright is dedicated to the Public Domain.
 # http://creativecommons.org/publicdomain/zero/1.0/
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
   browser_basic_functionality.js \
   browser_first_download_panel.js \
   head.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/components/feeds/src/Makefile.in
+++ b/browser/components/feeds/src/Makefile.in
@@ -1,23 +1,14 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 
 DEFINES += \
 	-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
 	-DMOZ_MACBUNDLE_NAME=$(MOZ_MACBUNDLE_NAME) \
 	$(NULL)
 
 
 LOCAL_INCLUDES = -I$(srcdir)/../../build
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/components/feeds/test/Makefile.in
+++ b/browser/components/feeds/test/Makefile.in
@@ -1,27 +1,17 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
 		bug408328-data.xml \
 		bug368464-data.xml \
 		test_bug494328.html \
 		bug494328-data.xml \
 		test_bug589543.html \
 		bug589543-data.xml \
 		test_bug436801.html \
 		bug436801-data.xml \
 		test_registerHandler.html \
 		valid-feed.xml \
 		valid-unsniffable-feed.xml \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/components/feeds/test/chrome/Makefile.in
+++ b/browser/components/feeds/test/chrome/Makefile.in
@@ -1,27 +1,16 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # sample_feed.atom was copied from toolkit/components/places/tests/chrome
 MOCHITEST_FILES	= \
 		sample_feed.atom \
 		$(NULL)
 
 MOCHITEST_CHROME_FILES	= \
 		test_423060.xul \
 		test_bug368464.html \
 		test_bug408328.html \
 		test_maxSniffing.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
--- a/browser/components/migration/src/Makefile.in
+++ b/browser/components/migration/src/Makefile.in
@@ -1,26 +1,16 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 
 
 ifeq ($(OS_ARCH),WINNT)
 
 DEFINES += -DHAS_IE_MIGRATOR -DHAS_SAFARI_MIGRATOR
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 DEFINES += -DHAS_SAFARI_MIGRATOR
 endif
-
-include $(topsrcdir)/config/rules.mk
-
--- a/browser/components/places/tests/browser/Makefile.in
+++ b/browser/components/places/tests/browser/Makefile.in
@@ -1,20 +1,12 @@
 # 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/.
 
-DEPTH			= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH			= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
 	head.js \
 	browser_0_library_left_pane_migration.js \
 	browser_library_left_pane_fixnames.js \
 	browser_425884.js \
 	browser_475045.js \
 	browser_423515.js \
 	browser_410196_paste_into_tags.js \
@@ -39,10 +31,8 @@ MOCHITEST_BROWSER_FILES = \
 	frameRight.html \
 	browser_toolbar_migration.js \
 	browser_library_batch_delete.js \
 	browser_555547.js \
 	browser_416459_cut.js \
 	browser_library_downloads.js \
 	browser_library_left_pane_select_hierarchy.js \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/components/places/tests/chrome/Makefile.in
+++ b/browser/components/places/tests/chrome/Makefile.in
@@ -1,26 +1,16 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES = \
 	head.js \
 	test_treeview_date.xul \
 	test_bug485100-change-case-loses-tag.xul \
 	test_bug427633_no_newfolder_if_noip.xul \
 	test_0_multiple_left_pane.xul \
 	test_0_bug510634.xul \
 	test_bug549192.xul \
 	test_bug549491.xul \
 	test_editBookmarkOverlay_tags_liveUpdate.xul \
 	test_bug631374_tags_selector_scroll.xul \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/components/preferences/Makefile.in
+++ b/browser/components/preferences/Makefile.in
@@ -1,20 +1,13 @@
 # -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += \
 	-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
 	-DMOZ_MACBUNDLE_NAME=$(MOZ_MACBUNDLE_NAME) \
 	$(NULL)
 
 ifneq (,$(filter windows gtk2 gtk3 cocoa, $(MOZ_WIDGET_TOOLKIT)))
--- a/browser/components/preferences/in-content/Makefile.in
+++ b/browser/components/preferences/in-content/Makefile.in
@@ -1,19 +1,12 @@
 # -- 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += \
 	-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
 	-DMOZ_MACBUNDLE_NAME=$(MOZ_MACBUNDLE_NAME) \
 	$(NULL)
 
 ifneq (,$(filter windows gtk2 cocoa, $(MOZ_WIDGET_TOOLKIT)))
--- a/browser/components/preferences/in-content/tests/Makefile.in
+++ b/browser/components/preferences/in-content/tests/Makefile.in
@@ -1,20 +1,12 @@
 # -- 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES := \
     head.js \
     browser_advanced_update.js \
     browser_bug410900.js \
     browser_bug731866.js \
     browser_connection.js \
     browser_privacypane_1.js \
     browser_privacypane_3.js \
@@ -31,10 +23,8 @@ pp_mochitest_browser_files_PATH := $(DEP
 PP_TARGETS += pp_mochitest_browser_files
 endif # ENABLE_TESTS
 
 ifdef MOZ_SERVICES_HEALTHREPORT
 MOCHITEST_BROWSER_FILES += \
   browser_healthreport.js \
   $(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/components/preferences/tests/Makefile.in
+++ b/browser/components/preferences/tests/Makefile.in
@@ -1,20 +1,12 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES := \
     head.js \
     browser_advanced_update.js \
     browser_bug410900.js \
     browser_bug705422.js \
     browser_permissions.js \
     browser_chunk_permissions.js \
     browser_privacypane_1.js \
@@ -30,10 +22,8 @@ pp_mochitest_browser_files := \
     $(NULL)
 pp_mochitest_browser_files_PATH := $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
 PP_TARGETS += pp_mochitest_browser_files
 endif # ENABLE_TESTS
 
 ifdef MOZ_SERVICES_HEALTHREPORT
 MOCHITEST_BROWSER_FILES += browser_healthreport.js
 endif
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/components/privatebrowsing/test/browser/Makefile.in
+++ b/browser/components/privatebrowsing/test/browser/Makefile.in
@@ -1,20 +1,12 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES =  \
 		head.js \
                 browser_privatebrowsing_aboutHomeButtonAfterWindowClose.js \
                 browser_privatebrowsing_aboutSessionRestore.js \
                 browser_privatebrowsing_cache.js \
 		browser_privatebrowsing_certexceptionsui.js \
 		browser_privatebrowsing_concurrent.js \
 		browser_privatebrowsing_concurrent_page.html \
@@ -51,10 +43,8 @@ MOCHITEST_BROWSER_FILES =  \
 		browser_privatebrowsing_urlbarfocus.js \
 		browser_privatebrowsing_windowtitle.js \
 		browser_privatebrowsing_windowtitle_page.html \
 		browser_privatebrowsing_zoom.js \
 		browser_privatebrowsing_zoomrestore.js \
 		popup.html \
 		title.sjs \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/components/safebrowsing/content/test/Makefile.in
+++ b/browser/components/safebrowsing/content/test/Makefile.in
@@ -1,27 +1,17 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES := \
   head.js \
   browser_bug400731.js \
   $(NULL)
 
 # The browser chrome test for bug 415846 doesn't run on Mac because of its
 # bizarre special-and-unique snowflake of a help menu.
 ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 MOCHITEST_BROWSER_FILES += \
   browser_bug415846.js \
   $(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/components/search/test/Makefile.in
+++ b/browser/components/search/test/Makefile.in
@@ -1,20 +1,12 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
   head.js \
   browser_405664.js \
   browser_addEngine.js \
   browser_contextmenu.js \
   browser_healthreport.js \
   browser_private_search_perwindowpb.js \
   testEngine.xml \
@@ -31,10 +23,8 @@ MOCHITEST_BROWSER_FILES = \
 ifdef ENABLE_TESTS
 pp_mochitest_browser_files := \
   browser_google.js \
   $(NULL)
 pp_mochitest_browser_files_PATH := $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
 pp_mochitest_browser_files_FLAGS := -DMOZ_DISTRIBUTION_ID=$(MOZ_DISTRIBUTION_ID)
 PP_TARGETS += pp_mochitest_browser_files
 endif # ENABLE_TESTS
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/components/sessionstore/test/Makefile.in
+++ b/browser/components/sessionstore/test/Makefile.in
@@ -1,20 +1,12 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # browser_506482.js is disabled because of frequent failures (bug 538672)
 # browser_526613.js is disabled because of frequent failures (bug 534489)
 # browser_589246.js is disabled for leaking browser windows (bug 752467)
 # browser_580512.js is disabled for leaking browser windows (bug 752467)
 
 MOCHITEST_BROWSER_FILES = \
 	head.js \
 	browser_attributes.js \
@@ -164,10 +156,8 @@ else
 endif
 
 ifneq ($(OS_ARCH),Darwin)
 MOCHITEST_BROWSER_FILES += \
 	browser_597071.js \
 	browser_625016.js \
 	$(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/components/shell/src/Makefile.in
+++ b/browser/components/shell/src/Makefile.in
@@ -1,20 +1,13 @@
 #
 # 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/.
 
-DEPTH   = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DMOZ_APP_NAME=\"$(MOZ_APP_NAME)\" \
   -DMOZ_APP_VERSION=\"$(MOZ_APP_VERSION)\"
--- a/browser/components/shell/test/Makefile.in
+++ b/browser/components/shell/test/Makefile.in
@@ -1,18 +1,8 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
     browser_420786.js \
     browser_633221.js \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/components/tabview/Makefile.in
+++ b/browser/components/tabview/Makefile.in
@@ -1,16 +1,9 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(NSINSTALL) $(srcdir)/modules/* $(FINAL_TARGET)/modules/tabview
--- a/browser/components/tabview/test/Makefile.in
+++ b/browser/components/tabview/test/Makefile.in
@@ -1,20 +1,12 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES := \
                  browser_tabview_alltabs.js \
                  browser_tabview_apptabs.js \
                  browser_tabview_bug580412.js \
                  browser_tabview_bug586553.js \
                  browser_tabview_bug587043.js \
                  browser_tabview_bug587231.js \
                  browser_tabview_bug587276.js \
@@ -162,10 +154,8 @@ MOCHITEST_BROWSER_FILES := \
 # browser_tabview_bug597980.js is disabled for leaking, see bug 711907
 # browser_tabview_bug678374.js disabled for intermittent failures (bug 795265)
 # browser_tabview_bug602432.js disabled for intermittent failures (bug 704417)
 # browser_tabview_bug610242.js disabled for intermittent failures (bug 736036)
 # browser_tabview_bug648882.js disabled for intermittent failures (bug 752862)
 # browser_tabview_bug654941.js disabled for intermittent failures (bug 754222)
 # browser_tabview_bug673729.js disabled for intermittent failures (bug 749980)
 # browser_tabview_bug696602.js disabled for intermittent failures (bug 736425)
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/components/test/Makefile.in
+++ b/browser/components/test/Makefile.in
@@ -1,17 +1,7 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
   browser_bug538331.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/devtools/Makefile.in
+++ b/browser/devtools/Makefile.in
@@ -1,13 +1,8 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(NSINSTALL) $(srcdir)/main.js $(FINAL_TARGET)/modules/devtools
--- a/browser/devtools/app-manager/Makefile.in
+++ b/browser/devtools/app-manager/Makefile.in
@@ -1,16 +1,9 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(NSINSTALL) $(srcdir)/*.js $(FINAL_TARGET)/modules/devtools/app-manager
--- a/browser/devtools/app-manager/test/Makefile.in
+++ b/browser/devtools/app-manager/test/Makefile.in
@@ -1,21 +1,11 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES = \
 		test_template.html \
 		test_connection_store.html \
 		test_device_store.html \
 		test_projects_store.html \
 		hosted_app.manifest \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/devtools/commandline/Makefile.in
+++ b/browser/devtools/commandline/Makefile.in
@@ -1,16 +1,9 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(NSINSTALL) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools
--- a/browser/devtools/commandline/test/Makefile.in
+++ b/browser/devtools/commandline/test/Makefile.in
@@ -1,21 +1,13 @@
 #
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
   browser_cmd_addon.js \
   $(browser_cmd_calllog.js disabled until bug 845831 is fixed) \
   $(browser_cmd_calllog_chrome.js disabled until bug 845831 is fixed) \
   browser_cmd_appcache_invalid.js \
   browser_cmd_appcache_invalid_appcache.appcache \
   browser_cmd_appcache_invalid_appcache.appcache^headers^ \
   browser_cmd_appcache_invalid_index.html \
@@ -71,10 +63,8 @@ MOCHITEST_BROWSER_FILES = \
   browser_gcli_tokenize.js \
   browser_gcli_tooltip.js \
   browser_gcli_types.js \
   browser_gcli_util.js \
   head.js \
   helpers.js \
   mockCommands.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/devtools/debugger/Makefile.in
+++ b/browser/devtools/debugger/Makefile.in
@@ -1,15 +1,8 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(NSINSTALL) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools
--- a/browser/devtools/debugger/test/Makefile.in
+++ b/browser/devtools/debugger/test/Makefile.in
@@ -1,20 +1,12 @@
 # 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/.
 
-DEPTH           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_TESTS = \
 	browser_dbg_aaa_run_first_leaktest.js \
 	browser_dbg_blackboxing-01.js \
 	browser_dbg_blackboxing-02.js \
 	browser_dbg_blackboxing-03.js \
 	browser_dbg_blackboxing-04.js \
 	browser_dbg_blackboxing-05.js \
 	browser_dbg_blackboxing-06.js \
@@ -185,10 +177,8 @@ endif
 #   Disable browser_dbg_break-on-dom-event.js due to frequent failures
 ifneq (Darwin,$(OS_ARCH))
 MOCHITEST_BROWSER_TESTS += \
 	browser_dbg_break-on-dom-event.js \
 	$(NULL)
 endif
 
 MOCHITEST_BROWSER_FILES_PARTS = MOCHITEST_BROWSER_TESTS MOCHITEST_BROWSER_PAGES
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/devtools/fontinspector/test/Makefile.in
+++ b/browser/devtools/fontinspector/test/Makefile.in
@@ -1,19 +1,9 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES := \
 		browser_fontinspector.js \
 		browser_fontinspector.html \
 		browser_font.woff \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/devtools/framework/Makefile.in
+++ b/browser/devtools/framework/Makefile.in
@@ -1,16 +1,9 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(NSINSTALL) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools
 	$(NSINSTALL) $(srcdir)/*.js $(FINAL_TARGET)/modules/devtools/framework
--- a/browser/devtools/framework/test/Makefile.in
+++ b/browser/devtools/framework/test/Makefile.in
@@ -1,20 +1,12 @@
 # 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/.
 
-DEPTH			= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH			= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
 		head.js \
 		browser_devtools_api.js \
 		browser_new_activation_workflow.js \
 		browser_toolbox_dynamic_registration.js \
 		browser_toolbox_hosts.js \
 		browser_toolbox_ready.js \
 		browser_toolbox_select_event.js \
@@ -27,10 +19,8 @@ MOCHITEST_BROWSER_FILES = \
 		browser_toolbox_options.js \
 		browser_toolbox_options_disablejs.js \
 		browser_toolbox_options_disablejs.html \
 		browser_toolbox_options_disablejs_iframe.html \
 		browser_toolbox_highlight.js \
 		browser_toolbox_raise.js \
 		browser_keybindings.js \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/devtools/inspector/Makefile.in
+++ b/browser/devtools/inspector/Makefile.in
@@ -1,16 +1,9 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(NSINSTALL) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools/
 	$(NSINSTALL) $(srcdir)/*.js $(FINAL_TARGET)/modules/devtools/inspector
--- a/browser/devtools/inspector/test/Makefile.in
+++ b/browser/devtools/inspector/test/Makefile.in
@@ -1,20 +1,12 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # Disabled for too many intermittent failures (bug 851349)
 #		browser_inspector_bug_831693_searchbox_panel_navigation.js \
 
 MOCHITEST_BROWSER_FILES := \
 		browser_inspector_iframeTest.js \
 		browser_inspector_initialization.js \
 		browser_inspector_highlighter.js \
 		browser_inspector_scrolling.js \
@@ -43,10 +35,8 @@ MOCHITEST_BROWSER_FILES := \
 		browser_inspector_bug_831693_input_suggestion.js \
 		browser_inspector_bug_831693_combinator_suggestions.js \
 		browser_inspector_bug_831693_search_suggestions.html \
 		browser_inspector_bug_835722_infobar_reappears.js \
 		browser_inspector_bug_840156_destroy_after_navigation.js \
 		browser_inspector_reload.js \
 		head.js \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/devtools/layoutview/test/Makefile.in
+++ b/browser/devtools/layoutview/test/Makefile.in
@@ -1,17 +1,7 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES := \
 		browser_layoutview.js \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/devtools/markupview/Makefile.in
+++ b/browser/devtools/markupview/Makefile.in
@@ -1,16 +1,7 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 libs::
 	$(NSINSTALL) $(srcdir)/*.js $(FINAL_TARGET)/modules/devtools/markupview
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/devtools/markupview/test/Makefile.in
+++ b/browser/devtools/markupview/test/Makefile.in
@@ -1,26 +1,16 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES := \
 		browser_inspector_markup_navigation.html \
 		browser_inspector_markup_navigation.js \
 		browser_inspector_markup_mutation.html \
 		browser_inspector_markup_mutation.js \
 		browser_inspector_markup_edit.html \
     browser_inspector_markup_edit.js \
     browser_inspector_markup_subset.html \
     browser_inspector_markup_subset.js \
     browser_bug896181_css_mixed_completion_new_attribute.js \
 		head.js \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/devtools/netmonitor/test/Makefile.in
+++ b/browser/devtools/netmonitor/test/Makefile.in
@@ -1,20 +1,12 @@
 # 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/.
 
-DEPTH           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_TESTS = \
 	browser_net_aaa_leaktest.js \
 	browser_net_autoscroll.js \
 	browser_net_simple-init.js \
 	browser_net_page-nav.js \
 	browser_net_prefs-and-l10n.js \
 	browser_net_prefs-reload.js \
 	browser_net_pane-collapse.js \
@@ -67,10 +59,8 @@ MOCHITEST_BROWSER_PAGES = \
 	html_custom-get-page.html \
 	sjs_simple-test-server.sjs \
 	sjs_content-type-test-server.sjs \
 	sjs_status-codes-test-server.sjs \
 	sjs_sorting-test-server.sjs \
 	$(NULL)
 
 MOCHITEST_BROWSER_FILES_PARTS = MOCHITEST_BROWSER_TESTS MOCHITEST_BROWSER_PAGES
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/devtools/profiler/Makefile.in
+++ b/browser/devtools/profiler/Makefile.in
@@ -1,15 +1,8 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(NSINSTALL) $(srcdir)/*.js $(FINAL_TARGET)/modules/devtools/profiler
--- a/browser/devtools/profiler/test/Makefile.in
+++ b/browser/devtools/profiler/test/Makefile.in
@@ -1,20 +1,12 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_TESTS = \
 		browser_profiler_remote.js \
 		browser_profiler_bug_834878_source_buttons.js \
 		browser_profiler_cmd.js \
 		browser_profiler_run.js \
 		browser_profiler_controller.js \
 		browser_profiler_bug_855244_multiple_tabs.js \
 		browser_profiler_console_api.js \
@@ -29,10 +21,8 @@ MOCHITEST_BROWSER_TESTS = \
 
 MOCHITEST_BROWSER_PAGES = \
 		mock_profiler_bug_834878_page.html \
 		mock_profiler_bug_834878_script.js \
 		mock_console_api.html \
 		$(NULL)
 
 MOCHITEST_BROWSER_FILES_PARTS = MOCHITEST_BROWSER_TESTS MOCHITEST_BROWSER_PAGES
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/devtools/responsivedesign/Makefile.in
+++ b/browser/devtools/responsivedesign/Makefile.in
@@ -1,15 +1,8 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(NSINSTALL) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools
--- a/browser/devtools/responsivedesign/test/Makefile.in
+++ b/browser/devtools/responsivedesign/test/Makefile.in
@@ -1,24 +1,14 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES := \
 		browser_responsiveui.js \
 		browser_responsiveuiaddcustompreset.js \
 		browser_responsiveruleview.js \
 		browser_responsive_cmd.js \
 		browser_responsivecomputedview.js \
 		browser_responsiveui_touch.js \
 		touch.html \
 		head.js \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/devtools/scratchpad/Makefile.in
+++ b/browser/devtools/scratchpad/Makefile.in
@@ -1,16 +1,9 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(NSINSTALL) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools
--- a/browser/devtools/scratchpad/test/Makefile.in
+++ b/browser/devtools/scratchpad/test/Makefile.in
@@ -1,20 +1,12 @@
 # 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/.
 
-DEPTH			= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH			= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
 		browser_scratchpad_initialization.js \
 		browser_scratchpad_contexts.js \
 		browser_scratchpad_tab_switch.js \
 		browser_scratchpad_execute_print.js \
 		browser_scratchpad_inspect.js \
 		browser_scratchpad_files.js \
 		browser_scratchpad_ui.js \
@@ -38,10 +30,8 @@ MOCHITEST_BROWSER_FILES = \
 		browser_scratchpad_bug_644413_modeline.js \
 		browser_scratchpad_bug807924_cannot_convert_to_string.js \
 		browser_scratchpad_long_string.js \
 		browser_scratchpad_open_error_console.js \
 		head.js \
 
 # Disable test due to bug 807234 becoming basically permanent
 #		browser_scratchpad_bug_653427_confirm_close.js \
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/devtools/shared/Makefile.in
+++ b/browser/devtools/shared/Makefile.in
@@ -1,18 +1,11 @@
 #
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(NSINSTALL) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools
 	$(NSINSTALL) $(srcdir)/widgets/*.jsm $(FINAL_TARGET)/modules/devtools
 	$(NSINSTALL) $(srcdir)/*.js $(FINAL_TARGET)/modules/devtools/shared
--- a/browser/devtools/shared/test/Makefile.in
+++ b/browser/devtools/shared/test/Makefile.in
@@ -1,21 +1,13 @@
 #
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
 		browser_eventemitter_basic.js \
 		browser_observableobject.js \
 		browser_layoutHelpers.js \
 		browser_require_basic.js \
 		browser_telemetry_buttonsandsidebar.js \
 		browser_telemetry_toolboxtabs_inspector.js \
 		browser_telemetry_toolboxtabs_jsdebugger.js \
@@ -34,10 +26,8 @@ MOCHITEST_BROWSER_FILES = \
 
 MOCHITEST_BROWSER_FILES += \
 		browser_templater_basic.html \
 		browser_toolbar_basic.html \
 		browser_toolbar_webconsole_errors_count.html \
 		browser_layoutHelpers.html \
 		browser_layoutHelpers_iframe.html \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/devtools/sourceeditor/test/Makefile.in
+++ b/browser/devtools/sourceeditor/test/Makefile.in
@@ -1,20 +1,12 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
 		browser_sourceeditor_initialization.js \
 		browser_bug684862_paste_html.js \
 		browser_bug687573_vscroll.js \
 		browser_bug687568_pagescroll.js \
 		browser_bug687580_drag_and_drop.js \
 		browser_bug684546_reset_undo.js \
 		browser_bug695035_middle_click_paste.js \
@@ -28,10 +20,8 @@ MOCHITEST_BROWSER_FILES = \
 		browser_bug700893_dirty_state.js \
 		browser_bug729480_line_vertical_align.js \
 		browser_bug725430_comment_uncomment.js \
 		browser_bug731721_debugger_stepping.js \
 		browser_bug729960_block_bracket_jump.js \
 		browser_bug744021_next_prev_bracket_jump.js \
 		browser_bug725392_mouse_coords_char_offset.js \
 		head.js \
-