| author | Mike Hommey <mh+mozilla@glandium.org> |
| Thu, 05 Sep 2013 09:01:46 +0900 | |
| changeset 145609 | 45097bc3a57898f22a4f3b74f8f8cf7511f5d0a4 |
| parent 145608 | 92ee006ec0a59d93557d8197ad020ed226faa65d |
| child 145610 | d9ad02ac2fcb9371aa177112c50d9058ca4cee79 |
| push id | 25216 |
| push user | emorley@mozilla.com |
| push date | Thu, 05 Sep 2013 10:06:42 +0000 |
| treeherder | mozilla-central@676322e0166c [default view] [failures only] |
| perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
| reviewers | gps |
| bugs | 912293 |
| milestone | 26.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
|
--- 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