diff --git a/Makefile.in b/Makefile.in index ef1cf067cf7..a79189bc921 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3,11 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - ifndef .PYMAKE ifeq (,$(MAKE_VERSION)) $(error GNU Make is required) @@ -19,8 +14,6 @@ endif export TOPLEVEL_BUILD := 1 -include $(DEPTH)/config/autoconf.mk - default:: ifdef COMPILE_ENVIRONMENT diff --git a/accessible/public/ia2/Makefile.in b/accessible/public/ia2/Makefile.in index 35fd596d697..94c1dc18016 100644 --- a/accessible/public/ia2/Makefile.in +++ b/accessible/public/ia2/Makefile.in @@ -2,17 +2,10 @@ # License, v. 2.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) @@ -97,4 +90,3 @@ midl_done : $(addprefix $(IA2DIR)/,$(MIDL_INTERFACES) $(MIDL_ENUMS)) # This marshall dll is also registered in the installer register:: regsvr32 -s $(DIST)/bin/$(SHARED_LIBRARY) - diff --git a/accessible/public/msaa/Makefile.in b/accessible/public/msaa/Makefile.in index a72b5c89d80..e2ca272f32d 100644 --- a/accessible/public/msaa/Makefile.in +++ b/accessible/public/msaa/Makefile.in @@ -2,15 +2,8 @@ # License, v. 2.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 @@ -73,6 +66,3 @@ INSTALL_TARGETS += midl_exports midl_exports_FILES := $(midl_exports) midl_exports_DEST = $(DIST)/include midl_exports_TARGET := export - -include $(topsrcdir)/config/rules.mk - diff --git a/accessible/src/Makefile.in b/accessible/src/Makefile.in index aafeb3b09c8..703581f91dd 100644 --- a/accessible/src/Makefile.in +++ b/accessible/src/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - A11Y_LOG = 0 ifdef MOZ_DEBUG A11Y_LOG = 1 @@ -17,5 +10,3 @@ ifeq (,$(filter aurora beta release esr,$(MOZ_UPDATE_CHANNEL))) A11Y_LOG = 1 endif export A11Y_LOG - -include $(topsrcdir)/config/rules.mk diff --git a/accessible/src/atk/Makefile.in b/accessible/src/atk/Makefile.in index ba159961034..1d54a8bb13d 100644 --- a/accessible/src/atk/Makefile.in +++ b/accessible/src/atk/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = .. include $(topsrcdir)/config/rules.mk diff --git a/accessible/src/base/Makefile.in b/accessible/src/base/Makefile.in index d5ccede940d..e5096734a02 100644 --- a/accessible/src/base/Makefile.in +++ b/accessible/src/base/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += \ diff --git a/accessible/src/generic/Makefile.in b/accessible/src/generic/Makefile.in index e62fab2c6e0..05826eeb54b 100644 --- a/accessible/src/generic/Makefile.in +++ b/accessible/src/generic/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/accessible/src/html/Makefile.in b/accessible/src/html/Makefile.in index 6b8c0b88228..6d9c9710417 100644 --- a/accessible/src/html/Makefile.in +++ b/accessible/src/html/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/accessible/src/jsat/Makefile.in b/accessible/src/jsat/Makefile.in index 949f5cdc9e8..a26c4544f74 100644 --- a/accessible/src/jsat/Makefile.in +++ b/accessible/src/jsat/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - INSTALL_TARGETS += ACCESSFU ACCESSFU_FILES := \ @@ -24,6 +17,3 @@ ACCESSFU_FILES := \ $(NULL) ACCESSFU_DEST = $(FINAL_TARGET)/modules/accessibility - -include $(topsrcdir)/config/rules.mk - diff --git a/accessible/src/mac/Makefile.in b/accessible/src/mac/Makefile.in index 2b98846b023..ab692768638 100644 --- a/accessible/src/mac/Makefile.in +++ b/accessible/src/mac/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = .. include $(topsrcdir)/config/rules.mk diff --git a/accessible/src/other/Makefile.in b/accessible/src/other/Makefile.in index 5e146623d44..9a25fe59dd2 100644 --- a/accessible/src/other/Makefile.in +++ b/accessible/src/other/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = .. include $(topsrcdir)/config/rules.mk diff --git a/accessible/src/windows/Makefile.in b/accessible/src/windows/Makefile.in index a8ebd6c5e63..4f93f0f32fa 100644 --- a/accessible/src/windows/Makefile.in +++ b/accessible/src/windows/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk ifneq ($(A11Y_LOG),0) diff --git a/accessible/src/windows/ia2/Makefile.in b/accessible/src/windows/ia2/Makefile.in index 2eae05159b1..070a6f1ec4b 100644 --- a/accessible/src/windows/ia2/Makefile.in +++ b/accessible/src/windows/ia2/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 diff --git a/accessible/src/windows/msaa/Makefile.in b/accessible/src/windows/msaa/Makefile.in index a805a8e256c..a305425edd2 100644 --- a/accessible/src/windows/msaa/Makefile.in +++ b/accessible/src/windows/msaa/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 diff --git a/accessible/src/windows/sdn/Makefile.in b/accessible/src/windows/sdn/Makefile.in index 0c6595e9e82..0787e5c2e5c 100644 --- a/accessible/src/windows/sdn/Makefile.in +++ b/accessible/src/windows/sdn/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 diff --git a/accessible/src/windows/uia/Makefile.in b/accessible/src/windows/uia/Makefile.in index bd00a15d811..563639ea199 100644 --- a/accessible/src/windows/uia/Makefile.in +++ b/accessible/src/windows/uia/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 diff --git a/accessible/src/xpcom/Makefile.in b/accessible/src/xpcom/Makefile.in index d8e5659645c..3589d42b435 100644 --- a/accessible/src/xpcom/Makefile.in +++ b/accessible/src/xpcom/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXTRA_MDDEPEND_FILES = xpcAccEvents.pp INSTALL_TARGETS += xpcaccevents diff --git a/accessible/src/xul/Makefile.in b/accessible/src/xul/Makefile.in index a57c3f46982..9f8efdf647a 100644 --- a/accessible/src/xul/Makefile.in +++ b/accessible/src/xul/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/accessible/tests/mochitest/Makefile.in b/accessible/tests/mochitest/Makefile.in index 6704ac29e5d..54ba129e39b 100644 --- a/accessible/tests/mochitest/Makefile.in +++ b/accessible/tests/mochitest/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_A11Y_FILES =\ dumbfile.xpi \ formimage.png \ @@ -47,5 +39,3 @@ MOCHITEST_A11Y_FILES =\ treeview.css \ treeview.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/accessible/tests/mochitest/actions/Makefile.in b/accessible/tests/mochitest/actions/Makefile.in index ca85b70a02b..5240ab5fa9e 100644 --- a/accessible/tests/mochitest/actions/Makefile.in +++ b/accessible/tests/mochitest/actions/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -25,5 +17,3 @@ MOCHITEST_A11Y_FILES =\ test_tree.xul \ test_treegrid.xul \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/accessible/tests/mochitest/attributes/Makefile.in b/accessible/tests/mochitest/attributes/Makefile.in index 0c6f1401ac8..f450676ce99 100644 --- a/accessible/tests/mochitest/attributes/Makefile.in +++ b/accessible/tests/mochitest/attributes/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -21,5 +13,3 @@ MOCHITEST_A11Y_FILES =\ test_tag.html \ test_xml-roles.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/accessible/tests/mochitest/bounds/Makefile.in b/accessible/tests/mochitest/bounds/Makefile.in index 92435dac326..db34768b1fc 100644 --- a/accessible/tests/mochitest/bounds/Makefile.in +++ b/accessible/tests/mochitest/bounds/Makefile.in @@ -3,19 +3,9 @@ # License, v. 2.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 diff --git a/accessible/tests/mochitest/editabletext/Makefile.in b/accessible/tests/mochitest/editabletext/Makefile.in index e0a5a6a1ce5..55c335ce8fe 100644 --- a/accessible/tests/mochitest/editabletext/Makefile.in +++ b/accessible/tests/mochitest/editabletext/Makefile.in @@ -3,18 +3,8 @@ # License, v. 2.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 diff --git a/accessible/tests/mochitest/elm/Makefile.in b/accessible/tests/mochitest/elm/Makefile.in index c5719b63ef8..3b2723f14f3 100644 --- a/accessible/tests/mochitest/elm/Makefile.in +++ b/accessible/tests/mochitest/elm/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -18,5 +10,3 @@ MOCHITEST_A11Y_FILES =\ test_nsApplicationAcc.html \ test_plugin.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/accessible/tests/mochitest/events/Makefile.in b/accessible/tests/mochitest/events/Makefile.in index ae11d2e1217..ad5f048efaa 100644 --- a/accessible/tests/mochitest/events/Makefile.in +++ b/accessible/tests/mochitest/events/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_A11Y_FILES =\ docload_wnd.html \ focus.html \ @@ -67,5 +59,3 @@ MOCHITEST_A11Y_FILES += \ test_focus_autocomplete.xul \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk diff --git a/accessible/tests/mochitest/focus/Makefile.in b/accessible/tests/mochitest/focus/Makefile.in index 05d58b31e00..1e40aa01458 100644 --- a/accessible/tests/mochitest/focus/Makefile.in +++ b/accessible/tests/mochitest/focus/Makefile.in @@ -3,18 +3,8 @@ # License, v. 2.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 diff --git a/accessible/tests/mochitest/hittest/Makefile.in b/accessible/tests/mochitest/hittest/Makefile.in index 39311aca7bb..59c82b6cfed 100644 --- a/accessible/tests/mochitest/hittest/Makefile.in +++ b/accessible/tests/mochitest/hittest/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -20,5 +12,3 @@ MOCHITEST_A11Y_FILES = \ test_zoom.html \ zoom_tree.xul \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/accessible/tests/mochitest/hyperlink/Makefile.in b/accessible/tests/mochitest/hyperlink/Makefile.in index ff3b673a17f..17c3d19c400 100644 --- a/accessible/tests/mochitest/hyperlink/Makefile.in +++ b/accessible/tests/mochitest/hyperlink/Makefile.in @@ -3,18 +3,8 @@ # License, v. 2.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 diff --git a/accessible/tests/mochitest/hypertext/Makefile.in b/accessible/tests/mochitest/hypertext/Makefile.in index dcc5f8541f3..82187e5af16 100644 --- a/accessible/tests/mochitest/hypertext/Makefile.in +++ b/accessible/tests/mochitest/hypertext/Makefile.in @@ -3,17 +3,7 @@ # License, v. 2.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 diff --git a/accessible/tests/mochitest/jsat/Makefile.in b/accessible/tests/mochitest/jsat/Makefile.in index 0fb627a9b62..c3110f92b08 100644 --- a/accessible/tests/mochitest/jsat/Makefile.in +++ b/accessible/tests/mochitest/jsat/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_A11Y_FILES =\ jsatcommon.js \ output.js \ @@ -22,5 +14,3 @@ test_live_regions.html \ test_tables.html \ test_utterance_order.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/accessible/tests/mochitest/name/Makefile.in b/accessible/tests/mochitest/name/Makefile.in index 28585e9098f..55866bdd677 100644 --- a/accessible/tests/mochitest/name/Makefile.in +++ b/accessible/tests/mochitest/name/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_A11Y_FILES =\ general.css \ general.xbl \ @@ -29,5 +21,3 @@ MOCHITEST_A11Y_FILES =\ ifneq ($(OS_ARCH), Darwin) MOCHITEST_A11Y_FILES += test_tree.xul endif - -include $(topsrcdir)/config/rules.mk diff --git a/accessible/tests/mochitest/pivot/Makefile.in b/accessible/tests/mochitest/pivot/Makefile.in index db4516d4b50..304372fb221 100644 --- a/accessible/tests/mochitest/pivot/Makefile.in +++ b/accessible/tests/mochitest/pivot/Makefile.in @@ -3,19 +3,9 @@ # License, v. 2.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 diff --git a/accessible/tests/mochitest/relations/Makefile.in b/accessible/tests/mochitest/relations/Makefile.in index 41b4d0f4216..10702007dd8 100644 --- a/accessible/tests/mochitest/relations/Makefile.in +++ b/accessible/tests/mochitest/relations/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -21,5 +13,3 @@ MOCHITEST_A11Y_FILES =\ test_ui_modalprompt.html \ test_update.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/accessible/tests/mochitest/role/Makefile.in b/accessible/tests/mochitest/role/Makefile.in index 9085d321dd1..dca7f5e61de 100644 --- a/accessible/tests/mochitest/role/Makefile.in +++ b/accessible/tests/mochitest/role/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -17,5 +9,3 @@ MOCHITEST_A11Y_FILES =\ test_general.xul \ test_svg.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/accessible/tests/mochitest/scroll/Makefile.in b/accessible/tests/mochitest/scroll/Makefile.in index 2f0dfbfbb99..0316fc005c3 100644 --- a/accessible/tests/mochitest/scroll/Makefile.in +++ b/accessible/tests/mochitest/scroll/Makefile.in @@ -3,17 +3,7 @@ # License, v. 2.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 diff --git a/accessible/tests/mochitest/selectable/Makefile.in b/accessible/tests/mochitest/selectable/Makefile.in index 1e94e953585..f24b5721bcc 100644 --- a/accessible/tests/mochitest/selectable/Makefile.in +++ b/accessible/tests/mochitest/selectable/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -19,5 +11,3 @@ MOCHITEST_A11Y_FILES =\ test_select.html \ test_tree.xul \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/accessible/tests/mochitest/states/Makefile.in b/accessible/tests/mochitest/states/Makefile.in index 54034cf471f..b4dbe4a6c08 100644 --- a/accessible/tests/mochitest/states/Makefile.in +++ b/accessible/tests/mochitest/states/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -44,5 +36,3 @@ MOCHITEST_A11Y_FILES =\ ifneq ($(OS_ARCH), Darwin) MOCHITEST_A11Y_FILES += test_tree.xul endif - -include $(topsrcdir)/config/rules.mk diff --git a/accessible/tests/mochitest/table/Makefile.in b/accessible/tests/mochitest/table/Makefile.in index 19d30460bbb..961a6222a4a 100644 --- a/accessible/tests/mochitest/table/Makefile.in +++ b/accessible/tests/mochitest/table/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -33,5 +25,3 @@ MOCHITEST_A11Y_FILES = \ test_table_1.html \ test_table_2.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/accessible/tests/mochitest/text/Makefile.in b/accessible/tests/mochitest/text/Makefile.in index 3c075fff55a..511f69ec978 100644 --- a/accessible/tests/mochitest/text/Makefile.in +++ b/accessible/tests/mochitest/text/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_A11Y_FILES = \ doc.html \ test_atcaretoffset.html \ @@ -25,5 +17,3 @@ MOCHITEST_A11Y_FILES = \ test_wordboundary.html \ test_words.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/accessible/tests/mochitest/textattrs/Makefile.in b/accessible/tests/mochitest/textattrs/Makefile.in index e489aa99ca2..6943ad7d113 100644 --- a/accessible/tests/mochitest/textattrs/Makefile.in +++ b/accessible/tests/mochitest/textattrs/Makefile.in @@ -3,17 +3,7 @@ # License, v. 2.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 diff --git a/accessible/tests/mochitest/textcaret/Makefile.in b/accessible/tests/mochitest/textcaret/Makefile.in index cda7967eac9..818bdeb1faa 100644 --- a/accessible/tests/mochitest/textcaret/Makefile.in +++ b/accessible/tests/mochitest/textcaret/Makefile.in @@ -3,17 +3,7 @@ # License, v. 2.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 diff --git a/accessible/tests/mochitest/textselection/Makefile.in b/accessible/tests/mochitest/textselection/Makefile.in index 364abca00b3..0ab5fc66715 100644 --- a/accessible/tests/mochitest/textselection/Makefile.in +++ b/accessible/tests/mochitest/textselection/Makefile.in @@ -3,17 +3,7 @@ # License, v. 2.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 diff --git a/accessible/tests/mochitest/tree/Makefile.in b/accessible/tests/mochitest/tree/Makefile.in index 900615a966d..978248dc71a 100644 --- a/accessible/tests/mochitest/tree/Makefile.in +++ b/accessible/tests/mochitest/tree/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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) \ @@ -49,5 +41,3 @@ MOCHITEST_A11Y_FILES =\ test_txtctrl.xul \ wnd.xul \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/accessible/tests/mochitest/treeupdate/Makefile.in b/accessible/tests/mochitest/treeupdate/Makefile.in index ca92d640d18..daa605cf50f 100644 --- a/accessible/tests/mochitest/treeupdate/Makefile.in +++ b/accessible/tests/mochitest/treeupdate/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -35,5 +27,3 @@ MOCHITEST_A11Y_FILES =\ test_visibility.html \ test_whitespace.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/accessible/tests/mochitest/value/Makefile.in b/accessible/tests/mochitest/value/Makefile.in index e081e6270ed..d527ab7a648 100644 --- a/accessible/tests/mochitest/value/Makefile.in +++ b/accessible/tests/mochitest/value/Makefile.in @@ -3,19 +3,9 @@ # License, v. 2.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 diff --git a/addon-sdk/Makefile.in b/addon-sdk/Makefile.in index 5c934aa91ec..69b25924144 100644 --- a/addon-sdk/Makefile.in +++ b/addon-sdk/Makefile.in @@ -2,11 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - include $(topsrcdir)/config/config.mk export PYMAKE = $(.PYMAKE) diff --git a/b2g/Makefile.in b/b2g/Makefile.in index b24bd5b732a..9b3e1e08ad9 100644 --- a/b2g/Makefile.in +++ b/b2g/Makefile.in @@ -2,12 +2,5 @@ # License, v. 2.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 diff --git a/b2g/app/Makefile.in b/b2g/app/Makefile.in index 7fe9ef55e22..fe1367ac813 100644 --- a/b2g/app/Makefile.in +++ b/b2g/app/Makefile.in @@ -2,12 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk USE_RCS_MK := 1 include $(topsrcdir)/config/makefiles/rcs.mk diff --git a/b2g/branding/official/locales/Makefile.in b/b2g/branding/official/locales/Makefile.in index 2839d474fe5..82f614ecea2 100644 --- a/b2g/branding/official/locales/Makefile.in +++ b/b2g/branding/official/locales/Makefile.in @@ -2,14 +2,4 @@ # License, v. 2.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 diff --git a/b2g/branding/unofficial/locales/Makefile.in b/b2g/branding/unofficial/locales/Makefile.in index 2839d474fe5..82f614ecea2 100644 --- a/b2g/branding/unofficial/locales/Makefile.in +++ b/b2g/branding/unofficial/locales/Makefile.in @@ -2,14 +2,4 @@ # License, v. 2.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 diff --git a/b2g/chrome/Makefile.in b/b2g/chrome/Makefile.in index d816fe52e22..382dc360ce9 100644 --- a/b2g/chrome/Makefile.in +++ b/b2g/chrome/Makefile.in @@ -2,16 +2,7 @@ # License, v. 2.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 diff --git a/b2g/gaia/Makefile.in b/b2g/gaia/Makefile.in index e4c11fbb745..aaa960e0c2f 100644 --- a/b2g/gaia/Makefile.in +++ b/b2g/gaia/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - GAIA_PATH := gaia/profile ifeq ($(OS_ARCH),WINNT) @@ -37,4 +30,3 @@ 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 -) - diff --git a/b2g/installer/Makefile.in b/b2g/installer/Makefile.in index ff49d58d670..ef39fb37953 100644 --- a/b2g/installer/Makefile.in +++ b/b2g/installer/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - STANDALONE_MAKEFILE := 1 include $(topsrcdir)/config/rules.mk diff --git a/b2g/locales/Makefile.in b/b2g/locales/Makefile.in index eab29a27bf0..8366e4340bd 100644 --- a/b2g/locales/Makefile.in +++ b/b2g/locales/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/config.mk SUBMAKEFILES += \ diff --git a/browser/Makefile.in b/browser/Makefile.in index 29a5f99c2ef..8b7dc07b28d 100644 --- a/browser/Makefile.in +++ b/browser/Makefile.in @@ -2,11 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - include $(topsrcdir)/config/rules.mk ifdef MAKENSISU diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in index c4a5de582de..0567dc0e53f 100644 --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - dist_dest = $(DIST)/$(MOZ_MACBUNDLE_NAME) ifdef ENABLE_MARIONETTE diff --git a/browser/app/profile/extensions/Makefile.in b/browser/app/profile/extensions/Makefile.in index c9583004536..29242a2c61a 100644 --- a/browser/app/profile/extensions/Makefile.in +++ b/browser/app/profile/extensions/Makefile.in @@ -3,14 +3,8 @@ # License, v. 2.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))) diff --git a/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in b/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in index 7f008556056..ff9319df951 100644 --- a/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in +++ b/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in @@ -3,17 +3,8 @@ # License, v. 2.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 diff --git a/browser/base/Makefile.in b/browser/base/Makefile.in index 285ef15f0f1..7473a765cc7 100644 --- a/browser/base/Makefile.in +++ b/browser/base/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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)) diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in index 594e111e9fb..d517d124a57 100644 --- a/browser/base/content/test/Makefile.in +++ b/browser/base/content/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ head_plain.js \ bug364677-data.xml \ @@ -381,5 +373,3 @@ MOCHITEST_BROWSER_FILES += \ browser_CTP_context_menu.js \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk diff --git a/browser/base/content/test/newtab/Makefile.in b/browser/base/content/test/newtab/Makefile.in index 6ac460d14d3..9bedf457969 100644 --- a/browser/base/content/test/newtab/Makefile.in +++ b/browser/base/content/test/newtab/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -34,5 +26,3 @@ MOCHITEST_BROWSER_FILES = \ browser_newtab_perwindow_private_browsing.js \ head.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/browser/base/content/test/social/Makefile.in b/browser/base/content/test/social/Makefile.in index 16a5211cbd3..caeb2fd1a60 100644 --- a/browser/base/content/test/social/Makefile.in +++ b/browser/base/content/test/social/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_BROWSER_FILES = \ head.js \ blocklist.xml \ @@ -44,5 +36,3 @@ MOCHITEST_BROWSER_FILES = \ social_worker.js \ share.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/browser/base/content/test/social/opengraph/Makefile.in b/browser/base/content/test/social/opengraph/Makefile.in index d0d5a189083..c963a72831d 100644 --- a/browser/base/content/test/social/opengraph/Makefile.in +++ b/browser/base/content/test/social/opengraph/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -17,5 +9,3 @@ MOCHITEST_BROWSER_FILES := \ shorturl_link.html \ shorturl_linkrel.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/browser/branding/aurora/Makefile.in b/browser/branding/aurora/Makefile.in index a593682abba..34c2841c1e2 100644 --- a/browser/branding/aurora/Makefile.in +++ b/browser/branding/aurora/Makefile.in @@ -2,12 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 @@ -70,5 +64,3 @@ VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNA VISUALMANIFEST_PATH := $(DIST)/bin PP_TARGETS += VISUALMANIFEST endif - -include $(topsrcdir)/config/rules.mk diff --git a/browser/branding/aurora/content/Makefile.in b/browser/branding/aurora/content/Makefile.in index 2a0a285826c..2d17f36dae6 100644 --- a/browser/branding/aurora/content/Makefile.in +++ b/browser/branding/aurora/content/Makefile.in @@ -5,18 +5,9 @@ # 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 diff --git a/browser/branding/aurora/locales/Makefile.in b/browser/branding/aurora/locales/Makefile.in index d199ba23528..778f74dd0f1 100644 --- a/browser/branding/aurora/locales/Makefile.in +++ b/browser/branding/aurora/locales/Makefile.in @@ -2,14 +2,4 @@ # License, v. 2.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 diff --git a/browser/branding/nightly/Makefile.in b/browser/branding/nightly/Makefile.in index bf553dd7686..ad15f4dc5ab 100644 --- a/browser/branding/nightly/Makefile.in +++ b/browser/branding/nightly/Makefile.in @@ -2,12 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 @@ -70,5 +64,3 @@ VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNA VISUALMANIFEST_PATH := $(DIST)/bin PP_TARGETS += VISUALMANIFEST endif - -include $(topsrcdir)/config/rules.mk diff --git a/browser/branding/nightly/content/Makefile.in b/browser/branding/nightly/content/Makefile.in index 2a0a285826c..2d17f36dae6 100644 --- a/browser/branding/nightly/content/Makefile.in +++ b/browser/branding/nightly/content/Makefile.in @@ -5,18 +5,9 @@ # 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 diff --git a/browser/branding/nightly/locales/Makefile.in b/browser/branding/nightly/locales/Makefile.in index d199ba23528..778f74dd0f1 100644 --- a/browser/branding/nightly/locales/Makefile.in +++ b/browser/branding/nightly/locales/Makefile.in @@ -2,14 +2,4 @@ # License, v. 2.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 diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in index a593682abba..34c2841c1e2 100644 --- a/browser/branding/official/Makefile.in +++ b/browser/branding/official/Makefile.in @@ -2,12 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 @@ -70,5 +64,3 @@ VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNA VISUALMANIFEST_PATH := $(DIST)/bin PP_TARGETS += VISUALMANIFEST endif - -include $(topsrcdir)/config/rules.mk diff --git a/browser/branding/official/content/Makefile.in b/browser/branding/official/content/Makefile.in index 2a0a285826c..2d17f36dae6 100644 --- a/browser/branding/official/content/Makefile.in +++ b/browser/branding/official/content/Makefile.in @@ -5,18 +5,9 @@ # 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 diff --git a/browser/branding/official/locales/Makefile.in b/browser/branding/official/locales/Makefile.in index 2839d474fe5..82f614ecea2 100644 --- a/browser/branding/official/locales/Makefile.in +++ b/browser/branding/official/locales/Makefile.in @@ -2,14 +2,4 @@ # License, v. 2.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 diff --git a/browser/branding/unofficial/Makefile.in b/browser/branding/unofficial/Makefile.in index bf553dd7686..ad15f4dc5ab 100644 --- a/browser/branding/unofficial/Makefile.in +++ b/browser/branding/unofficial/Makefile.in @@ -2,12 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 @@ -70,5 +64,3 @@ VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNA VISUALMANIFEST_PATH := $(DIST)/bin PP_TARGETS += VISUALMANIFEST endif - -include $(topsrcdir)/config/rules.mk diff --git a/browser/branding/unofficial/content/Makefile.in b/browser/branding/unofficial/content/Makefile.in index 2a0a285826c..2d17f36dae6 100644 --- a/browser/branding/unofficial/content/Makefile.in +++ b/browser/branding/unofficial/content/Makefile.in @@ -5,18 +5,9 @@ # 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 diff --git a/browser/branding/unofficial/locales/Makefile.in b/browser/branding/unofficial/locales/Makefile.in index d199ba23528..778f74dd0f1 100644 --- a/browser/branding/unofficial/locales/Makefile.in +++ b/browser/branding/unofficial/locales/Makefile.in @@ -2,14 +2,4 @@ # License, v. 2.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 diff --git a/browser/components/about/Makefile.in b/browser/components/about/Makefile.in index 11e70d93e9d..7da04ff5122 100644 --- a/browser/components/about/Makefile.in +++ b/browser/components/about/Makefile.in @@ -2,16 +2,7 @@ # License, v. 2.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 diff --git a/browser/components/build/Makefile.in b/browser/components/build/Makefile.in index 9adbf424e8d..4a746eda851 100644 --- a/browser/components/build/Makefile.in +++ b/browser/components/build/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH=@DEPTH@ -topsrcdir=@top_srcdir@ -srcdir=@srcdir@ -VPATH=@srcdir@ - -include $(DEPTH)/config/autoconf.mk - SHORT_LIBNAME = brwsrcmp IS_COMPONENT = 1 MODULE_NAME = nsBrowserCompsModule diff --git a/browser/components/certerror/test/Makefile.in b/browser/components/certerror/test/Makefile.in index 6037dae127d..ee21ce777b2 100644 --- a/browser/components/certerror/test/Makefile.in +++ b/browser/components/certerror/test/Makefile.in @@ -3,17 +3,7 @@ # License, v. 2.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 diff --git a/browser/components/dirprovider/Makefile.in b/browser/components/dirprovider/Makefile.in index 0a2d5d109e1..b46e48dfcb4 100644 --- a/browser/components/dirprovider/Makefile.in +++ b/browser/components/dirprovider/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_STATIC_LIB = 1 USE_STATIC_LIBS = 1 @@ -18,5 +11,3 @@ EXTRA_DSO_LDOPTS = \ $(XPCOM_GLUE_LDOPTS) \ $(NSPR_LIBS) \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/browser/components/downloads/test/browser/Makefile.in b/browser/components/downloads/test/browser/Makefile.in index 1fc7a45220b..39e02866717 100644 --- 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 diff --git a/browser/components/feeds/src/Makefile.in b/browser/components/feeds/src/Makefile.in index ee7c4f70b37..1f555144a52 100644 --- a/browser/components/feeds/src/Makefile.in +++ b/browser/components/feeds/src/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_STATIC_LIB = 1 USE_STATIC_LIBS = 1 @@ -19,5 +12,3 @@ DEFINES += \ LOCAL_INCLUDES = -I$(srcdir)/../../build - -include $(topsrcdir)/config/rules.mk diff --git a/browser/components/feeds/test/Makefile.in b/browser/components/feeds/test/Makefile.in index bfc6e986992..fd950aafe7d 100644 --- a/browser/components/feeds/test/Makefile.in +++ b/browser/components/feeds/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ bug408328-data.xml \ bug368464-data.xml \ @@ -23,5 +15,3 @@ MOCHITEST_FILES = \ valid-feed.xml \ valid-unsniffable-feed.xml \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/browser/components/feeds/test/chrome/Makefile.in b/browser/components/feeds/test/chrome/Makefile.in index 020e4b6525c..c20deb1952a 100644 --- a/browser/components/feeds/test/chrome/Makefile.in +++ b/browser/components/feeds/test/chrome/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -22,6 +14,3 @@ MOCHITEST_CHROME_FILES = \ test_bug408328.html \ test_maxSniffing.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/browser/components/migration/src/Makefile.in b/browser/components/migration/src/Makefile.in index 924bb2d17fc..831ccd1ec2b 100644 --- a/browser/components/migration/src/Makefile.in +++ b/browser/components/migration/src/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_STATIC_LIB = 1 USE_STATIC_LIBS = 1 @@ -21,6 +14,3 @@ endif ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) DEFINES += -DHAS_SAFARI_MIGRATOR endif - -include $(topsrcdir)/config/rules.mk - diff --git a/browser/components/places/tests/browser/Makefile.in b/browser/components/places/tests/browser/Makefile.in index 35fde42e386..6c5bc454a13 100644 --- a/browser/components/places/tests/browser/Makefile.in +++ b/browser/components/places/tests/browser/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -44,5 +36,3 @@ MOCHITEST_BROWSER_FILES = \ browser_library_downloads.js \ browser_library_left_pane_select_hierarchy.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/browser/components/places/tests/chrome/Makefile.in b/browser/components/places/tests/chrome/Makefile.in index 06fc35cef5d..2581e5ce576 100644 --- a/browser/components/places/tests/chrome/Makefile.in +++ b/browser/components/places/tests/chrome/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -22,5 +14,3 @@ MOCHITEST_CHROME_FILES = \ test_editBookmarkOverlay_tags_liveUpdate.xul \ test_bug631374_tags_selector_scroll.xul \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/browser/components/preferences/Makefile.in b/browser/components/preferences/Makefile.in index 32c72ab2876..8bc21d8d486 100644 --- a/browser/components/preferences/Makefile.in +++ b/browser/components/preferences/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk DEFINES += \ diff --git a/browser/components/preferences/in-content/Makefile.in b/browser/components/preferences/in-content/Makefile.in index 2ce196b1d30..9a8d9616efb 100644 --- a/browser/components/preferences/in-content/Makefile.in +++ b/browser/components/preferences/in-content/Makefile.in @@ -2,13 +2,6 @@ # - License, v. 2.0. If a copy of the MPL was not distributed with this file, # - You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk DEFINES += \ diff --git a/browser/components/preferences/in-content/tests/Makefile.in b/browser/components/preferences/in-content/tests/Makefile.in index 04622fc40ce..a719accbd55 100644 --- a/browser/components/preferences/in-content/tests/Makefile.in +++ b/browser/components/preferences/in-content/tests/Makefile.in @@ -2,14 +2,6 @@ # - License, v. 2.0. If a copy of the MPL was not distributed with this file, # - You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -36,5 +28,3 @@ MOCHITEST_BROWSER_FILES += \ browser_healthreport.js \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk diff --git a/browser/components/preferences/tests/Makefile.in b/browser/components/preferences/tests/Makefile.in index 56737aaf771..e90b723882e 100644 --- a/browser/components/preferences/tests/Makefile.in +++ b/browser/components/preferences/tests/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -35,5 +27,3 @@ endif # ENABLE_TESTS ifdef MOZ_SERVICES_HEALTHREPORT MOCHITEST_BROWSER_FILES += browser_healthreport.js endif - -include $(topsrcdir)/config/rules.mk diff --git a/browser/components/privatebrowsing/test/browser/Makefile.in b/browser/components/privatebrowsing/test/browser/Makefile.in index 03be7c9562d..871ab7498fb 100644 --- a/browser/components/privatebrowsing/test/browser/Makefile.in +++ b/browser/components/privatebrowsing/test/browser/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -56,5 +48,3 @@ MOCHITEST_BROWSER_FILES = \ popup.html \ title.sjs \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/browser/components/safebrowsing/content/test/Makefile.in b/browser/components/safebrowsing/content/test/Makefile.in index 1ca03dbe023..dc9f7374f0d 100644 --- a/browser/components/safebrowsing/content/test/Makefile.in +++ b/browser/components/safebrowsing/content/test/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_BROWSER_FILES := \ head.js \ browser_bug400731.js \ @@ -23,5 +15,3 @@ MOCHITEST_BROWSER_FILES += \ browser_bug415846.js \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk diff --git a/browser/components/search/test/Makefile.in b/browser/components/search/test/Makefile.in index a9fa3f84c3b..a9b1a3bbfe5 100644 --- a/browser/components/search/test/Makefile.in +++ b/browser/components/search/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_BROWSER_FILES = \ head.js \ browser_405664.js \ @@ -36,5 +28,3 @@ pp_mochitest_browser_files_PATH := $(DEPTH)/_tests/testing/mochitest/browser/$(r 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 diff --git a/browser/components/sessionstore/test/Makefile.in b/browser/components/sessionstore/test/Makefile.in index df62aee0fc7..15ef9046cd3 100644 --- a/browser/components/sessionstore/test/Makefile.in +++ b/browser/components/sessionstore/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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) @@ -169,5 +161,3 @@ MOCHITEST_BROWSER_FILES += \ browser_625016.js \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in index 18491cef6e4..f3fb6440191 100644 --- a/browser/components/shell/src/Makefile.in +++ b/browser/components/shell/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_STATIC_LIB = 1 USE_STATIC_LIBS = 1 diff --git a/browser/components/shell/test/Makefile.in b/browser/components/shell/test/Makefile.in index b9624ac6e98..f148938ff48 100644 --- a/browser/components/shell/test/Makefile.in +++ b/browser/components/shell/test/Makefile.in @@ -2,17 +2,7 @@ # License, v. 2.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 diff --git a/browser/components/tabview/Makefile.in b/browser/components/tabview/Makefile.in index cb36dd6a67c..a8282c85d85 100644 --- a/browser/components/tabview/Makefile.in +++ b/browser/components/tabview/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk libs:: diff --git a/browser/components/tabview/test/Makefile.in b/browser/components/tabview/test/Makefile.in index 6f9576ea079..1192dbc385e 100644 --- a/browser/components/tabview/test/Makefile.in +++ b/browser/components/tabview/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -167,5 +159,3 @@ MOCHITEST_BROWSER_FILES := \ # 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 diff --git a/browser/components/test/Makefile.in b/browser/components/test/Makefile.in index b2e2e479dcc..35097b910e7 100644 --- a/browser/components/test/Makefile.in +++ b/browser/components/test/Makefile.in @@ -2,16 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 diff --git a/browser/devtools/Makefile.in b/browser/devtools/Makefile.in index e57d3d86521..2364f7a8733 100644 --- a/browser/devtools/Makefile.in +++ b/browser/devtools/Makefile.in @@ -2,11 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - include $(topsrcdir)/config/rules.mk libs:: diff --git a/browser/devtools/app-manager/Makefile.in b/browser/devtools/app-manager/Makefile.in index de2b81dba52..ba273b843c6 100644 --- a/browser/devtools/app-manager/Makefile.in +++ b/browser/devtools/app-manager/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk libs:: diff --git a/browser/devtools/app-manager/test/Makefile.in b/browser/devtools/app-manager/test/Makefile.in index 5a28cecd611..7d72e092bfe 100644 --- a/browser/devtools/app-manager/test/Makefile.in +++ b/browser/devtools/app-manager/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -17,5 +9,3 @@ MOCHITEST_CHROME_FILES = \ test_projects_store.html \ hosted_app.manifest \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/browser/devtools/commandline/Makefile.in b/browser/devtools/commandline/Makefile.in index 8890154f78a..aad3588f054 100644 --- a/browser/devtools/commandline/Makefile.in +++ b/browser/devtools/commandline/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk libs:: diff --git a/browser/devtools/commandline/test/Makefile.in b/browser/devtools/commandline/test/Makefile.in index fd4b1ab41ba..ab2a455e880 100644 --- a/browser/devtools/commandline/test/Makefile.in +++ b/browser/devtools/commandline/test/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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) \ @@ -76,5 +68,3 @@ MOCHITEST_BROWSER_FILES = \ helpers.js \ mockCommands.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/browser/devtools/debugger/Makefile.in b/browser/devtools/debugger/Makefile.in index 42f17d7fecd..f75d4ac50e0 100644 --- a/browser/devtools/debugger/Makefile.in +++ b/browser/devtools/debugger/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk libs:: diff --git a/browser/devtools/debugger/test/Makefile.in b/browser/devtools/debugger/test/Makefile.in index bf122e9b223..f74e2ac3372 100644 --- a/browser/devtools/debugger/test/Makefile.in +++ b/browser/devtools/debugger/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -190,5 +182,3 @@ MOCHITEST_BROWSER_TESTS += \ endif MOCHITEST_BROWSER_FILES_PARTS = MOCHITEST_BROWSER_TESTS MOCHITEST_BROWSER_PAGES - -include $(topsrcdir)/config/rules.mk diff --git a/browser/devtools/fontinspector/test/Makefile.in b/browser/devtools/fontinspector/test/Makefile.in index 4e1e4577551..92e519f6aad 100644 --- a/browser/devtools/fontinspector/test/Makefile.in +++ b/browser/devtools/fontinspector/test/Makefile.in @@ -2,18 +2,8 @@ # License, v. 2.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 diff --git a/browser/devtools/framework/Makefile.in b/browser/devtools/framework/Makefile.in index 5ea7a0c9665..d9f6d8957c6 100644 --- a/browser/devtools/framework/Makefile.in +++ b/browser/devtools/framework/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk libs:: diff --git a/browser/devtools/framework/test/Makefile.in b/browser/devtools/framework/test/Makefile.in index c9618e24880..2cd0cd43c24 100644 --- a/browser/devtools/framework/test/Makefile.in +++ b/browser/devtools/framework/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -32,5 +24,3 @@ MOCHITEST_BROWSER_FILES = \ browser_toolbox_raise.js \ browser_keybindings.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/browser/devtools/inspector/Makefile.in b/browser/devtools/inspector/Makefile.in index 12ae09fda79..f2337657845 100644 --- a/browser/devtools/inspector/Makefile.in +++ b/browser/devtools/inspector/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk libs:: diff --git a/browser/devtools/inspector/test/Makefile.in b/browser/devtools/inspector/test/Makefile.in index 219e507f6da..b737d16d619 100644 --- a/browser/devtools/inspector/test/Makefile.in +++ b/browser/devtools/inspector/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -48,5 +40,3 @@ MOCHITEST_BROWSER_FILES := \ browser_inspector_reload.js \ head.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/browser/devtools/layoutview/test/Makefile.in b/browser/devtools/layoutview/test/Makefile.in index 34a62289bf1..48a2973eea7 100644 --- a/browser/devtools/layoutview/test/Makefile.in +++ b/browser/devtools/layoutview/test/Makefile.in @@ -2,16 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 diff --git a/browser/devtools/markupview/Makefile.in b/browser/devtools/markupview/Makefile.in index 83e6e11a186..09327f5fb54 100644 --- a/browser/devtools/markupview/Makefile.in +++ b/browser/devtools/markupview/Makefile.in @@ -3,14 +3,5 @@ # License, v. 2.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 diff --git a/browser/devtools/markupview/test/Makefile.in b/browser/devtools/markupview/test/Makefile.in index 8ad1aa12ced..b12b9283097 100644 --- a/browser/devtools/markupview/test/Makefile.in +++ b/browser/devtools/markupview/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -22,5 +14,3 @@ MOCHITEST_BROWSER_FILES := \ browser_bug896181_css_mixed_completion_new_attribute.js \ head.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/browser/devtools/netmonitor/test/Makefile.in b/browser/devtools/netmonitor/test/Makefile.in index 9c018b0ff7e..a8d55ead8a4 100644 --- a/browser/devtools/netmonitor/test/Makefile.in +++ b/browser/devtools/netmonitor/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -72,5 +64,3 @@ MOCHITEST_BROWSER_PAGES = \ $(NULL) MOCHITEST_BROWSER_FILES_PARTS = MOCHITEST_BROWSER_TESTS MOCHITEST_BROWSER_PAGES - -include $(topsrcdir)/config/rules.mk diff --git a/browser/devtools/profiler/Makefile.in b/browser/devtools/profiler/Makefile.in index c439da0af99..50512908d28 100644 --- a/browser/devtools/profiler/Makefile.in +++ b/browser/devtools/profiler/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk libs:: diff --git a/browser/devtools/profiler/test/Makefile.in b/browser/devtools/profiler/test/Makefile.in index 56381c21659..45e2a0f9d1f 100644 --- a/browser/devtools/profiler/test/Makefile.in +++ b/browser/devtools/profiler/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -34,5 +26,3 @@ MOCHITEST_BROWSER_PAGES = \ $(NULL) MOCHITEST_BROWSER_FILES_PARTS = MOCHITEST_BROWSER_TESTS MOCHITEST_BROWSER_PAGES - -include $(topsrcdir)/config/rules.mk diff --git a/browser/devtools/responsivedesign/Makefile.in b/browser/devtools/responsivedesign/Makefile.in index fe75dad69a8..f75d4ac50e0 100644 --- a/browser/devtools/responsivedesign/Makefile.in +++ b/browser/devtools/responsivedesign/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk libs:: diff --git a/browser/devtools/responsivedesign/test/Makefile.in b/browser/devtools/responsivedesign/test/Makefile.in index add51e8759a..42f0be6518b 100644 --- a/browser/devtools/responsivedesign/test/Makefile.in +++ b/browser/devtools/responsivedesign/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -20,5 +12,3 @@ MOCHITEST_BROWSER_FILES := \ touch.html \ head.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/browser/devtools/scratchpad/Makefile.in b/browser/devtools/scratchpad/Makefile.in index 8890154f78a..aad3588f054 100644 --- a/browser/devtools/scratchpad/Makefile.in +++ b/browser/devtools/scratchpad/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk libs:: diff --git a/browser/devtools/scratchpad/test/Makefile.in b/browser/devtools/scratchpad/test/Makefile.in index e24f3d2363c..23f2736e080 100644 --- a/browser/devtools/scratchpad/test/Makefile.in +++ b/browser/devtools/scratchpad/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -43,5 +35,3 @@ MOCHITEST_BROWSER_FILES = \ # Disable test due to bug 807234 becoming basically permanent # browser_scratchpad_bug_653427_confirm_close.js \ - -include $(topsrcdir)/config/rules.mk diff --git a/browser/devtools/shared/Makefile.in b/browser/devtools/shared/Makefile.in index 94eba0663b9..af786db2876 100644 --- a/browser/devtools/shared/Makefile.in +++ b/browser/devtools/shared/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk libs:: diff --git a/browser/devtools/shared/test/Makefile.in b/browser/devtools/shared/test/Makefile.in index 3e9fbe2771d..7246e11b94f 100644 --- a/browser/devtools/shared/test/Makefile.in +++ b/browser/devtools/shared/test/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -39,5 +31,3 @@ MOCHITEST_BROWSER_FILES += \ browser_layoutHelpers.html \ browser_layoutHelpers_iframe.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/browser/devtools/sourceeditor/test/Makefile.in b/browser/devtools/sourceeditor/test/Makefile.in index 018370a80f1..8d8cde0ff2c 100644 --- a/browser/devtools/sourceeditor/test/Makefile.in +++ b/browser/devtools/sourceeditor/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 \ @@ -33,5 +25,3 @@ MOCHITEST_BROWSER_FILES = \ browser_bug744021_next_prev_bracket_jump.js \ browser_bug725392_mouse_coords_char_offset.js \ head.js \ - -include $(topsrcdir)/config/rules.mk diff --git a/browser/devtools/styleeditor/Makefile.in b/browser/devtools/styleeditor/Makefile.in index fe75dad69a8..f75d4ac50e0 100644 --- a/browser/devtools/styleeditor/Makefile.in +++ b/browser/devtools/styleeditor/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk libs:: diff --git a/browser/devtools/styleeditor/test/Makefile.in b/browser/devtools/styleeditor/test/Makefile.in index 1918c406a21..00eee964a39 100644 --- a/browser/devtools/styleeditor/test/Makefile.in +++ b/browser/devtools/styleeditor/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_BROWSER_FILES := \ browser_styleeditor_enabled.js \ browser_styleeditor_filesave.js \ @@ -51,5 +43,3 @@ MOCHITEST_BROWSER_FILES := \ test_private.html \ test_private.css \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/browser/devtools/styleinspector/Makefile.in b/browser/devtools/styleinspector/Makefile.in index 1599859b79a..8a262855b73 100644 --- a/browser/devtools/styleinspector/Makefile.in +++ b/browser/devtools/styleinspector/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk libs:: diff --git a/browser/devtools/styleinspector/test/Makefile.in b/browser/devtools/styleinspector/test/Makefile.in index 2db33c1792c..6848056ad56 100644 --- a/browser/devtools/styleinspector/test/Makefile.in +++ b/browser/devtools/styleinspector/test/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_BROWSER_FILES = \ browser_bug683672.js \ browser_styleinspector_bug_672746_default_styles.js \ @@ -61,5 +53,3 @@ MOCHITEST_BROWSER_FILES += \ browser_styleinspector_bug_677930_urls_clickable/browser_styleinspector_bug_677930_urls_clickable.css \ test-image.png \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/browser/devtools/tilt/Makefile.in b/browser/devtools/tilt/Makefile.in index e4584f3806a..08d3262b687 100644 --- a/browser/devtools/tilt/Makefile.in +++ b/browser/devtools/tilt/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk libs:: diff --git a/browser/devtools/tilt/test/Makefile.in b/browser/devtools/tilt/test/Makefile.in index cf3e6d35134..273e0185bcc 100644 --- a/browser/devtools/tilt/test/Makefile.in +++ b/browser/devtools/tilt/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_BROWSER_FILES = \ head.js \ browser_tilt_01_lazy_getter.js \ @@ -59,5 +51,3 @@ MOCHITEST_BROWSER_FILES = \ browser_tilt_visualizer.js \ browser_tilt_zoom.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/browser/devtools/webconsole/Makefile.in b/browser/devtools/webconsole/Makefile.in index e839f960f6b..35db6f7792e 100644 --- a/browser/devtools/webconsole/Makefile.in +++ b/browser/devtools/webconsole/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk libs:: diff --git a/browser/devtools/webconsole/test/Makefile.in b/browser/devtools/webconsole/test/Makefile.in index 515cd73307d..d20c9eced46 100644 --- a/browser/devtools/webconsole/test/Makefile.in +++ b/browser/devtools/webconsole/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_BROWSER_FILES = \ browser_webconsole_notifications.js \ browser_webconsole_message_node_id.js \ @@ -258,5 +250,3 @@ MOCHITEST_BROWSER_FILES += \ test-iframe3.html \ test-mixedcontent-securityerrors.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/browser/extensions/Makefile.in b/browser/extensions/Makefile.in index 5dae4397a6d..9d8b3416e02 100644 --- a/browser/extensions/Makefile.in +++ b/browser/extensions/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifdef MOZ_METRO GENERATED_DIRS = $(DIST)/bin/metro/chrome endif diff --git a/browser/extensions/pdfjs/test/Makefile.in b/browser/extensions/pdfjs/test/Makefile.in index 98ba859d22b..e0b423540bb 100644 --- a/browser/extensions/pdfjs/test/Makefile.in +++ b/browser/extensions/pdfjs/test/Makefile.in @@ -2,19 +2,9 @@ # License, v. 2.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_pdfjs_main.js \ browser_pdfjs_savedialog.js \ browser_pdfjs_views.js \ file_pdfjs_test.pdf \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/browser/fuel/test/Makefile.in b/browser/fuel/test/Makefile.in index 79e82030d88..0ea7ed2237e 100644 --- a/browser/fuel/test/Makefile.in +++ b/browser/fuel/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_BROWSER_FILES := \ browser_Application.js \ browser_ApplicationPrefs.js \ @@ -21,5 +13,3 @@ MOCHITEST_BROWSER_FILES := \ ContentB.html \ ContentWithFrames.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in index 90ef165cf43..a9986c2aff9 100644 --- a/browser/installer/Makefile.in +++ b/browser/installer/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - STANDALONE_MAKEFILE := 1 include $(topsrcdir)/config/rules.mk diff --git a/browser/installer/windows/Makefile.in b/browser/installer/windows/Makefile.in index 51295945d15..001f8d659d7 100644 --- a/browser/installer/windows/Makefile.in +++ b/browser/installer/windows/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk CONFIG_DIR = instgen diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in index ea52beccc72..fb0fcebee0e 100644 --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/config.mk vpath %.xml @srcdir@/en-US/searchplugins diff --git a/browser/metro/Makefile.in b/browser/metro/Makefile.in index d58229c79c5..948797992c4 100644 --- a/browser/metro/Makefile.in +++ b/browser/metro/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk ######################################### diff --git a/browser/metro/base/Makefile.in b/browser/metro/base/Makefile.in index c0a3a440478..7a75e28d24d 100644 --- a/browser/metro/base/Makefile.in +++ b/browser/metro/base/Makefile.in @@ -2,12 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk DIST_SUBDIR=metro @@ -16,5 +10,3 @@ DEFINES += -DAB_CD=$(MOZ_UI_LOCALE) \ -DPACKAGE=browser \ -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/browser/metro/base/tests/Makefile.in b/browser/metro/base/tests/Makefile.in index 1b138a98fb5..549712efaee 100644 --- a/browser/metro/base/tests/Makefile.in +++ b/browser/metro/base/tests/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - # For now we're copying the actual Util code. # We should make this into a jsm module. See bug 848137 XPCSHELL_RESOURCES = \ @@ -18,5 +10,3 @@ XPCSHELL_RESOURCES = \ libs:: $(XPCSHELL_RESOURCES) $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit/ - -include $(topsrcdir)/config/rules.mk diff --git a/browser/metro/base/tests/mochiperf/Makefile.in b/browser/metro/base/tests/mochiperf/Makefile.in index fd2bc676a6d..e3fc6295662 100644 --- a/browser/metro/base/tests/mochiperf/Makefile.in +++ b/browser/metro/base/tests/mochiperf/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - ifndef MOZ_DEBUG MOCHITEST_METRO_FILES = \ ../mochitest/head.js \ @@ -23,5 +15,3 @@ MOCHITEST_METRO_FILES = \ browser_firstx.js \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk diff --git a/browser/metro/base/tests/mochiperf/res/Makefile.in b/browser/metro/base/tests/mochiperf/res/Makefile.in index 99e414b7179..aea33ad03d2 100644 --- a/browser/metro/base/tests/mochiperf/res/Makefile.in +++ b/browser/metro/base/tests/mochiperf/res/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - ifndef MOZ_DEBUG MOCHITEST_METRO_FILES = \ ripples.html \ @@ -20,5 +12,3 @@ MOCHITEST_METRO_FILES = \ fx.png \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk diff --git a/browser/metro/base/tests/mochitest/Makefile.in b/browser/metro/base/tests/mochitest/Makefile.in index cda0f383aa8..2db959fb9d4 100644 --- a/browser/metro/base/tests/mochitest/Makefile.in +++ b/browser/metro/base/tests/mochitest/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_METRO_FILES = \ head.js \ helpers/BookmarksHelper.js \ @@ -67,5 +59,3 @@ MOCHITEST_METRO_FILES += \ browser_selection_caretfocus.html \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk diff --git a/browser/metro/base/tests/mochitest/res/Makefile.in b/browser/metro/base/tests/mochitest/res/Makefile.in index 566a13522eb..0c0f6f4f6a2 100644 --- a/browser/metro/base/tests/mochitest/res/Makefile.in +++ b/browser/metro/base/tests/mochitest/res/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_METRO_FILES = \ image01.png \ textblock01.html \ @@ -20,5 +12,3 @@ MOCHITEST_METRO_FILES = \ blankpage2.html \ blankpage3.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/browser/metro/locales/Makefile.in b/browser/metro/locales/Makefile.in index 43155d62a76..c18eb3778f4 100644 --- a/browser/metro/locales/Makefile.in +++ b/browser/metro/locales/Makefile.in @@ -2,15 +2,9 @@ # License, v. 2.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@ - # metrofx specific resources - this defines LOCALE_SRCDIR relativesrcdir = browser/metro/locales -include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk DEFINES += -DAB_CD=$(AB_CD) diff --git a/browser/metro/locales/import/Makefile.in b/browser/metro/locales/import/Makefile.in index 6c9bcab5534..233a3754bdd 100644 --- a/browser/metro/locales/import/Makefile.in +++ b/browser/metro/locales/import/Makefile.in @@ -2,15 +2,9 @@ # License, v. 2.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@ - # desktop specific resources - this defines LOCALE_SRCDIR relativesrcdir = browser/locales -include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk ######################################### diff --git a/browser/metro/profile/Makefile.in b/browser/metro/profile/Makefile.in index 258abe97531..46da143fb4c 100644 --- a/browser/metro/profile/Makefile.in +++ b/browser/metro/profile/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk PREF_JS_EXPORTS = $(srcdir)/metro.js - -include $(topsrcdir)/config/rules.mk diff --git a/browser/metro/shell/Makefile.in b/browser/metro/shell/Makefile.in index 0846eaa7a5e..ce9f1e6fc96 100644 --- a/browser/metro/shell/Makefile.in +++ b/browser/metro/shell/Makefile.in @@ -2,17 +2,8 @@ # License, v. 2.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:: $(NSINSTALL) $(srcdir)/resources.pri $(DIST)/bin install:: $(NSINSTALL) $(srcdir)/resources.pri $(DIST)/bin - -include $(topsrcdir)/config/rules.mk diff --git a/browser/metro/shell/commandexecutehandler/Makefile.in b/browser/metro/shell/commandexecutehandler/Makefile.in index 09610317854..814d9b3f481 100644 --- a/browser/metro/shell/commandexecutehandler/Makefile.in +++ b/browser/metro/shell/commandexecutehandler/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - NO_PROFILE_GUIDED_OPTIMIZE = 1 include $(topsrcdir)/config/config.mk @@ -33,5 +26,3 @@ OS_LIBS = \ $(NULL) DEFINES += -DUNICODE -D_UNICODE -DNS_NO_XPCOM - -include $(topsrcdir)/config/rules.mk diff --git a/browser/metro/shell/linktool/Makefile.in b/browser/metro/shell/linktool/Makefile.in index 9bfa298c661..b2892028fbf 100644 --- a/browser/metro/shell/linktool/Makefile.in +++ b/browser/metro/shell/linktool/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - NO_PROFILE_GUIDED_OPTIMIZE = 1 include $(topsrcdir)/config/config.mk @@ -25,5 +18,3 @@ OS_LIBS = \ $(NULL) DEFINES += -DUNICODE -D_UNICODE - -include $(topsrcdir)/config/rules.mk diff --git a/browser/metro/shell/testing/Makefile.in b/browser/metro/shell/testing/Makefile.in index c3e5cfba423..50efa245fa5 100644 --- a/browser/metro/shell/testing/Makefile.in +++ b/browser/metro/shell/testing/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # static win runtime linking USE_STATIC_LIBS = 1 @@ -33,5 +26,3 @@ OS_LIBS = \ $(NULL) DEFINES += -DUNICODE -D_UNICODE - -include $(topsrcdir)/config/rules.mk diff --git a/browser/modules/Makefile.in b/browser/modules/Makefile.in index d83cd708e21..02871c0e728 100644 --- a/browser/modules/Makefile.in +++ b/browser/modules/Makefile.in @@ -2,17 +2,8 @@ # License, v. 2.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 ifdef MOZILLA_OFFICIAL DEFINES += -DMOZILLA_OFFICIAL=1 endif - -include $(topsrcdir)/config/rules.mk diff --git a/browser/modules/test/Makefile.in b/browser/modules/test/Makefile.in index 00066aaee2d..852a5fffdc8 100644 --- a/browser/modules/test/Makefile.in +++ b/browser/modules/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_BROWSER_FILES := \ browser_NetworkPrioritizer.js \ $(NULL) @@ -22,5 +14,3 @@ endif # bug 793906 - temporarily disabling desktop UI while working on b2g # browser_SignInToWebsite.js - -include $(topsrcdir)/config/rules.mk diff --git a/browser/modules/test/chrome/Makefile.in b/browser/modules/test/chrome/Makefile.in index b5f4e371acd..664e10d5e5a 100644 --- a/browser/modules/test/chrome/Makefile.in +++ b/browser/modules/test/chrome/Makefile.in @@ -2,17 +2,7 @@ # License, v. 2.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_sharedframe.xul \ sharedframe.xul \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/browser/themes/linux/Makefile.in b/browser/themes/linux/Makefile.in index 353289fb226..173ca68435c 100644 --- a/browser/themes/linux/Makefile.in +++ b/browser/themes/linux/Makefile.in @@ -2,15 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ICON_FILES := icon.png ICON_DEST = $(FINAL_TARGET)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} INSTALL_TARGETS += ICON - -include $(topsrcdir)/config/rules.mk diff --git a/browser/themes/osx/Makefile.in b/browser/themes/osx/Makefile.in index 353289fb226..173ca68435c 100644 --- a/browser/themes/osx/Makefile.in +++ b/browser/themes/osx/Makefile.in @@ -2,15 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ICON_FILES := icon.png ICON_DEST = $(FINAL_TARGET)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} INSTALL_TARGETS += ICON - -include $(topsrcdir)/config/rules.mk diff --git a/browser/themes/windows/Makefile.in b/browser/themes/windows/Makefile.in index 353289fb226..173ca68435c 100644 --- a/browser/themes/windows/Makefile.in +++ b/browser/themes/windows/Makefile.in @@ -2,15 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ICON_FILES := icon.png ICON_DEST = $(FINAL_TARGET)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} INSTALL_TARGETS += ICON - -include $(topsrcdir)/config/rules.mk diff --git a/build/Makefile.in b/build/Makefile.in index 88948d0b464..d47fef04487 100644 --- a/build/Makefile.in +++ b/build/Makefile.in @@ -3,12 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk USE_RCS_MK := 1 include $(topsrcdir)/config/makefiles/makeutils.mk diff --git a/build/mobile/robocop/Makefile.in b/build/mobile/robocop/Makefile.in index b09186a962f..c642157c3f5 100644 --- a/build/mobile/robocop/Makefile.in +++ b/build/mobile/robocop/Makefile.in @@ -2,17 +2,10 @@ # License, v. 2.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@ - mobile-tests := mobile/android/base/tests TESTPATH := $(topsrcdir)/$(mobile-tests) dir-tests := $(DEPTH)/$(mobile-tests) -include $(DEPTH)/config/autoconf.mk - ANDROID_APK_NAME := robocop-debug ROBOTIUM_PATH = $(srcdir)/robotium-solo-4.2.jar diff --git a/build/mobile/sutagent/android/Makefile.in b/build/mobile/sutagent/android/Makefile.in index 8fdc64b0e79..6a8a79d8b2c 100644 --- a/build/mobile/sutagent/android/Makefile.in +++ b/build/mobile/sutagent/android/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ANDROID_APK_NAME := sutAgentAndroid JAVAFILES = \ diff --git a/build/mobile/sutagent/android/fencp/Makefile.in b/build/mobile/sutagent/android/fencp/Makefile.in index 7b29ea0ba52..07b9210cedb 100644 --- a/build/mobile/sutagent/android/fencp/Makefile.in +++ b/build/mobile/sutagent/android/fencp/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ANDROID_APK_NAME := FenCP JAVAFILES = \ diff --git a/build/mobile/sutagent/android/ffxcp/Makefile.in b/build/mobile/sutagent/android/ffxcp/Makefile.in index 2cabb757971..4887658f8d0 100644 --- a/build/mobile/sutagent/android/ffxcp/Makefile.in +++ b/build/mobile/sutagent/android/ffxcp/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ANDROID_APK_NAME := FfxCP JAVAFILES = \ diff --git a/build/mobile/sutagent/android/watcher/Makefile.in b/build/mobile/sutagent/android/watcher/Makefile.in index c711e75ce35..9b9d5a76345 100644 --- a/build/mobile/sutagent/android/watcher/Makefile.in +++ b/build/mobile/sutagent/android/watcher/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ANDROID_APK_NAME := Watcher JAVAFILES = \ diff --git a/build/package/Makefile.in b/build/package/Makefile.in index 163fab80682..c945b169a0e 100644 --- a/build/package/Makefile.in +++ b/build/package/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # This makefile doesn't do anything by default. Use one of the special targets # below to stage and build packages. diff --git a/build/stlport/Makefile.in b/build/stlport/Makefile.in index 35952867841..d20ca93e433 100644 --- a/build/stlport/Makefile.in +++ b/build/stlport/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - MODULES = stlport FORCE_STATIC_LIB = 1 STL_FLAGS = diff --git a/build/unix/Makefile.in b/build/unix/Makefile.in index 5f2f4ff836c..38cf1aedb97 100644 --- a/build/unix/Makefile.in +++ b/build/unix/Makefile.in @@ -4,13 +4,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - SDK_BINARY = run-mozilla.sh include $(topsrcdir)/config/rules.mk diff --git a/build/unix/elfhack/Makefile.in b/build/unix/elfhack/Makefile.in index 6c79089b0cb..77728692bf9 100644 --- a/build/unix/elfhack/Makefile.in +++ b/build/unix/elfhack/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - INTERNAL_TOOLS = 1 HOST_PROGRAM = elfhack diff --git a/build/unix/elfhack/inject/Makefile.in b/build/unix/elfhack/inject/Makefile.in index e44973fac42..ea096c7a97c 100644 --- a/build/unix/elfhack/inject/Makefile.in +++ b/build/unix/elfhack/inject/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - INTERNAL_TOOLS = 1 NO_PROFILE_GUIDED_OPTIMIZE = 1 diff --git a/build/unix/stdc++compat/Makefile.in b/build/unix/stdc++compat/Makefile.in index d3d03aca8d1..b39c30fd2d0 100644 --- a/build/unix/stdc++compat/Makefile.in +++ b/build/unix/stdc++compat/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_STATIC_LIB= 1 STL_FLAGS = NO_EXPAND_LIBS = 1 diff --git a/build/unix/test/Makefile.in b/build/unix/test/Makefile.in index 237fab8fb3f..87ba72435ef 100644 --- a/build/unix/test/Makefile.in +++ b/build/unix/test/Makefile.in @@ -4,12 +4,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk ################################################## diff --git a/build/win32/Makefile.in b/build/win32/Makefile.in index c85898e661d..f9e7c845142 100644 --- a/build/win32/Makefile.in +++ b/build/win32/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - NO_PROFILE_GUIDED_OPTIMIZE = 1 ifdef ENABLE_TESTS @@ -80,4 +73,3 @@ endif # WIN32_REDIST_DIR check:: $(PYTHON) $(srcdir)/autobinscope.py $(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/crashreporter-symbols/ $(PYTHON) $(srcdir)/autobinscope.py $(DIST)/bin/plugin-container.exe $(DIST)/crashreporter-symbols/ - diff --git a/build/win32/crashinjectdll/Makefile.in b/build/win32/crashinjectdll/Makefile.in index 179c9049efe..117417a344c 100644 --- a/build/win32/crashinjectdll/Makefile.in +++ b/build/win32/crashinjectdll/Makefile.in @@ -2,17 +2,8 @@ # License, v. 2.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 - DEFFILE = $(srcdir)/crashinjectdll.def FORCE_SHARED_LIB = 1 USE_STATIC_LIBS = 1 MOZ_GLUE_LDFLAGS = - -include $(topsrcdir)/config/rules.mk diff --git a/build/win32/vmwarerecordinghelper/Makefile.in b/build/win32/vmwarerecordinghelper/Makefile.in index 2a601343e25..7503ad49e41 100644 --- a/build/win32/vmwarerecordinghelper/Makefile.in +++ b/build/win32/vmwarerecordinghelper/Makefile.in @@ -2,18 +2,9 @@ # License, v. 2.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 - DEFFILE = $(srcdir)/$(LIBRARY_NAME).def FORCE_SHARED_LIB = 1 USE_STATIC_LIBS = 1 MOZ_GLUE_LDFLAGS = - -include $(topsrcdir)/config/rules.mk diff --git a/caps/src/Makefile.in b/caps/src/Makefile.in index ea2ddc5aed8..78593c1315d 100644 --- a/caps/src/Makefile.in +++ b/caps/src/Makefile.in @@ -3,16 +3,8 @@ # License, v. 2.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 INCLUDES += -I$(srcdir)/../include \ -I$(topsrcdir)/js/xpconnect/src \ -I$(topsrcdir)/dom/base - diff --git a/caps/tests/mochitest/Makefile.in b/caps/tests/mochitest/Makefile.in index 9e6bad70354..26252e68ff1 100644 --- a/caps/tests/mochitest/Makefile.in +++ b/caps/tests/mochitest/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = test_bug423375.html \ test_bug246699.html \ test_bug292789.html \ @@ -24,5 +16,3 @@ ifneq ($(OS_ARCH),WINNT) MOCHITEST_CHROME_FILES = test_principal_extendedorigin_appid_appstatus.html \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk diff --git a/chrome/src/Makefile.in b/chrome/src/Makefile.in index 0a38fc116aa..c09f56a2f04 100644 --- a/chrome/src/Makefile.in +++ b/chrome/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/config/Makefile.in b/config/Makefile.in index e2fafe28d12..b0668816aa8 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -4,13 +4,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # For sanity's sake, we compile nsinstall without the wrapped system # headers, so that we can use it to set up the wrapped system headers. VISIBILITY_FLAGS = diff --git a/config/makefiles/precompile/Makefile.in b/config/makefiles/precompile/Makefile.in index b05da7dcfd9..7242bc3c6a9 100644 --- a/config/makefiles/precompile/Makefile.in +++ b/config/makefiles/precompile/Makefile.in @@ -5,12 +5,6 @@ # This make file defines the precompile tier. This tier effectively fans out # to other make files and specialized targets. -DEPTH := @DEPTH@ -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ - -include $(DEPTH)/config/autoconf.mk - SUPPRESS_DEFAULT_RULES := 1 include $(topsrcdir)/config/rules.mk diff --git a/config/makefiles/test/Makefile.in b/config/makefiles/test/Makefile.in index 8bb01d0ba2f..6c66d820e90 100644 --- a/config/makefiles/test/Makefile.in +++ b/config/makefiles/test/Makefile.in @@ -4,13 +4,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - STANDALONE_MAKEFILE := 1 USE_AUTOTARGETS_MK = 1 MAKEUTILS_UNIT_TEST = 1 diff --git a/config/makefiles/xpidl/Makefile.in b/config/makefiles/xpidl/Makefile.in index cdbe06331b4..d2ecda139ce 100644 --- a/config/makefiles/xpidl/Makefile.in +++ b/config/makefiles/xpidl/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH := @DEPTH@ -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ - -include $(DEPTH)/config/autoconf.mk - SUPPRESS_DEFAULT_RULES := 1 STANDALONE_MAKEFILE := 1 NO_MAKEFILE_RULE := 1 diff --git a/config/nspr/Makefile.in b/config/nspr/Makefile.in index 1594d1fffa8..b94c5a4b68c 100644 --- a/config/nspr/Makefile.in +++ b/config/nspr/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk ifdef LIBXUL_SDK diff --git a/config/tests/makefiles/autodeps/Makefile.in b/config/tests/makefiles/autodeps/Makefile.in index 4367d914646..b588c33be94 100644 --- a/config/tests/makefiles/autodeps/Makefile.in +++ b/config/tests/makefiles/autodeps/Makefile.in @@ -12,12 +12,6 @@ PYTEST = $(PYTHON) -E # python -B not supported by older interpreters export PYTHONDONTWRITEBYTECODE=1 -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk autotgt_tests = .deps/autotargets.mk.ts diff --git a/config/tests/src-simple/Makefile.in b/config/tests/src-simple/Makefile.in index d425380236e..e1cb3763aff 100644 --- a/config/tests/src-simple/Makefile.in +++ b/config/tests/src-simple/Makefile.in @@ -3,16 +3,8 @@ # License, v. 2.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@ - LOCALE_SRCDIR = $(srcdir)/l10n -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/config.mk STANDALONE_MAKEFILE := 1 @@ -42,5 +34,3 @@ check-%:: echo "TEST-UNEXPECTED-FAIL | config/tests/ref-simple | different content in jar" ; \ false; \ fi - -include $(topsrcdir)/config/rules.mk diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in index 6822000914f..1bbf1c70304 100644 --- a/content/base/src/Makefile.in +++ b/content/base/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifdef MOZ_WEBRTC LOCAL_INCLUDES += \ -I$(topsrcdir)/netwerk/sctp/datachannel \ diff --git a/content/base/test/Makefile.in b/content/base/test/Makefile.in index 60d211fdb44..5cf2ea8ac57 100644 --- a/content/base/test/Makefile.in +++ b/content/base/test/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES_A = \ responseIdentical.sjs \ test_bug5141.html \ @@ -708,6 +700,3 @@ MOCHITEST_BROWSER_FILES = \ browser_bug593387.js \ browser_bug902350.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/content/base/test/chrome/Makefile.in b/content/base/test/chrome/Makefile.in index 0b6ccf57656..412e4d35778 100644 --- a/content/base/test/chrome/Makefile.in +++ b/content/base/test/chrome/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ bug421622-referer.sjs \ $(NULL) @@ -70,5 +62,3 @@ MOCHITEST_CHROME_FILES += \ cpows_child.js \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk diff --git a/content/base/test/websocket_hybi/Makefile.in b/content/base/test/websocket_hybi/Makefile.in index f7732dad7f5..94d2d6fd4c3 100644 --- a/content/base/test/websocket_hybi/Makefile.in +++ b/content/base/test/websocket_hybi/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - #### MODULE = content MOCHITEST_FILES = \ @@ -21,5 +13,3 @@ MOCHITEST_FILES = \ test_receive-blob.html \ file_binary-frames_wsh.py \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/content/canvas/compiledtest/Makefile.in b/content/canvas/compiledtest/Makefile.in index b1858fe42fb..21a557ce43e 100644 --- a/content/canvas/compiledtest/Makefile.in +++ b/content/canvas/compiledtest/Makefile.in @@ -2,15 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH := @DEPTH@ -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES := \ -I$(srcdir)/../src \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/content/canvas/src/Makefile.in b/content/canvas/src/Makefile.in index 98748a33051..8bc690245f7 100644 --- a/content/canvas/src/Makefile.in +++ b/content/canvas/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifdef MOZ_WEBGL LOCAL_INCLUDES += \ -I$(topsrcdir)/js/xpconnect/wrappers \ diff --git a/content/canvas/test/Makefile.in b/content/canvas/test/Makefile.in index 2af137464d6..a986b3c3935 100644 --- a/content/canvas/test/Makefile.in +++ b/content/canvas/test/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk MOCHITEST_FILES = \ android.json \ test_canvas.html \ @@ -215,4 +208,3 @@ endif # test_2d.path.rect.zero.6.html # split up into groups to work around command-line length limits -include $(topsrcdir)/config/rules.mk diff --git a/content/canvas/test/chrome/Makefile.in b/content/canvas/test/chrome/Makefile.in index 919dbb096a0..57ac61e050d 100644 --- a/content/canvas/test/chrome/Makefile.in +++ b/content/canvas/test/chrome/Makefile.in @@ -3,17 +3,7 @@ # License, v. 2.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_webgl_debug_renderer_info.html \ nonchrome_webgl_debug_renderer_info.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/content/canvas/test/crossorigin/Makefile.in b/content/canvas/test/crossorigin/Makefile.in index eea7f8c6940..b6ebbc9c83b 100644 --- a/content/canvas/test/crossorigin/Makefile.in +++ b/content/canvas/test/crossorigin/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk MOCHITEST_FILES = \ image-allow-credentials.png \ image-allow-credentials.png^headers^ \ @@ -21,5 +14,3 @@ MOCHITEST_FILES = \ video.sjs \ test_video_crossorigin.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/content/canvas/test/webgl/Makefile.in b/content/canvas/test/webgl/Makefile.in index dc56df908f1..493041643bb 100644 --- a/content/canvas/test/webgl/Makefile.in +++ b/content/canvas/test/webgl/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk MOCHITEST_FILES = \ test_webgl_conformance_test_suite.html \ 00_test_list.txt \ diff --git a/content/canvas/test/webgl/non-conf-tests/Makefile.in b/content/canvas/test/webgl/non-conf-tests/Makefile.in index 4f97d3bb43e..3a4a044e3ba 100644 --- a/content/canvas/test/webgl/non-conf-tests/Makefile.in +++ b/content/canvas/test/webgl/non-conf-tests/Makefile.in @@ -3,16 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_webgl_conformance.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/content/events/src/Makefile.in b/content/events/src/Makefile.in index 306dbedcb9c..0c18ec676b6 100644 --- a/content/events/src/Makefile.in +++ b/content/events/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk @@ -35,5 +28,3 @@ endif ifdef MOZ_JSDEBUGGER DEFINES += -DMOZ_JSDEBUGGER endif - - diff --git a/content/events/test/Makefile.in b/content/events/test/Makefile.in index 9e23d5e3cda..101678fee3c 100644 --- a/content/events/test/Makefile.in +++ b/content/events/test/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - # Disabled due to timeouts. # test_bug563329.html MOCHITEST_FILES = \ @@ -130,5 +122,3 @@ MOCHITEST_CHROME_FILES = \ file_bug679494.html \ test_eventctors.xul \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/content/html/content/src/Makefile.in b/content/html/content/src/Makefile.in index 1c989becd6c..1f56035a074 100644 --- a/content/html/content/src/Makefile.in +++ b/content/html/content/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/html/content/test/Makefile.in b/content/html/content/test/Makefile.in index b3fd1a328ec..a568955fd01 100644 --- a/content/html/content/test/Makefile.in +++ b/content/html/content/test/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_hidden.html \ test_bug589.html \ @@ -408,5 +400,3 @@ MOCHITEST_BROWSER_FILES = \ file_bug649778.html \ file_bug649778.html^headers^ \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/content/html/content/test/bug649134/Makefile.in b/content/html/content/test/bug649134/Makefile.in index dd3064c72a7..f159a1ec411 100644 --- a/content/html/content/test/bug649134/Makefile.in +++ b/content/html/content/test/bug649134/Makefile.in @@ -3,14 +3,4 @@ # License, v. 2.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 = file_bug649134-1.sjs file_bug649134-2.sjs index.html - -include $(topsrcdir)/config/rules.mk diff --git a/content/html/content/test/forms/Makefile.in b/content/html/content/test/forms/Makefile.in index 33ce3c226dc..6119d2385e0 100644 --- a/content/html/content/test/forms/Makefile.in +++ b/content/html/content/test/forms/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ save_restore_radio_groups.sjs \ test_save_restore_radio_groups.html \ @@ -69,6 +61,3 @@ MOCHITEST_FILES = \ test_restore_form_elements.html \ test_select_selectedOptions.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/content/html/document/src/Makefile.in b/content/html/document/src/Makefile.in index 4375a7ceac0..c9b334ae06c 100644 --- a/content/html/document/src/Makefile.in +++ b/content/html/document/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += \ diff --git a/content/html/document/test/Makefile.in b/content/html/document/test/Makefile.in index 1acffe5bf3c..9b559ee5fe5 100644 --- a/content/html/document/test/Makefile.in +++ b/content/html/document/test/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = test_bug1682.html \ test_bug1823.html \ test_bug57600.html \ @@ -80,5 +72,3 @@ MOCHITEST_BROWSER_FILES = \ browser_bug592641.js \ bug592641_img.jpg \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/content/mathml/content/src/Makefile.in b/content/mathml/content/src/Makefile.in index a7b35446231..747ee43fd49 100644 --- a/content/mathml/content/src/Makefile.in +++ b/content/mathml/content/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/media/Makefile.in b/content/media/Makefile.in index 6e472d619fe..1a1f4816a58 100644 --- a/content/media/Makefile.in +++ b/content/media/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/media/dash/Makefile.in b/content/media/dash/Makefile.in index 40c9391db93..d17d2cd9c9e 100644 --- a/content/media/dash/Makefile.in +++ b/content/media/dash/Makefile.in @@ -8,13 +8,6 @@ # Contributor(s): # Steve Workman -DEPTH := @DEPTH@ -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES := \ diff --git a/content/media/directshow/Makefile.in b/content/media/directshow/Makefile.in index ac6f8e15798..3e3764e6007 100644 --- a/content/media/directshow/Makefile.in +++ b/content/media/directshow/Makefile.in @@ -2,17 +2,8 @@ # License, v. 2.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 - LOCAL_INCLUDES += -I$(topsrcdir)/media/webrtc/trunk/webrtc/modules/video_capture/windows/ ifeq ($(OS_ARCH),WINNT) OS_CXXFLAGS += -DNOMINMAX endif - -include $(topsrcdir)/config/rules.mk diff --git a/content/media/gstreamer/Makefile.in b/content/media/gstreamer/Makefile.in index 73436052c9c..0de1a7f30c7 100644 --- a/content/media/gstreamer/Makefile.in +++ b/content/media/gstreamer/Makefile.in @@ -2,12 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk CFLAGS += $(GSTREAMER_CFLAGS) @@ -18,4 +12,3 @@ INCLUDES += \ -I$(srcdir)/../../base/src \ -I$(srcdir)/../../html/content/src \ $(NULL) - diff --git a/content/media/mediasource/Makefile.in b/content/media/mediasource/Makefile.in index e1a22d0a52e..6fbe8159b2d 100644 --- a/content/media/mediasource/Makefile.in +++ b/content/media/mediasource/Makefile.in @@ -1,11 +1,3 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -include $(DEPTH)/config/autoconf.mk - -include $(topsrcdir)/config/rules.mk diff --git a/content/media/mediasource/test/Makefile.in b/content/media/mediasource/test/Makefile.in index cc414808a8f..a3cdbdd9535 100644 --- a/content/media/mediasource/test/Makefile.in +++ b/content/media/mediasource/test/Makefile.in @@ -2,17 +2,7 @@ # License, v. 2.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 = \ test_MediaSource.html \ seek.webm \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/content/media/omx/Makefile.in b/content/media/omx/Makefile.in index 4f36f04040c..71bdeafdcac 100644 --- a/content/media/omx/Makefile.in +++ b/content/media/omx/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/media/omx/mediaresourcemanager/Makefile.in b/content/media/omx/mediaresourcemanager/Makefile.in index 726aaed1dbd..6d87be4e4b7 100644 --- a/content/media/omx/mediaresourcemanager/Makefile.in +++ b/content/media/omx/mediaresourcemanager/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/content/media/plugins/Makefile.in b/content/media/plugins/Makefile.in index 28f33d995a1..9e99f02e7a4 100644 --- a/content/media/plugins/Makefile.in +++ b/content/media/plugins/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/content/media/raw/Makefile.in b/content/media/raw/Makefile.in index 480a76049b5..3a768f87d4c 100644 --- a/content/media/raw/Makefile.in +++ b/content/media/raw/Makefile.in @@ -3,13 +3,6 @@ # 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 INCLUDES += \ diff --git a/content/media/test/Makefile.in b/content/media/test/Makefile.in index af006d80e26..69dabcf6f12 100644 --- a/content/media/test/Makefile.in +++ b/content/media/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - # Media tests should be backend independent, i.e., not conditioned on # MOZ_OGG, MOZ_WAVE etc. (The only exception is the can_play_type tests, # which necessarily depend on the backend(s) configured.) As far as possible, @@ -402,5 +394,3 @@ MOCHITEST_FILES += \ test_can_play_type_no_wave.html \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk diff --git a/content/media/webaudio/Makefile.in b/content/media/webaudio/Makefile.in index a95152ffc10..deb6de83a14 100644 --- a/content/media/webaudio/Makefile.in +++ b/content/media/webaudio/Makefile.in @@ -2,12 +2,5 @@ # License, v. 2.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)/ipc/chromium/chromium-config.mk diff --git a/content/media/webaudio/blink/Makefile.in b/content/media/webaudio/blink/Makefile.in index 1354f2bea29..83afbee18fa 100644 --- a/content/media/webaudio/blink/Makefile.in +++ b/content/media/webaudio/blink/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH := @DEPTH@ -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES += -I$(topsrcdir)/content/media/webaudio include $(topsrcdir)/config/rules.mk diff --git a/content/media/webaudio/compiledtest/Makefile.in b/content/media/webaudio/compiledtest/Makefile.in index 4dd0d37710f..216794ce45f 100644 --- a/content/media/webaudio/compiledtest/Makefile.in +++ b/content/media/webaudio/compiledtest/Makefile.in @@ -2,14 +2,4 @@ # License, v. 2.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 - LOCAL_INCLUDES := -I$(srcdir)/.. - -include $(topsrcdir)/config/rules.mk diff --git a/content/media/webaudio/test/Makefile.in b/content/media/webaudio/test/Makefile.in index afeb3635d2c..266d9349bbc 100644 --- a/content/media/webaudio/test/Makefile.in +++ b/content/media/webaudio/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH := @DEPTH@ -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ audioBufferSourceNodeNeutered_worker.js \ webaudio.js \ @@ -125,5 +117,3 @@ MOCHITEST_FILES += \ test_pannerNodeChannelCount.html \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk diff --git a/content/media/webaudio/test/blink/Makefile.in b/content/media/webaudio/test/blink/Makefile.in index e03f5c3ca7c..2bcd407874d 100644 --- a/content/media/webaudio/test/blink/Makefile.in +++ b/content/media/webaudio/test/blink/Makefile.in @@ -2,19 +2,8 @@ # License, v. 2.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 := \ audio-testing.js \ convolution-testing.js \ panner-model-testing.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/content/media/webm/Makefile.in b/content/media/webm/Makefile.in index 47ea451c6b0..019e248764e 100644 --- a/content/media/webm/Makefile.in +++ b/content/media/webm/Makefile.in @@ -2,12 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/content/media/webrtc/Makefile.in b/content/media/webrtc/Makefile.in index 791a46e2bd4..75780e0a139 100644 --- a/content/media/webrtc/Makefile.in +++ b/content/media/webrtc/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifeq ($(OS_ARCH),WINNT) OS_CXXFLAGS += -DNOMINMAX endif diff --git a/content/media/webspeech/recognition/Makefile.in b/content/media/webspeech/recognition/Makefile.in index 1c9ea07715a..3f305e82a0a 100644 --- a/content/media/webspeech/recognition/Makefile.in +++ b/content/media/webspeech/recognition/Makefile.in @@ -2,12 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH := @DEPTH@ -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ - -include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/dom/dom-config.mk VPATH += \ diff --git a/content/media/webspeech/recognition/test/Makefile.in b/content/media/webspeech/recognition/test/Makefile.in index 7fe87335ddd..fb203e17c31 100644 --- a/content/media/webspeech/recognition/test/Makefile.in +++ b/content/media/webspeech/recognition/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH := @DEPTH@ -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ head.js \ test_success_without_recognition_service.html \ @@ -23,5 +15,3 @@ MOCHITEST_FILES := \ hello.ogg \ silence.ogg \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/content/media/webspeech/synth/Makefile.in b/content/media/webspeech/synth/Makefile.in index b5c8b166988..09e9152cb25 100644 --- a/content/media/webspeech/synth/Makefile.in +++ b/content/media/webspeech/synth/Makefile.in @@ -2,11 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH := @DEPTH@ -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/dom/dom-config.mk VPATH += \ diff --git a/content/media/webspeech/synth/ipc/test/Makefile.in b/content/media/webspeech/synth/ipc/test/Makefile.in index 75e57214af5..c05e0acbb7c 100644 --- a/content/media/webspeech/synth/ipc/test/Makefile.in +++ b/content/media/webspeech/synth/ipc/test/Makefile.in @@ -2,16 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH := @DEPTH@ -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_ipc.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/content/media/webspeech/synth/test/Makefile.in b/content/media/webspeech/synth/test/Makefile.in index 61b11f61d57..482e257c03e 100644 --- a/content/media/webspeech/synth/test/Makefile.in +++ b/content/media/webspeech/synth/test/Makefile.in @@ -2,19 +2,9 @@ # License, v. 2.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 := \ common.js \ test_setup.html \ test_speech_simple.html \ test_speech_queue.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/content/media/wmf/Makefile.in b/content/media/wmf/Makefile.in index 1185c8b7f81..64225645225 100644 --- a/content/media/wmf/Makefile.in +++ b/content/media/wmf/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -include $(DEPTH)/config/autoconf.mk - ifeq ($(OS_ARCH),WINNT) OS_CXXFLAGS += -DNOMINMAX endif - -include $(topsrcdir)/config/rules.mk diff --git a/content/smil/Makefile.in b/content/smil/Makefile.in index 6168d72cbfb..e127ed31561 100644 --- a/content/smil/Makefile.in +++ b/content/smil/Makefile.in @@ -3,17 +3,8 @@ # License, v. 2.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 - LOCAL_INCLUDES += \ -I$(srcdir)/../base/src \ -I$(srcdir)/../../layout/style \ -I$(srcdir)/../events/src \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/content/smil/test/Makefile.in b/content/smil/test/Makefile.in index 6278a0c8f08..3c45c87a07a 100644 --- a/content/smil/test/Makefile.in +++ b/content/smil/test/Makefile.in @@ -1,14 +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@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ db_smilAnimateMotion.js \ db_smilCSSFromBy.js \ @@ -63,5 +55,3 @@ MOCHITEST_FILES = \ # Tests disabled due to intermittent orange # test_smilCSSInherit.xhtml disabled until bug 501183 is fixed - -include $(topsrcdir)/config/rules.mk diff --git a/content/svg/content/src/Makefile.in b/content/svg/content/src/Makefile.in index c3d3f208a76..4e8488e1e65 100644 --- a/content/svg/content/src/Makefile.in +++ b/content/svg/content/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/svg/content/test/Makefile.in b/content/svg/content/test/Makefile.in index 20f8d95172f..40675731e52 100644 --- a/content/svg/content/test/Makefile.in +++ b/content/svg/content/test/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - # Disabled: # bbox-helper.svg \ # test_length.xhtml \ @@ -104,5 +96,3 @@ MOCHITEST_FILES += \ test_text.html \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk diff --git a/content/svg/document/src/Makefile.in b/content/svg/document/src/Makefile.in index ea1a3ada93a..fe72b0d45a8 100644 --- a/content/svg/document/src/Makefile.in +++ b/content/svg/document/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/content/xbl/src/Makefile.in b/content/xbl/src/Makefile.in index 25228a20733..a0f13f47b16 100644 --- a/content/xbl/src/Makefile.in +++ b/content/xbl/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/content/xbl/test/Makefile.in b/content/xbl/test/Makefile.in index bdd598ef1aa..ceefdeac553 100644 --- a/content/xbl/test/Makefile.in +++ b/content/xbl/test/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_bug310107.html \ bug310107-resource.xhtml \ @@ -54,6 +46,3 @@ MOCHITEST_CHROME_FILES = \ test_bug723676.xul \ test_bug772966.xul \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/content/xml/content/src/Makefile.in b/content/xml/content/src/Makefile.in index 120edb1a03d..0b7085f0027 100644 --- a/content/xml/content/src/Makefile.in +++ b/content/xml/content/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/content/xml/document/src/Makefile.in b/content/xml/document/src/Makefile.in index 641b20a1329..0bdbcd70a1e 100644 --- a/content/xml/document/src/Makefile.in +++ b/content/xml/document/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/content/xml/document/test/Makefile.in b/content/xml/document/test/Makefile.in index 659cc9f26a0..ab5b8d236cf 100644 --- a/content/xml/document/test/Makefile.in +++ b/content/xml/document/test/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = test_bug232004.xhtml \ test_bug343870.xhtml \ test_bug355213.xhtml \ @@ -23,5 +15,3 @@ MOCHITEST_FILES = test_bug232004.xhtml \ file_bug293347xslt.xml \ test_bug691215.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/content/xslt/src/base/Makefile.in b/content/xslt/src/base/Makefile.in index e6de70ac28e..c967747abe0 100644 --- a/content/xslt/src/base/Makefile.in +++ b/content/xslt/src/base/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/content/xslt/src/xml/Makefile.in b/content/xslt/src/xml/Makefile.in index 1eaa5430e0a..225e6c8041d 100644 --- a/content/xslt/src/xml/Makefile.in +++ b/content/xslt/src/xml/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/content/xslt/src/xpath/Makefile.in b/content/xslt/src/xpath/Makefile.in index 0155c256288..462cf326fc8 100644 --- a/content/xslt/src/xpath/Makefile.in +++ b/content/xslt/src/xpath/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/content/xslt/src/xslt/Makefile.in b/content/xslt/src/xslt/Makefile.in index a61c3bd47f2..2388cc5d542 100644 --- a/content/xslt/src/xslt/Makefile.in +++ b/content/xslt/src/xslt/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # For nsDependentJSString LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/base \ diff --git a/content/xslt/tests/mochitest/Makefile.in b/content/xslt/tests/mochitest/Makefile.in index 448cdc08bf2..8c8985713ed 100644 --- a/content/xslt/tests/mochitest/Makefile.in +++ b/content/xslt/tests/mochitest/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = test_bug319374.xhtml \ test_bug440974.html \ test_bug427060.html \ @@ -26,5 +18,3 @@ MOCHITEST_FILES = test_bug319374.xhtml \ test_bug667315.html \ test_exslt_regex.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/content/xul/content/src/Makefile.in b/content/xul/content/src/Makefile.in index 7014a593e37..385bcdf8e44 100644 --- a/content/xul/content/src/Makefile.in +++ b/content/xul/content/src/Makefile.in @@ -3,12 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/content/xul/content/test/Makefile.in b/content/xul/content/test/Makefile.in index 9bad08f59cb..284740a736b 100644 --- a/content/xul/content/test/Makefile.in +++ b/content/xul/content/test/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_bug486990.xul \ test_bug749367.xul \ @@ -24,5 +16,3 @@ MOCHITEST_CHROME_FILES = \ 398289-resource.xul \ test_bug775972.xul \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/content/xul/document/src/Makefile.in b/content/xul/document/src/Makefile.in index c07f9df66df..f956dda749a 100644 --- a/content/xul/document/src/Makefile.in +++ b/content/xul/document/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = -I$(srcdir)/../../../base/src \ diff --git a/content/xul/document/test/Makefile.in b/content/xul/document/test/Makefile.in index 4225d36dde2..96baab5ceb3 100644 --- a/content/xul/document/test/Makefile.in +++ b/content/xul/document/test/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_CHROME_FILES = \ test_bug311681.xul \ test_bug199692.xul \ @@ -31,5 +23,3 @@ MOCHITEST_CHROME_FILES = \ test_bug757137.xul \ window_bug757137.xul \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/content/xul/templates/src/Makefile.in b/content/xul/templates/src/Makefile.in index c2bd2f9eb94..390009456a5 100644 --- a/content/xul/templates/src/Makefile.in +++ b/content/xul/templates/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = -I$(srcdir)/../../../base/src \ diff --git a/content/xul/templates/tests/chrome/Makefile.in b/content/xul/templates/tests/chrome/Makefile.in index 4b6564e7865..7de93d10b5d 100644 --- a/content/xul/templates/tests/chrome/Makefile.in +++ b/content/xul/templates/tests/chrome/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - # NOTE: it is important that the first test of the test_tmpl_* tests here use # datasources="rdf:null" to ensure that the real animals.rdf datasource # can be synchronously loaded before the tests run. @@ -242,5 +234,3 @@ MOCHITEST_CHROME_FILES += \ endif # test_bug397148.xul is disabled because it leaks. See bug 879531. - -include $(topsrcdir)/config/rules.mk diff --git a/db/sqlite3/src/Makefile.in b/db/sqlite3/src/Makefile.in index 88a2cfe36b8..347386cb046 100644 --- a/db/sqlite3/src/Makefile.in +++ b/db/sqlite3/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - SHORT_LIBNAME = mozsqlt3 ifdef MOZ_FOLD_LIBS FORCE_STATIC_LIB = 1 diff --git a/docshell/base/Makefile.in b/docshell/base/Makefile.in index 45d725053d8..2cee589292a 100644 --- a/docshell/base/Makefile.in +++ b/docshell/base/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifdef MOZ_TOOLKIT_SEARCH DEFINES += -DMOZ_TOOLKIT_SEARCH endif diff --git a/docshell/build/Makefile.in b/docshell/build/Makefile.in index c782b215d3e..4b2b8c1c3b7 100644 --- a/docshell/build/Makefile.in +++ b/docshell/build/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 SHARED_LIBRARY_LIBS= \ ../base/$(LIB_PREFIX)basedocshell_s.$(LIB_SUFFIX) \ diff --git a/docshell/shistory/src/Makefile.in b/docshell/shistory/src/Makefile.in index d1c664f3fdc..4d38db3ec62 100644 --- a/docshell/shistory/src/Makefile.in +++ b/docshell/shistory/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += -I$(srcdir)/../../base diff --git a/docshell/test/Makefile.in b/docshell/test/Makefile.in index 82a30bdacb3..07b7788272e 100644 --- a/docshell/test/Makefile.in +++ b/docshell/test/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_bug123696.html \ bug123696-subframe.html \ @@ -90,5 +82,3 @@ MOCHITEST_FILES += \ file_bug511449.html \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk diff --git a/docshell/test/browser/Makefile.in b/docshell/test/browser/Makefile.in index 7e8a6c33eb8..7b4b5704e76 100644 --- a/docshell/test/browser/Makefile.in +++ b/docshell/test/browser/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_BROWSER_FILES = \ browser_bug92473.js \ test-form_sjis.html \ @@ -72,5 +64,3 @@ MOCHITEST_BROWSER_FILES = \ browser_loadURI.js \ print_postdata.sjs \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/docshell/test/chrome/Makefile.in b/docshell/test/chrome/Makefile.in index d70590afc4b..c89231657a6 100644 --- a/docshell/test/chrome/Makefile.in +++ b/docshell/test/chrome/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ bug89419.sjs \ blue.png \ @@ -111,5 +103,3 @@ MOCHITEST_CHROME_FILES += \ else $(filter disabled-temporarily--bug-684176, test_bug454235.xul) endif - -include $(topsrcdir)/config/rules.mk diff --git a/docshell/test/navigation/Makefile.in b/docshell/test/navigation/Makefile.in index f8162b9b7e8..87b0311b9a6 100644 --- a/docshell/test/navigation/Makefile.in +++ b/docshell/test/navigation/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_bug13871.html \ test_bug344861.html \ @@ -62,5 +54,3 @@ MOCHITEST_BROWSER_FILES = \ bug343515_pg3_2.html \ bug343515_pg3_1_1.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/activities/src/Makefile.in b/dom/activities/src/Makefile.in index c66470e81eb..7515f97e0f9 100644 --- a/dom/activities/src/Makefile.in +++ b/dom/activities/src/Makefile.in @@ -2,13 +2,4 @@ # License, v. 2.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)/dom/dom-config.mk - -include $(topsrcdir)/config/rules.mk diff --git a/dom/alarm/Makefile.in b/dom/alarm/Makefile.in index d12fb1ba7d1..f003358eae2 100644 --- a/dom/alarm/Makefile.in +++ b/dom/alarm/Makefile.in @@ -2,16 +2,8 @@ # License, v. 2.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)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk - diff --git a/dom/alarm/test/Makefile.in b/dom/alarm/test/Makefile.in index 2c1e5307005..09d714856fc 100644 --- a/dom/alarm/test/Makefile.in +++ b/dom/alarm/test/Makefile.in @@ -2,15 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_alarm_add_data.html \ test_alarm_add_date.html \ @@ -19,5 +10,3 @@ MOCHITEST_FILES = \ test_alarm_permitted_app.html \ test_alarm_remove.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/apps/tests/Makefile.in b/dom/apps/tests/Makefile.in index b4adc4a47eb..1b7d924c8d5 100644 --- a/dom/apps/tests/Makefile.in +++ b/dom/apps/tests/Makefile.in @@ -2,15 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ file_app.sjs \ file_app.template.html \ @@ -27,5 +18,3 @@ MOCHITEST_FILES = \ MOCHITEST_CHROME_FILES = \ test_apps_service.xul \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/audiochannel/Makefile.in b/dom/audiochannel/Makefile.in index dc8fbba1144..077c79054d5 100644 --- a/dom/audiochannel/Makefile.in +++ b/dom/audiochannel/Makefile.in @@ -12,14 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -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 - diff --git a/dom/base/Makefile.in b/dom/base/Makefile.in index 0149114f57e..7dd3b84d478 100644 --- a/dom/base/Makefile.in +++ b/dom/base/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/dom/dom-config.mk ifdef MOZ_JSDEBUGGER @@ -36,4 +29,3 @@ ifdef MOZ_X11 CXXFLAGS += $(TK_CFLAGS) LDFLAGS += $(TK_LIBS) endif - diff --git a/dom/base/test/Makefile.in b/dom/base/test/Makefile.in index ce958603263..8b1c20cc679 100644 --- a/dom/base/test/Makefile.in +++ b/dom/base/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_constructor.html \ test_constructor-assignment.html \ @@ -50,6 +42,3 @@ MOCHITEST_CHROME_FILES = \ test_bug715041_removal.xul \ test_domrequesthelper.xul \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/dom/battery/Makefile.in b/dom/battery/Makefile.in index 4617b496c6b..8f74d461bd8 100644 --- a/dom/battery/Makefile.in +++ b/dom/battery/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/dom/dom-config.mk LOCAL_INCLUDES = \ @@ -17,4 +10,3 @@ LOCAL_INCLUDES = \ include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk - diff --git a/dom/battery/test/Makefile.in b/dom/battery/test/Makefile.in index 9544efb8d74..196c3a32116 100644 --- a/dom/battery/test/Makefile.in +++ b/dom/battery/test/Makefile.in @@ -2,17 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_battery_basics.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/bindings/Makefile.in b/dom/bindings/Makefile.in index 78b39789502..28ff3288958 100644 --- a/dom/bindings/Makefile.in +++ b/dom/bindings/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 # Need this to find all our DOM source files. diff --git a/dom/bindings/test/Makefile.in b/dom/bindings/test/Makefile.in index 671563c84f2..a7049fab3e3 100644 --- a/dom/bindings/test/Makefile.in +++ b/dom/bindings/test/Makefile.in @@ -2,12 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - # Do NOT export this library. We don't actually want our test code # being added to libxul or anything. @@ -16,8 +10,6 @@ ifdef .PYMAKE .NOTPARALLEL: endif -include $(DEPTH)/config/autoconf.mk - # Need this to find all our DOM source files. include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/bluetooth/Makefile.in b/dom/bluetooth/Makefile.in index 9e0a3fe0387..51c58e312a2 100644 --- a/dom/bluetooth/Makefile.in +++ b/dom/bluetooth/Makefile.in @@ -12,11 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/dom/dom-config.mk VPATH += $(srcdir)/ipc diff --git a/dom/browser-element/Makefile.in b/dom/browser-element/Makefile.in index b1c673e3534..f8c20282de6 100644 --- a/dom/browser-element/Makefile.in +++ b/dom/browser-element/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/browser-element/mochitest/Makefile.in b/dom/browser-element/mochitest/Makefile.in index e93fc24b781..7aadd852ca8 100644 --- a/dom/browser-element/mochitest/Makefile.in +++ b/dom/browser-element/mochitest/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - # Note: browserElementTestHelpers.js looks at the test's filename to determine # whether the test should be OOP. "_oop_" signals OOP, "_inproc_" signals in # process. Default is OOP. @@ -248,5 +240,3 @@ MOCHITEST_FILES += \ $(NULL) endif #} - -include $(topsrcdir)/config/rules.mk diff --git a/dom/browser-element/mochitest/priority/Makefile.in b/dom/browser-element/mochitest/priority/Makefile.in index 2a81792004e..2dc0f1eb455 100644 --- a/dom/browser-element/mochitest/priority/Makefile.in +++ b/dom/browser-element/mochitest/priority/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - # Note: ../browserElementTestHelpers.js makes all tests in this directory OOP, # because testing the process-priority manager without OOP frames doesn't make # much sense. @@ -44,5 +36,3 @@ MOCHITEST_FILES = \ $(NULL) endif # MOZ_WIDGET_TOOLKIT == gtk2 - -include $(topsrcdir)/config/rules.mk diff --git a/dom/camera/Makefile.in b/dom/camera/Makefile.in index b2e44d42139..b9fbdbd6790 100644 --- a/dom/camera/Makefile.in +++ b/dom/camera/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk - diff --git a/dom/cellbroadcast/interfaces/Makefile.in b/dom/cellbroadcast/interfaces/Makefile.in index 143590c476a..e2f1f0e3373 100644 --- a/dom/cellbroadcast/interfaces/Makefile.in +++ b/dom/cellbroadcast/interfaces/Makefile.in @@ -2,14 +2,4 @@ # License, v. 2.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)/dom/dom-config.mk - -include $(topsrcdir)/config/rules.mk - diff --git a/dom/cellbroadcast/src/Makefile.in b/dom/cellbroadcast/src/Makefile.in index db4cf4d7802..e2f1f0e3373 100644 --- a/dom/cellbroadcast/src/Makefile.in +++ b/dom/cellbroadcast/src/Makefile.in @@ -2,13 +2,4 @@ # License, v. 2.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)/dom/dom-config.mk - -include $(topsrcdir)/config/rules.mk diff --git a/dom/contacts/Makefile.in b/dom/contacts/Makefile.in index 26ae0e001f1..b749a12b07a 100644 --- a/dom/contacts/Makefile.in +++ b/dom/contacts/Makefile.in @@ -2,14 +2,4 @@ # License, v. 2.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 - VPATH += $(srcdir)/fallback - - -include $(topsrcdir)/config/rules.mk diff --git a/dom/contacts/tests/Makefile.in b/dom/contacts/tests/Makefile.in index 4a852707d67..49f05df0371 100644 --- a/dom/contacts/tests/Makefile.in +++ b/dom/contacts/tests/Makefile.in @@ -2,15 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_contacts_basics.html \ test_contacts_substringmatching.html \ @@ -24,5 +15,3 @@ MOCHITEST_FILES = \ MOCHITEST_CHROME_FILES = \ test_contacts_upgrade.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/devicestorage/Makefile.in b/dom/devicestorage/Makefile.in index a3edba0dfda..f99d6690dc0 100644 --- a/dom/devicestorage/Makefile.in +++ b/dom/devicestorage/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/dom/dom-config.mk LOCAL_INCLUDES = \ diff --git a/dom/devicestorage/ipc/Makefile.in b/dom/devicestorage/ipc/Makefile.in index 456b4c181d9..15ec08c6940 100644 --- a/dom/devicestorage/ipc/Makefile.in +++ b/dom/devicestorage/ipc/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_ipc.html \ ../test/devicestorage_common.js \ diff --git a/dom/devicestorage/test/Makefile.in b/dom/devicestorage/test/Makefile.in index 4bbc9569125..eaaace82332 100644 --- a/dom/devicestorage/test/Makefile.in +++ b/dom/devicestorage/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - # man, our mime database sucks hard. followup bug # 788273 # test_add.html \ @@ -39,5 +31,3 @@ MOCHITEST_FILES = \ MOCHITEST_CHROME_FILES =\ test_app_permissions.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/encoding/Makefile.in b/dom/encoding/Makefile.in index 7311ab1eac3..8cb2fa41282 100644 --- a/dom/encoding/Makefile.in +++ b/dom/encoding/Makefile.in @@ -2,12 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES = \ -I$(topsrcdir)/intl/locale/src \ $(NULL) diff --git a/dom/encoding/test/Makefile.in b/dom/encoding/test/Makefile.in index d1834d419df..703c0cafea2 100644 --- a/dom/encoding/test/Makefile.in +++ b/dom/encoding/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ file_utf16_be_bom.css \ file_utf16_be_bom.js \ @@ -33,6 +25,3 @@ MOCHITEST_CHROME_FILES = \ file_stringencoding.jsm \ test_stringencoding.xul \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/dom/encoding/test/unit/Makefile.in b/dom/encoding/test/unit/Makefile.in index 19a4ed53e1e..a78f8915261 100644 --- a/dom/encoding/test/unit/Makefile.in +++ b/dom/encoding/test/unit/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_big5.js \ test_euc-jp.js \ @@ -21,6 +13,3 @@ MOCHITEST_FILES = \ test_shift_jis.js \ test_singlebytes.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/dom/file/Makefile.in b/dom/file/Makefile.in index 4ddef56abb7..7515f97e0f9 100644 --- a/dom/file/Makefile.in +++ b/dom/file/Makefile.in @@ -2,14 +2,4 @@ # License, v. 2.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)/dom/dom-config.mk - -include $(topsrcdir)/config/rules.mk - diff --git a/dom/file/test/Makefile.in b/dom/file/test/Makefile.in index 6680087680b..f1c44f8e000 100644 --- a/dom/file/test/Makefile.in +++ b/dom/file/test/Makefile.in @@ -2,15 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - - MOCHITEST_FILES = \ dummy_worker.js \ helpers.js \ @@ -34,5 +25,3 @@ MOCHITEST_FILES = \ test_archivereader_nonUnicode.html \ test_bug_793311.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/fmradio/ipc/Makefile.in b/dom/fmradio/ipc/Makefile.in index d38a9c659ea..4d9c311a21d 100644 --- a/dom/fmradio/ipc/Makefile.in +++ b/dom/fmradio/ipc/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/fmradio \ $(NULL) diff --git a/dom/gamepad/Makefile.in b/dom/gamepad/Makefile.in index 8c7bfb43ee3..9f4779b1fd1 100644 --- a/dom/gamepad/Makefile.in +++ b/dom/gamepad/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/base \ $(NULL) diff --git a/dom/icc/interfaces/Makefile.in b/dom/icc/interfaces/Makefile.in index db4cf4d7802..e2f1f0e3373 100644 --- a/dom/icc/interfaces/Makefile.in +++ b/dom/icc/interfaces/Makefile.in @@ -2,13 +2,4 @@ # License, v. 2.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)/dom/dom-config.mk - -include $(topsrcdir)/config/rules.mk diff --git a/dom/icc/src/Makefile.in b/dom/icc/src/Makefile.in index 8979fb75e30..6382981f40c 100644 --- a/dom/icc/src/Makefile.in +++ b/dom/icc/src/Makefile.in @@ -2,13 +2,8 @@ # License, v. 2.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)/dom/dom-config.mk LOCAL_INCLUDES = \ diff --git a/dom/imptests/Makefile.in b/dom/imptests/Makefile.in index 332c8967f76..68f5e1f84e4 100644 --- a/dom/imptests/Makefile.in +++ b/dom/imptests/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk _SUPPORT_FILES = \ diff --git a/dom/imptests/editing/Makefile.in b/dom/imptests/editing/Makefile.in index 3e2b767f154..399d16387f0 100644 --- a/dom/imptests/editing/Makefile.in +++ b/dom/imptests/editing/Makefile.in @@ -1,17 +1,6 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ implementation.js \ tests.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/editing/conformancetest/Makefile.in b/dom/imptests/editing/conformancetest/Makefile.in index a2254f39b0f..455d0484657 100644 --- a/dom/imptests/editing/conformancetest/Makefile.in +++ b/dom/imptests/editing/conformancetest/Makefile.in @@ -1,18 +1,7 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_runtest.html \ test_event.html \ data.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/editing/css/Makefile.in b/dom/imptests/editing/css/Makefile.in index cfea7135021..12ca918f6e0 100644 --- a/dom/imptests/editing/css/Makefile.in +++ b/dom/imptests/editing/css/Makefile.in @@ -1,16 +1,5 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ reset.css \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/editing/selecttest/Makefile.in b/dom/imptests/editing/selecttest/Makefile.in index d9422e2f0b5..d4e6e5c5d38 100644 --- a/dom/imptests/editing/selecttest/Makefile.in +++ b/dom/imptests/editing/selecttest/Makefile.in @@ -1,14 +1,5 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_addRange.html \ test_collapse.html \ @@ -25,5 +16,3 @@ MOCHITEST_FILES := \ common.js \ test-iframe.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/failures/editing/conformancetest/Makefile.in b/dom/imptests/failures/editing/conformancetest/Makefile.in index 37c8e1aebf4..218c577cea4 100644 --- a/dom/imptests/failures/editing/conformancetest/Makefile.in +++ b/dom/imptests/failures/editing/conformancetest/Makefile.in @@ -1,17 +1,6 @@ # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_event.html.json \ test_runtest.html.json \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/failures/editing/selecttest/Makefile.in b/dom/imptests/failures/editing/selecttest/Makefile.in index 49b8cc388c6..8f85b1a0fa2 100644 --- a/dom/imptests/failures/editing/selecttest/Makefile.in +++ b/dom/imptests/failures/editing/selecttest/Makefile.in @@ -1,14 +1,5 @@ # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_Document-open.html.json \ test_addRange.html.json \ @@ -20,5 +11,3 @@ MOCHITEST_FILES := \ test_removeAllRanges.html.json \ test_selectAllChildren.html.json \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/failures/html/html/browsers/the-window-object/Makefile.in b/dom/imptests/failures/html/html/browsers/the-window-object/Makefile.in index 07a684ce2e3..f9295f7b94a 100644 --- a/dom/imptests/failures/html/html/browsers/the-window-object/Makefile.in +++ b/dom/imptests/failures/html/html/browsers/the-window-object/Makefile.in @@ -1,19 +1,8 @@ # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_window-indexed-properties-strict.html.json \ test_window-named-properties.html.json \ test_window-properties.html.json \ test_window-prototype-chain.html.json \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/failures/html/html/browsers/the-window-object/named-access-on-the-window-object/Makefile.in b/dom/imptests/failures/html/html/browsers/the-window-object/named-access-on-the-window-object/Makefile.in index 6c93e82a57e..e39212aa6b5 100644 --- a/dom/imptests/failures/html/html/browsers/the-window-object/named-access-on-the-window-object/Makefile.in +++ b/dom/imptests/failures/html/html/browsers/the-window-object/named-access-on-the-window-object/Makefile.in @@ -1,16 +1,5 @@ # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_window-null-names.html.json \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/failures/html/html/dom/documents/dta/Makefile.in b/dom/imptests/failures/html/html/dom/documents/dta/Makefile.in index 4ebdbee44f8..b949a10c5af 100644 --- a/dom/imptests/failures/html/html/dom/documents/dta/Makefile.in +++ b/dom/imptests/failures/html/html/dom/documents/dta/Makefile.in @@ -1,14 +1,5 @@ # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_document.title-03.html.json \ test_document.title-04.xhtml.json \ @@ -20,5 +11,3 @@ MOCHITEST_FILES := \ test_nameditem-05.html.json \ test_nameditem-06.html.json \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/failures/html/html/dom/documents/dta/doc.gEBN/Makefile.in b/dom/imptests/failures/html/html/dom/documents/dta/doc.gEBN/Makefile.in index 15eaf7d9abd..3c8a25612c0 100644 --- a/dom/imptests/failures/html/html/dom/documents/dta/doc.gEBN/Makefile.in +++ b/dom/imptests/failures/html/html/dom/documents/dta/doc.gEBN/Makefile.in @@ -1,16 +1,5 @@ # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_document.getElementsByName-newelements.html.json \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/failures/html/html/dom/elements/global-attributes/Makefile.in b/dom/imptests/failures/html/html/dom/elements/global-attributes/Makefile.in index b8ea9e84c4f..f34e6ea4b7f 100644 --- a/dom/imptests/failures/html/html/dom/elements/global-attributes/Makefile.in +++ b/dom/imptests/failures/html/html/dom/elements/global-attributes/Makefile.in @@ -1,16 +1,5 @@ # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_document-dir.html.json \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/failures/html/html/obsolete/implreq/oeaaa/Makefile.in b/dom/imptests/failures/html/html/obsolete/implreq/oeaaa/Makefile.in index ce00e971a53..21ff5b4e68c 100644 --- a/dom/imptests/failures/html/html/obsolete/implreq/oeaaa/Makefile.in +++ b/dom/imptests/failures/html/html/obsolete/implreq/oeaaa/Makefile.in @@ -1,16 +1,5 @@ # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_script-IDL-event-htmlfor.html.json \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/failures/html/html/semantics/forms/the-form-element/Makefile.in b/dom/imptests/failures/html/html/semantics/forms/the-form-element/Makefile.in index 750dfcde1c0..38434b4d32a 100644 --- a/dom/imptests/failures/html/html/semantics/forms/the-form-element/Makefile.in +++ b/dom/imptests/failures/html/html/semantics/forms/the-form-element/Makefile.in @@ -1,17 +1,6 @@ # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_form-elements-interfaces-01.html.json \ test_form-elements-nameditem-01.html.json \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/failures/html/html/semantics/forms/the-option-element/Makefile.in b/dom/imptests/failures/html/html/semantics/forms/the-option-element/Makefile.in index d798ea45ac0..bbc6c9737cd 100644 --- a/dom/imptests/failures/html/html/semantics/forms/the-option-element/Makefile.in +++ b/dom/imptests/failures/html/html/semantics/forms/the-option-element/Makefile.in @@ -1,16 +1,5 @@ # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_option-text-spaces.html.json \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/failures/html/html/semantics/forms/the-select-element/Makefile.in b/dom/imptests/failures/html/html/semantics/forms/the-select-element/Makefile.in index bf8a42a386b..db3bd060e91 100644 --- a/dom/imptests/failures/html/html/semantics/forms/the-select-element/Makefile.in +++ b/dom/imptests/failures/html/html/semantics/forms/the-select-element/Makefile.in @@ -1,16 +1,5 @@ # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_select-remove.html.json \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/failures/html/html/semantics/scripting-1/the-script-element/Makefile.in b/dom/imptests/failures/html/html/semantics/scripting-1/the-script-element/Makefile.in index 8dbbab57679..f7a8f2610b4 100644 --- a/dom/imptests/failures/html/html/semantics/scripting-1/the-script-element/Makefile.in +++ b/dom/imptests/failures/html/html/semantics/scripting-1/the-script-element/Makefile.in @@ -1,19 +1,8 @@ # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_script-for-event.html.json \ test_script-language-type.html.json \ test_script-languages-01.html.json \ test_script-languages-02.html.json \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/failures/html/html/semantics/tabular-data/the-table-element/Makefile.in b/dom/imptests/failures/html/html/semantics/tabular-data/the-table-element/Makefile.in index 4ea8cb30c74..4d60e7f4d8c 100644 --- a/dom/imptests/failures/html/html/semantics/tabular-data/the-table-element/Makefile.in +++ b/dom/imptests/failures/html/html/semantics/tabular-data/the-table-element/Makefile.in @@ -1,17 +1,6 @@ # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_table-insertRow.html.json \ test_table-rows.html.json \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/failures/html/html/webappapis/atob/Makefile.in b/dom/imptests/failures/html/html/webappapis/atob/Makefile.in index b04e23b9700..9e35f3de16b 100644 --- a/dom/imptests/failures/html/html/webappapis/atob/Makefile.in +++ b/dom/imptests/failures/html/html/webappapis/atob/Makefile.in @@ -1,16 +1,5 @@ # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_base64.html.json \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/failures/html/js/builtins/Makefile.in b/dom/imptests/failures/html/js/builtins/Makefile.in index 70d8f0a230e..a46ba209a7b 100644 --- a/dom/imptests/failures/html/js/builtins/Makefile.in +++ b/dom/imptests/failures/html/js/builtins/Makefile.in @@ -1,16 +1,5 @@ # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_WeakMap.prototype-properties.html.json \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/failures/html/old-tests/submission/Opera/microdata/Makefile.in b/dom/imptests/failures/html/old-tests/submission/Opera/microdata/Makefile.in index 506f349322a..01fb946cb3f 100644 --- a/dom/imptests/failures/html/old-tests/submission/Opera/microdata/Makefile.in +++ b/dom/imptests/failures/html/old-tests/submission/Opera/microdata/Makefile.in @@ -1,16 +1,5 @@ # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_001.html.json \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/failures/html/typedarrays/Makefile.in b/dom/imptests/failures/html/typedarrays/Makefile.in index 7dd6d40c543..a2ce605117a 100644 --- a/dom/imptests/failures/html/typedarrays/Makefile.in +++ b/dom/imptests/failures/html/typedarrays/Makefile.in @@ -1,16 +1,5 @@ # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_constructors.html.json \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/failures/webapps/DOMCore/tests/approved/Makefile.in b/dom/imptests/failures/webapps/DOMCore/tests/approved/Makefile.in index 8e68e430d5b..839f88c7c10 100644 --- a/dom/imptests/failures/webapps/DOMCore/tests/approved/Makefile.in +++ b/dom/imptests/failures/webapps/DOMCore/tests/approved/Makefile.in @@ -1,14 +1,5 @@ # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_Node-properties.html.json \ test_Range-cloneContents.html.json \ @@ -25,5 +16,3 @@ MOCHITEST_FILES := \ test_exceptions.html.json \ test_interfaces.html.json \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/Makefile.in b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/Makefile.in index dc9cdada19e..25780ee013a 100644 --- a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/Makefile.in +++ b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/Makefile.in @@ -1,14 +1,5 @@ # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_Document-createElementNS.html.json \ test_Document-getElementsByTagName.html.json \ @@ -17,5 +8,3 @@ MOCHITEST_FILES := \ test_case.html.json \ test_historical.html.json \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Opera/Makefile.in b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Opera/Makefile.in index cf85032ba3f..752d61f4022 100644 --- a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Opera/Makefile.in +++ b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Opera/Makefile.in @@ -1,17 +1,6 @@ # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_getElementsByClassName-10.xml.json \ test_getElementsByClassName-11.xml.json \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/failures/webapps/WebStorage/tests/submissions/Infraware/Makefile.in b/dom/imptests/failures/webapps/WebStorage/tests/submissions/Infraware/Makefile.in index d757036aae0..0dde18a159b 100644 --- a/dom/imptests/failures/webapps/WebStorage/tests/submissions/Infraware/Makefile.in +++ b/dom/imptests/failures/webapps/WebStorage/tests/submissions/Infraware/Makefile.in @@ -1,16 +1,5 @@ # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_storage_local_security.html.json \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/failures/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in b/dom/imptests/failures/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in index afeb610aff7..11c41bc821c 100644 --- a/dom/imptests/failures/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in +++ b/dom/imptests/failures/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in @@ -1,14 +1,5 @@ # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_missing_arguments.html.json \ test_storage_local_builtins.html.json \ @@ -18,5 +9,3 @@ MOCHITEST_FILES := \ test_storage_session_in_js.html.json \ test_storage_session_removeitem_js.html.json \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/failures/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in b/dom/imptests/failures/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in index 2246f983e4a..285316b4b2e 100644 --- a/dom/imptests/failures/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in +++ b/dom/imptests/failures/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in @@ -1,16 +1,5 @@ # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_interfaces.html.json \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/html/domxpath/Makefile.in b/dom/imptests/html/domxpath/Makefile.in index 8a918a6b94d..fbe38dbe971 100644 --- a/dom/imptests/html/domxpath/Makefile.in +++ b/dom/imptests/html/domxpath/Makefile.in @@ -1,16 +1,5 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_evaluator-constructor.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/html/html/browsers/browsing-the-web/read-media/Makefile.in b/dom/imptests/html/html/browsers/browsing-the-web/read-media/Makefile.in index 7421246a3de..bb68cae2e05 100644 --- a/dom/imptests/html/html/browsers/browsing-the-web/read-media/Makefile.in +++ b/dom/imptests/html/html/browsers/browsing-the-web/read-media/Makefile.in @@ -1,17 +1,6 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_pageload-image.html \ test_pageload-video.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/html/html/browsers/the-window-object/Makefile.in b/dom/imptests/html/html/browsers/the-window-object/Makefile.in index 0d9a910c396..615783814da 100644 --- a/dom/imptests/html/html/browsers/the-window-object/Makefile.in +++ b/dom/imptests/html/html/browsers/the-window-object/Makefile.in @@ -1,14 +1,5 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_window-indexed-properties.html \ test_window-indexed-properties-strict.html \ @@ -16,5 +7,3 @@ MOCHITEST_FILES := \ test_window-properties.html \ test_window-prototype-chain.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/html/html/browsers/the-window-object/named-access-on-the-window-object/Makefile.in b/dom/imptests/html/html/browsers/the-window-object/named-access-on-the-window-object/Makefile.in index 19233801ce3..9e3e76f0bd1 100644 --- a/dom/imptests/html/html/browsers/the-window-object/named-access-on-the-window-object/Makefile.in +++ b/dom/imptests/html/html/browsers/the-window-object/named-access-on-the-window-object/Makefile.in @@ -1,16 +1,5 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_window-null-names.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/html/html/dom/documents/dta/Makefile.in b/dom/imptests/html/html/dom/documents/dta/Makefile.in index c164495f3ad..d529fa26882 100644 --- a/dom/imptests/html/html/dom/documents/dta/Makefile.in +++ b/dom/imptests/html/html/dom/documents/dta/Makefile.in @@ -1,14 +1,5 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_document.body-getter.html \ test_document.body-setter-01.html \ @@ -32,5 +23,3 @@ MOCHITEST_FILES := \ test_nameditem-05.html \ test_nameditem-06.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/html/html/dom/documents/dta/doc.gEBN/Makefile.in b/dom/imptests/html/html/dom/documents/dta/doc.gEBN/Makefile.in index 3f5766aa72b..4adde0061af 100644 --- a/dom/imptests/html/html/dom/documents/dta/doc.gEBN/Makefile.in +++ b/dom/imptests/html/html/dom/documents/dta/doc.gEBN/Makefile.in @@ -1,14 +1,5 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_document.getElementsByName-case.html \ test_document.getElementsByName-case.xhtml \ @@ -24,5 +15,3 @@ MOCHITEST_FILES := \ test_document.getElementsByName-param.xhtml \ test_document.getElementsByName-same.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/html/html/dom/elements/global-attributes/Makefile.in b/dom/imptests/html/html/dom/elements/global-attributes/Makefile.in index 5ff945e3b78..a075e62547a 100644 --- a/dom/imptests/html/html/dom/elements/global-attributes/Makefile.in +++ b/dom/imptests/html/html/dom/elements/global-attributes/Makefile.in @@ -1,14 +1,5 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_classlist-nonstring.html \ test_dataset-delete.html \ @@ -21,5 +12,3 @@ MOCHITEST_FILES := \ test_id-attribute.html \ test_id-name.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/html/html/editing/the-hidden-attribute/Makefile.in b/dom/imptests/html/html/editing/the-hidden-attribute/Makefile.in index de4cf83ce22..9b1aadfa4bb 100644 --- a/dom/imptests/html/html/editing/the-hidden-attribute/Makefile.in +++ b/dom/imptests/html/html/editing/the-hidden-attribute/Makefile.in @@ -1,14 +1,2 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - - - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/html/html/obsolete/implreq/oeaaa/Makefile.in b/dom/imptests/html/html/obsolete/implreq/oeaaa/Makefile.in index 0967ba877f6..8c4721e283e 100644 --- a/dom/imptests/html/html/obsolete/implreq/oeaaa/Makefile.in +++ b/dom/imptests/html/html/obsolete/implreq/oeaaa/Makefile.in @@ -1,14 +1,5 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_document-color-01.html \ test_document-color-02.html \ @@ -17,5 +8,3 @@ MOCHITEST_FILES := \ test_heading-obsolete-attributes-01.html \ test_script-IDL-event-htmlfor.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/html/html/semantics/document-metadata/the-title-element/Makefile.in b/dom/imptests/html/html/semantics/document-metadata/the-title-element/Makefile.in index c7328fc056c..070e4689e83 100644 --- a/dom/imptests/html/html/semantics/document-metadata/the-title-element/Makefile.in +++ b/dom/imptests/html/html/semantics/document-metadata/the-title-element/Makefile.in @@ -1,19 +1,8 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_title.text-01.html \ test_title.text-02.xhtml \ test_title.text-03.html \ test_title.text-04.xhtml \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/html/html/semantics/forms/the-form-element/Makefile.in b/dom/imptests/html/html/semantics/forms/the-form-element/Makefile.in index 73224ec94c9..fc6edac896a 100644 --- a/dom/imptests/html/html/semantics/forms/the-form-element/Makefile.in +++ b/dom/imptests/html/html/semantics/forms/the-form-element/Makefile.in @@ -1,19 +1,8 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_form-elements-interfaces-01.html \ test_form-elements-matches.html \ test_form-elements-nameditem-01.html \ test_form-elements-nameditem-02.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/html/html/semantics/forms/the-option-element/Makefile.in b/dom/imptests/html/html/semantics/forms/the-option-element/Makefile.in index 26457138202..a64319b3c03 100644 --- a/dom/imptests/html/html/semantics/forms/the-option-element/Makefile.in +++ b/dom/imptests/html/html/semantics/forms/the-option-element/Makefile.in @@ -1,18 +1,7 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_option-text-backslash.html \ test_option-text-recurse.html \ test_option-text-spaces.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/html/html/semantics/forms/the-select-element/Makefile.in b/dom/imptests/html/html/semantics/forms/the-select-element/Makefile.in index f045cc37032..f8839238e76 100644 --- a/dom/imptests/html/html/semantics/forms/the-select-element/Makefile.in +++ b/dom/imptests/html/html/semantics/forms/the-select-element/Makefile.in @@ -1,16 +1,5 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_select-remove.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/html/html/semantics/scripting-1/the-script-element/Makefile.in b/dom/imptests/html/html/semantics/scripting-1/the-script-element/Makefile.in index 01d809f10fb..3155a1e79e3 100644 --- a/dom/imptests/html/html/semantics/scripting-1/the-script-element/Makefile.in +++ b/dom/imptests/html/html/semantics/scripting-1/the-script-element/Makefile.in @@ -1,14 +1,5 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_script-for-event.html \ test_script-for-onload.html \ @@ -19,5 +10,3 @@ MOCHITEST_FILES := \ test_script-noembed-noframes-iframe.xhtml \ test_script-onload-string.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/html/html/semantics/tabular-data/the-table-element/Makefile.in b/dom/imptests/html/html/semantics/tabular-data/the-table-element/Makefile.in index e0f7def25bb..bcaec320a37 100644 --- a/dom/imptests/html/html/semantics/tabular-data/the-table-element/Makefile.in +++ b/dom/imptests/html/html/semantics/tabular-data/the-table-element/Makefile.in @@ -1,14 +1,5 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_createTBody.html \ test_insertRow-method-01.html \ @@ -17,5 +8,3 @@ MOCHITEST_FILES := \ test_table-rows.html \ test_tBodies.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/html/html/semantics/text-level-semantics/the-time-element/Makefile.in b/dom/imptests/html/html/semantics/text-level-semantics/the-time-element/Makefile.in index aea7b3316f5..3a255a43d6b 100644 --- a/dom/imptests/html/html/semantics/text-level-semantics/the-time-element/Makefile.in +++ b/dom/imptests/html/html/semantics/text-level-semantics/the-time-element/Makefile.in @@ -1,16 +1,5 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_001.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/html/html/webappapis/atob/Makefile.in b/dom/imptests/html/html/webappapis/atob/Makefile.in index e1b0585185a..32a2731e65a 100644 --- a/dom/imptests/html/html/webappapis/atob/Makefile.in +++ b/dom/imptests/html/html/webappapis/atob/Makefile.in @@ -1,16 +1,5 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_base64.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/html/html/webappapis/scripting/events/Makefile.in b/dom/imptests/html/html/webappapis/scripting/events/Makefile.in index fcd52b675cb..620bf636611 100644 --- a/dom/imptests/html/html/webappapis/scripting/events/Makefile.in +++ b/dom/imptests/html/html/webappapis/scripting/events/Makefile.in @@ -1,18 +1,7 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_body-onload.html \ test_event-handler-javascript.html \ test_event-handler-spec-example.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/html/html/webappapis/scripting/processing-model-2/Makefile.in b/dom/imptests/html/html/webappapis/scripting/processing-model-2/Makefile.in index d798044e62c..d0e57f196fa 100644 --- a/dom/imptests/html/html/webappapis/scripting/processing-model-2/Makefile.in +++ b/dom/imptests/html/html/webappapis/scripting/processing-model-2/Makefile.in @@ -1,18 +1,7 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_window-onerror-parse-error.html \ test_window-onerror-runtime-error.html \ test_window-onerror-runtime-error-throw.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/html/html/webappapis/timers/Makefile.in b/dom/imptests/html/html/webappapis/timers/Makefile.in index efacf063a22..09cccdeb1ed 100644 --- a/dom/imptests/html/html/webappapis/timers/Makefile.in +++ b/dom/imptests/html/html/webappapis/timers/Makefile.in @@ -1,16 +1,5 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_evil-spec-example.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/html/js/builtins/Makefile.in b/dom/imptests/html/js/builtins/Makefile.in index ee07b70c799..9ed7878500d 100644 --- a/dom/imptests/html/js/builtins/Makefile.in +++ b/dom/imptests/html/js/builtins/Makefile.in @@ -1,14 +1,5 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_Array.DefineOwnProperty.html \ test_Array.prototype.join-order.html \ @@ -18,5 +9,3 @@ MOCHITEST_FILES := \ test_WeakMap.prototype-properties.html \ Math.maxmin.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/html/old-tests/submission/Opera/microdata/Makefile.in b/dom/imptests/html/old-tests/submission/Opera/microdata/Makefile.in index aea7b3316f5..3a255a43d6b 100644 --- a/dom/imptests/html/old-tests/submission/Opera/microdata/Makefile.in +++ b/dom/imptests/html/old-tests/submission/Opera/microdata/Makefile.in @@ -1,16 +1,5 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_001.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/html/typedarrays/Makefile.in b/dom/imptests/html/typedarrays/Makefile.in index 14e72879c86..a2b6cabd91a 100644 --- a/dom/imptests/html/typedarrays/Makefile.in +++ b/dom/imptests/html/typedarrays/Makefile.in @@ -1,16 +1,5 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_constructors.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/html/webgl/Makefile.in b/dom/imptests/html/webgl/Makefile.in index 2f782c9dbaa..2965b391aae 100644 --- a/dom/imptests/html/webgl/Makefile.in +++ b/dom/imptests/html/webgl/Makefile.in @@ -1,14 +1,5 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_bufferSubData.html \ test_compressedTexImage2D.html \ @@ -18,5 +9,3 @@ MOCHITEST_FILES := \ test_uniformMatrixNfv.html \ common.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/webapps/DOMCore/tests/approved/Makefile.in b/dom/imptests/webapps/DOMCore/tests/approved/Makefile.in index 1194db65ded..0fd810d1dea 100644 --- a/dom/imptests/webapps/DOMCore/tests/approved/Makefile.in +++ b/dom/imptests/webapps/DOMCore/tests/approved/Makefile.in @@ -1,14 +1,5 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_exceptions.html \ test_interfaces.html \ @@ -39,5 +30,3 @@ MOCHITEST_FILES += \ test_Range-surroundContents.html \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/Makefile.in b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/Makefile.in index ad9a8f0de63..eb63c9d4b5c 100644 --- a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/Makefile.in +++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/Makefile.in @@ -1,14 +1,5 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_attributes.html \ test_case.html \ @@ -78,5 +69,3 @@ MOCHITEST_FILES := \ Document-createProcessingInstruction.js \ productions.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Opera/Makefile.in b/dom/imptests/webapps/DOMCore/tests/submissions/Opera/Makefile.in index 2cbcd93e709..6b9df178acf 100644 --- a/dom/imptests/webapps/DOMCore/tests/submissions/Opera/Makefile.in +++ b/dom/imptests/webapps/DOMCore/tests/submissions/Opera/Makefile.in @@ -1,14 +1,5 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_getElementsByClassName-01.htm \ test_getElementsByClassName-02.htm \ @@ -29,5 +20,3 @@ MOCHITEST_FILES := \ test_getElementsByClassName-17.htm \ test_getElementsByClassName-18.htm \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/Makefile.in b/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/Makefile.in index a2b6617b3e9..dc38ea46e20 100644 --- a/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/Makefile.in +++ b/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/Makefile.in @@ -1,14 +1,5 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_event_constructor.html \ test_event_local_key.html \ @@ -37,5 +28,3 @@ MOCHITEST_FILES := \ test_storage_session_removeitem.html \ test_storage_session_setitem.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/Makefile.in b/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/Makefile.in index 517f33fc6ea..146fa70bfb9 100644 --- a/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/Makefile.in +++ b/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/Makefile.in @@ -1,14 +1,5 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ local_change_item_iframe.html \ local_security_iframe.html \ @@ -18,5 +9,3 @@ MOCHITEST_FILES := \ session_set_item_clear_iframe.html \ session_set_item_iframe.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in b/dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in index c12aec445bc..195836bea73 100644 --- a/dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in +++ b/dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in @@ -1,14 +1,5 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_event_constructor_js.html \ test_missing_arguments.html \ @@ -30,5 +21,3 @@ MOCHITEST_FILES := \ test_storage_session_setitem_js.html \ storage_builtins.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in b/dom/imptests/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in index e2a781d7d48..81981b2525f 100644 --- a/dom/imptests/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in +++ b/dom/imptests/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in @@ -1,18 +1,7 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_FormData-append.html \ test_interfaces.html \ test_setrequestheader-invalid-arguments.htm \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/imptests/writeBuildFiles.py b/dom/imptests/writeBuildFiles.py index 30c6e74c7e6..bc0207e2bdd 100644 --- a/dom/imptests/writeBuildFiles.py +++ b/dom/imptests/writeBuildFiles.py @@ -8,18 +8,7 @@ import string makefile_template = """# THIS FILE IS AUTOGENERATED BY ${caller} - DO NOT EDIT -DEPTH := @DEPTH@ - -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $$(DEPTH)/config/autoconf.mk - ${files} - -include $$(topsrcdir)/config/rules.mk """ mozbuild_template = """# THIS FILE IS AUTOGENERATED BY ${caller} - DO NOT EDIT diff --git a/dom/indexedDB/Makefile.in b/dom/indexedDB/Makefile.in index 764c625f23e..d50c9c89878 100644 --- a/dom/indexedDB/Makefile.in +++ b/dom/indexedDB/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES = \ -I$(topsrcdir)/caps/include \ -I$(topsrcdir)/content/base/src \ @@ -23,4 +16,3 @@ LOCAL_INCLUDES = \ include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk - diff --git a/dom/indexedDB/ipc/Makefile.in b/dom/indexedDB/ipc/Makefile.in index a89145fa759..17f0d7781bd 100644 --- a/dom/indexedDB/ipc/Makefile.in +++ b/dom/indexedDB/ipc/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -relativesrcdir = @relativesrcdir@ -VPATH = @srcdir@ -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/indexedDB \ -I$(topsrcdir)/content/events/src \ diff --git a/dom/indexedDB/test/Makefile.in b/dom/indexedDB/test/Makefile.in index a1bbfb27123..4c637e06c2b 100644 --- a/dom/indexedDB/test/Makefile.in +++ b/dom/indexedDB/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ bfcache_iframe1.html \ bfcache_iframe2.html \ @@ -145,5 +137,3 @@ MOCHITEST_BROWSER_FILES = \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk diff --git a/dom/indexedDB/test/unit/Makefile.in b/dom/indexedDB/test/unit/Makefile.in index 25d3b150d5d..2e2fba5f648 100644 --- a/dom/indexedDB/test/unit/Makefile.in +++ b/dom/indexedDB/test/unit/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_add_put.js \ test_add_twice_failure.js \ @@ -74,6 +66,3 @@ MOCHITEST_FILES = \ test_unique_index_update.js \ test_writer_starvation.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/dom/interfaces/devicestorage/Makefile.in b/dom/interfaces/devicestorage/Makefile.in index 728a356cb51..7515f97e0f9 100644 --- a/dom/interfaces/devicestorage/Makefile.in +++ b/dom/interfaces/devicestorage/Makefile.in @@ -2,15 +2,4 @@ # License, v. 2.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)/dom/dom-config.mk - -include $(topsrcdir)/config/rules.mk - - diff --git a/dom/ipc/Makefile.in b/dom/ipc/Makefile.in index 112105253a5..51877abbd1c 100644 --- a/dom/ipc/Makefile.in +++ b/dom/ipc/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 diff --git a/dom/ipc/tests/Makefile.in b/dom/ipc/tests/Makefile.in index 5f274a06645..d74e188dcd3 100644 --- a/dom/ipc/tests/Makefile.in +++ b/dom/ipc/tests/Makefile.in @@ -2,18 +2,8 @@ # License, v. 2.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_process_error.xul \ process_error.xul \ process_error_contentscript.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/locales/Makefile.in b/dom/locales/Makefile.in index 2839d474fe5..82f614ecea2 100644 --- a/dom/locales/Makefile.in +++ b/dom/locales/Makefile.in @@ -2,14 +2,4 @@ # License, v. 2.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 diff --git a/dom/media/Makefile.in b/dom/media/Makefile.in index 8427a62a247..26902866443 100644 --- a/dom/media/Makefile.in +++ b/dom/media/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/media/bridge/Makefile.in b/dom/media/bridge/Makefile.in index 7642fcba44b..e88c344b06c 100644 --- a/dom/media/bridge/Makefile.in +++ b/dom/media/bridge/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - - EXPORT_LIBRARY = 1 LOCAL_INCLUDES += \ -I$(topsrcdir)/media/mtransport \ @@ -21,5 +13,3 @@ LOCAL_INCLUDES += \ -I$(topsrcdir)/media/webrtc/signaling/src/common/time_profiling \ -I$(topsrcdir)/ipc/chromium/src \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/media/tests/mochitest/Makefile.in b/dom/media/tests/mochitest/Makefile.in index a4f4b72cc07..4b9b6511573 100644 --- a/dom/media/tests/mochitest/Makefile.in +++ b/dom/media/tests/mochitest/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_dataChannel_basicAudio.html \ test_dataChannel_basicAudioVideo.html \ @@ -64,5 +56,3 @@ ifdef MOZ_WEBRTC_LEAKING_TESTS MOCHITEST_FILES += \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk diff --git a/dom/messages/interfaces/Makefile.in b/dom/messages/interfaces/Makefile.in index 4ddef56abb7..7515f97e0f9 100644 --- a/dom/messages/interfaces/Makefile.in +++ b/dom/messages/interfaces/Makefile.in @@ -2,14 +2,4 @@ # License, v. 2.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)/dom/dom-config.mk - -include $(topsrcdir)/config/rules.mk - diff --git a/dom/mobilemessage/interfaces/Makefile.in b/dom/mobilemessage/interfaces/Makefile.in index 143590c476a..e2f1f0e3373 100644 --- a/dom/mobilemessage/interfaces/Makefile.in +++ b/dom/mobilemessage/interfaces/Makefile.in @@ -2,14 +2,4 @@ # License, v. 2.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)/dom/dom-config.mk - -include $(topsrcdir)/config/rules.mk - diff --git a/dom/mobilemessage/src/Makefile.in b/dom/mobilemessage/src/Makefile.in index 4dfe608bd89..f6415886830 100644 --- a/dom/mobilemessage/src/Makefile.in +++ b/dom/mobilemessage/src/Makefile.in @@ -2,16 +2,11 @@ # License, v. 2.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) \ $(srcdir)/ipc \ $(NULL) -include $(DEPTH)/config/autoconf.mk - ifeq (android,$(MOZ_WIDGET_TOOLKIT)) VPATH += $(srcdir)/android else ifdef MOZ_B2G_RIL diff --git a/dom/mobilemessage/tests/Makefile.in b/dom/mobilemessage/tests/Makefile.in index d148951a16c..2c18a622973 100644 --- a/dom/mobilemessage/tests/Makefile.in +++ b/dom/mobilemessage/tests/Makefile.in @@ -2,15 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_sms_basics.html \ test_smsfilter.html \ @@ -21,5 +12,3 @@ MOCHITEST_CHROME_FILES = \ test_smsdatabaseservice.xul \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk diff --git a/dom/network/interfaces/Makefile.in b/dom/network/interfaces/Makefile.in index 143590c476a..e2f1f0e3373 100644 --- a/dom/network/interfaces/Makefile.in +++ b/dom/network/interfaces/Makefile.in @@ -2,14 +2,4 @@ # License, v. 2.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)/dom/dom-config.mk - -include $(topsrcdir)/config/rules.mk - diff --git a/dom/network/src/Makefile.in b/dom/network/src/Makefile.in index a6fae9dcfa5..82ffe59a27f 100644 --- a/dom/network/src/Makefile.in +++ b/dom/network/src/Makefile.in @@ -2,13 +2,8 @@ # License, v. 2.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 - ifdef MOZ_B2G_RIL endif diff --git a/dom/network/tests/Makefile.in b/dom/network/tests/Makefile.in index cc7c0341bef..52fcdb65ce1 100644 --- a/dom/network/tests/Makefile.in +++ b/dom/network/tests/Makefile.in @@ -2,15 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_network_basics.html \ test_tcpsocket_default_permissions.html \ @@ -26,5 +17,3 @@ MOCHITEST_FILES = \ test_networkstats_enabled_perm.html \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk diff --git a/dom/permission/tests/Makefile.in b/dom/permission/tests/Makefile.in index abe7a9d3411..f62b1ae1b52 100644 --- a/dom/permission/tests/Makefile.in +++ b/dom/permission/tests/Makefile.in @@ -2,15 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_permission_basics.html \ test_alarms.html \ @@ -71,5 +62,3 @@ MOCHITEST_FILES += \ test_time.html \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk diff --git a/dom/phonenumberutils/tests/Makefile.in b/dom/phonenumberutils/tests/Makefile.in index 4f12284fca3..8e1c3e4f448 100644 --- a/dom/phonenumberutils/tests/Makefile.in +++ b/dom/phonenumberutils/tests/Makefile.in @@ -2,15 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_phonenumberutils_basics.html \ $(NULL) @@ -20,5 +11,3 @@ MOCHITEST_CHROME_FILES = \ test_phonenumberutils.xul \ test_phonenumberservice.xul \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/plugins/base/Makefile.in b/dom/plugins/base/Makefile.in index 0cb5d745b51..6bd4bb26ec3 100644 --- a/dom/plugins/base/Makefile.in +++ b/dom/plugins/base/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 ifeq ($(MOZ_WIDGET_TOOLKIT),android) LOCAL_INCLUDES += -I$(topsrcdir)/dom/plugins/base/android diff --git a/dom/plugins/base/android/Makefile.in b/dom/plugins/base/android/Makefile.in index a486fa80a79..2370cfd3963 100644 --- a/dom/plugins/base/android/Makefile.in +++ b/dom/plugins/base/android/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 LOCAL_INCLUDES += \ -I$(topsrcdir)/widget/android \ diff --git a/dom/plugins/ipc/Makefile.in b/dom/plugins/ipc/Makefile.in index f85a0aa406f..9208622ee11 100644 --- a/dom/plugins/ipc/Makefile.in +++ b/dom/plugins/ipc/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 ifeq (WINNT,$(OS_ARCH)) diff --git a/dom/plugins/ipc/hangui/Makefile.in b/dom/plugins/ipc/hangui/Makefile.in index f0b485c3b5a..a43cad19428 100644 --- a/dom/plugins/ipc/hangui/Makefile.in +++ b/dom/plugins/ipc/hangui/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - OS_LIBS = $(call EXPAND_LIBNAME,comctl32) RCINCLUDE = HangUIDlg.rc diff --git a/dom/plugins/ipc/interpose/Makefile.in b/dom/plugins/ipc/interpose/Makefile.in index 1b7d47aadad..6c34ec1d42f 100644 --- a/dom/plugins/ipc/interpose/Makefile.in +++ b/dom/plugins/ipc/interpose/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_SHARED_LIB = 1 DIST_INSTALL = 1 @@ -16,5 +9,3 @@ DIST_INSTALL = 1 EXTRA_DSO_LDOPTS += \ -framework Carbon \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/plugins/test/mochitest/Makefile.in b/dom/plugins/test/mochitest/Makefile.in index 939b99fbce5..72203abddb9 100644 --- a/dom/plugins/test/mochitest/Makefile.in +++ b/dom/plugins/test/mochitest/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ utils.js \ test_defaultValue.html \ @@ -168,5 +160,3 @@ MOCHITEST_FILES += \ test_crash_nested_loop.html \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk diff --git a/dom/plugins/test/testplugin/Makefile.in b/dom/plugins/test/testplugin/Makefile.in index 19a08ec3986..aea5d1d9931 100644 --- a/dom/plugins/test/testplugin/Makefile.in +++ b/dom/plugins/test/testplugin/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - MODULE_NAME = TestPlugin RELATIVE_PATH=. diff --git a/dom/plugins/test/testplugin/secondplugin/Makefile.in b/dom/plugins/test/testplugin/secondplugin/Makefile.in index 2116a57c80e..3d9e28c64ea 100644 --- a/dom/plugins/test/testplugin/secondplugin/Makefile.in +++ b/dom/plugins/test/testplugin/secondplugin/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - MODULE_NAME = SecondTestPlugin RELATIVE_PATH=.. diff --git a/dom/power/Makefile.in b/dom/power/Makefile.in index 50514d42687..77e0fd39739 100644 --- a/dom/power/Makefile.in +++ b/dom/power/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/power/test/Makefile.in b/dom/power/test/Makefile.in index fdde538c1d9..ef93721ba24 100644 --- a/dom/power/test/Makefile.in +++ b/dom/power/test/Makefile.in @@ -2,15 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_power_basics.html \ test_power_set_cpusleepallowed.html \ @@ -21,5 +12,3 @@ MOCHITEST_FILES = \ MOCHITEST_BROWSER_FILES = \ browser_wakelocks.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/promise/Makefile.in b/dom/promise/Makefile.in index f5c87a32483..95fcf427e24 100644 --- a/dom/promise/Makefile.in +++ b/dom/promise/Makefile.in @@ -2,16 +2,7 @@ # License, v. 2.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 - LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/workers \ -I$(topsrcdir)/dom/base \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/promise/tests/Makefile.in b/dom/promise/tests/Makefile.in index 7df9c9f0d06..78eae66b7f3 100644 --- a/dom/promise/tests/Makefile.in +++ b/dom/promise/tests/Makefile.in @@ -2,19 +2,8 @@ # License, v. 2.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 = \ test_promise.html \ test_resolve.html \ test_bug883683.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/quota/Makefile.in b/dom/quota/Makefile.in index 09269702360..13aef919415 100644 --- a/dom/quota/Makefile.in +++ b/dom/quota/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/dom/dom-config.mk LOCAL_INCLUDES = \ diff --git a/dom/settings/tests/Makefile.in b/dom/settings/tests/Makefile.in index e5e25daf320..4070989f729 100644 --- a/dom/settings/tests/Makefile.in +++ b/dom/settings/tests/Makefile.in @@ -2,15 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_settings_basics.html \ test_settings_events.html \ @@ -24,5 +15,3 @@ MOCHITEST_CHROME_FILES = \ test_settings_service.xul \ test_settings_service.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/src/events/Makefile.in b/dom/src/events/Makefile.in index 75914fa5ae7..0dbd610f6f0 100644 --- a/dom/src/events/Makefile.in +++ b/dom/src/events/Makefile.in @@ -3,14 +3,7 @@ # License, v. 2.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 INCLUDES += -I$(topsrcdir)/dom/base INCLUDES += -I$(topsrcdir)/content/base/src - diff --git a/dom/src/geolocation/Makefile.in b/dom/src/geolocation/Makefile.in index 3e06a8ca4d8..494a68b7c67 100644 --- a/dom/src/geolocation/Makefile.in +++ b/dom/src/geolocation/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES = \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/dom/ipc \ diff --git a/dom/src/json/Makefile.in b/dom/src/json/Makefile.in index c69686fbe74..c47d819ff4e 100644 --- a/dom/src/json/Makefile.in +++ b/dom/src/json/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES = \ -I$(srcdir)/../base \ -I$(topsrcdir)/content/events/src - -include $(topsrcdir)/config/rules.mk diff --git a/dom/src/json/test/Makefile.in b/dom/src/json/test/Makefile.in index ca9a38a0e4f..3a6011f4c0b 100644 --- a/dom/src/json/test/Makefile.in +++ b/dom/src/json/test/Makefile.in @@ -3,17 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_json.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/dom/src/jsurl/Makefile.in b/dom/src/jsurl/Makefile.in index 3451a229a38..54b64c69fff 100644 --- a/dom/src/jsurl/Makefile.in +++ b/dom/src/jsurl/Makefile.in @@ -3,17 +3,8 @@ # License, v. 2.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 - LOCAL_INCLUDES += \ -I$(srcdir) \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/netwerk/base/src \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/dom/src/jsurl/test/Makefile.in b/dom/src/jsurl/test/Makefile.in index 6104ffa4fa7..37c93ad0d2d 100644 --- a/dom/src/jsurl/test/Makefile.in +++ b/dom/src/jsurl/test/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = pass.html \ fail.html \ test_bug351633-1.html \ @@ -24,5 +16,3 @@ MOCHITEST_FILES = pass.html \ test_bug351633-4.html \ test_bug384981.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/src/notification/Makefile.in b/dom/src/notification/Makefile.in index 24601103d74..997f5d69367 100644 --- a/dom/src/notification/Makefile.in +++ b/dom/src/notification/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES = \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/dom/ipc \ diff --git a/dom/src/offline/Makefile.in b/dom/src/offline/Makefile.in index 75a44f151e4..e1d5ab6c86b 100644 --- a/dom/src/offline/Makefile.in +++ b/dom/src/offline/Makefile.in @@ -3,16 +3,7 @@ # License, v. 2.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 - LOCAL_INCLUDES = \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/content/base/src \ -I$(topsrcdir)/content/events/src - -include $(topsrcdir)/config/rules.mk diff --git a/dom/src/storage/Makefile.in b/dom/src/storage/Makefile.in index 2a957c9d0a4..a80fc8bc629 100644 --- a/dom/src/storage/Makefile.in +++ b/dom/src/storage/Makefile.in @@ -3,12 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES = \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/content/events/src diff --git a/dom/system/Makefile.in b/dom/system/Makefile.in index eac93c7f427..8bfba6af17b 100644 --- a/dom/system/Makefile.in +++ b/dom/system/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - DEFINES += -DDLL_PREFIX=\"$(DLL_PREFIX)\" -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" # We fire the nsDOMDeviceAcceleration diff --git a/dom/system/android/Makefile.in b/dom/system/android/Makefile.in index 036363b3e4d..be31405fcbc 100644 --- a/dom/system/android/Makefile.in +++ b/dom/system/android/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 LOCAL_INCLUDES += -I$(topsrcdir)/dom/src/geolocation \ -I$(topsrcdir)/content/events/src @@ -16,4 +9,3 @@ LOCAL_INCLUDES += -I$(topsrcdir)/dom/src/geolocation \ include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk - diff --git a/dom/system/gonk/Makefile.in b/dom/system/gonk/Makefile.in index d648d2d7407..56710dccf09 100644 --- a/dom/system/gonk/Makefile.in +++ b/dom/system/gonk/Makefile.in @@ -12,15 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/dom/dom-config.mk LOCAL_INCLUDES = \ @@ -42,4 +33,3 @@ WORKER_DEST = $(FINAL_TARGET)/modules/workers include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk - diff --git a/dom/system/mac/Makefile.in b/dom/system/mac/Makefile.in index 65edb1f26e4..f6f11022b98 100644 --- a/dom/system/mac/Makefile.in +++ b/dom/system/mac/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 LOCAL_INCLUDES += -I$(topsrcdir)/dom/src/geolocation \ $(NULL) diff --git a/dom/system/tests/Makefile.in b/dom/system/tests/Makefile.in index d05d4b19593..39f1da4a713 100644 --- a/dom/system/tests/Makefile.in +++ b/dom/system/tests/Makefile.in @@ -1,12 +1,4 @@ -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - MOCHITEST_CHROME_FILES = \ test_constants.xul \ worker_constants.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/system/unix/Makefile.in b/dom/system/unix/Makefile.in index 33c2005fb28..2df3b7bb29c 100644 --- a/dom/system/unix/Makefile.in +++ b/dom/system/unix/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 ifdef MOZ_ENABLE_QTMOBILITY LOCAL_INCLUDES += $(MOZ_QT_CFLAGS) \ diff --git a/dom/system/windows/Makefile.in b/dom/system/windows/Makefile.in index d2b151cd35c..6b7770624ee 100644 --- a/dom/system/windows/Makefile.in +++ b/dom/system/windows/Makefile.in @@ -2,16 +2,7 @@ # License, v. 2.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 # We fire the nsDOMDeviceAcceleration LOCAL_INCLUDES += -I$(topsrcdir)/content/events/src - -include $(topsrcdir)/config/rules.mk diff --git a/dom/telephony/Makefile.in b/dom/telephony/Makefile.in index 143590c476a..e2f1f0e3373 100644 --- a/dom/telephony/Makefile.in +++ b/dom/telephony/Makefile.in @@ -2,14 +2,4 @@ # License, v. 2.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)/dom/dom-config.mk - -include $(topsrcdir)/config/rules.mk - diff --git a/dom/tests/browser/Makefile.in b/dom/tests/browser/Makefile.in index b20e699d35c..5857ff42dda 100644 --- a/dom/tests/browser/Makefile.in +++ b/dom/tests/browser/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH := @DEPTH@ -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_BROWSER_FILES := \ browser_focus_steal_from_chrome.js \ browser_focus_steal_from_chrome_during_mousedown.js \ @@ -41,5 +33,3 @@ endif # TODO: Re-enable permissions tests on Mac, bug 795334 # TODO: disabled test browser_webapps_perms_reinstall.js, re-enable when bug 794920 is fixed - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/ajax/jquery/Makefile.in b/dom/tests/mochitest/ajax/jquery/Makefile.in index d788ca1a8c7..9983a56d596 100644 --- a/dom/tests/mochitest/ajax/jquery/Makefile.in +++ b/dom/tests/mochitest/ajax/jquery/Makefile.in @@ -3,17 +3,7 @@ # License, v. 2.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 = \ manifest.json \ test_jQuery.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/ajax/jquery/dist/Makefile.in b/dom/tests/mochitest/ajax/jquery/dist/Makefile.in index 6021d7ec6ac..8acb5205799 100644 --- a/dom/tests/mochitest/ajax/jquery/dist/Makefile.in +++ b/dom/tests/mochitest/ajax/jquery/dist/Makefile.in @@ -3,16 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ jquery.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/ajax/jquery/test/Makefile.in b/dom/tests/mochitest/ajax/jquery/test/Makefile.in index 272dc8b6b48..2f2c320550b 100644 --- a/dom/tests/mochitest/ajax/jquery/test/Makefile.in +++ b/dom/tests/mochitest/ajax/jquery/test/Makefile.in @@ -3,19 +3,9 @@ # License, v. 2.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 = \ index.html \ offset.html \ test.js \ fix.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/ajax/jquery/test/data/Makefile.in b/dom/tests/mochitest/ajax/jquery/test/data/Makefile.in index ba9f555867c..e0832d8bbf6 100644 --- a/dom/tests/mochitest/ajax/jquery/test/data/Makefile.in +++ b/dom/tests/mochitest/ajax/jquery/test/data/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ cow.jpg \ dashboard.xml \ @@ -26,5 +18,3 @@ MOCHITEST_FILES = \ testsuite.css \ with_fries.xml \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/ajax/jquery/test/data/offset/Makefile.in b/dom/tests/mochitest/ajax/jquery/test/data/offset/Makefile.in index c5388c36c08..33ee8e2d31c 100644 --- a/dom/tests/mochitest/ajax/jquery/test/data/offset/Makefile.in +++ b/dom/tests/mochitest/ajax/jquery/test/data/offset/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ absolute.html \ fixed.html \ @@ -19,5 +11,3 @@ MOCHITEST_FILES = \ static.html \ table.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/ajax/jquery/test/unit/Makefile.in b/dom/tests/mochitest/ajax/jquery/test/unit/Makefile.in index 917cd7fa65e..aa2740fde74 100644 --- a/dom/tests/mochitest/ajax/jquery/test/unit/Makefile.in +++ b/dom/tests/mochitest/ajax/jquery/test/unit/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ ajax.js \ core.js \ @@ -20,5 +12,3 @@ MOCHITEST_FILES = \ offset.js \ selector.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/ajax/lib/Makefile.in b/dom/tests/mochitest/ajax/lib/Makefile.in index 3e0f75abc8c..dd368608a5e 100644 --- a/dom/tests/mochitest/ajax/lib/Makefile.in +++ b/dom/tests/mochitest/ajax/lib/Makefile.in @@ -3,17 +3,7 @@ # License, v. 2.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 = \ AJAX_setup.js \ test.css \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/ajax/mochikit/Makefile.in b/dom/tests/mochitest/ajax/mochikit/Makefile.in index fdc6362aad2..64753ebf545 100644 --- a/dom/tests/mochitest/ajax/mochikit/Makefile.in +++ b/dom/tests/mochitest/ajax/mochikit/Makefile.in @@ -3,17 +3,7 @@ # License, v. 2.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 = \ test_Mochikit.html \ manifest.json \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/ajax/mochikit/MochiKit/Makefile.in b/dom/tests/mochitest/ajax/mochikit/MochiKit/Makefile.in index 58a3468efb5..d2dfae618d3 100644 --- a/dom/tests/mochitest/ajax/mochikit/MochiKit/Makefile.in +++ b/dom/tests/mochitest/ajax/mochikit/MochiKit/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ Async.js \ Base.js \ @@ -34,5 +26,3 @@ MOCHITEST_FILES = \ Visual.js \ __package__.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/ajax/mochikit/tests/Makefile.in b/dom/tests/mochitest/ajax/mochikit/tests/Makefile.in index 149285c37e5..66b2ffb4ae4 100644 --- a/dom/tests/mochitest/ajax/mochikit/tests/Makefile.in +++ b/dom/tests/mochitest/ajax/mochikit/tests/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ FakeJSAN.js \ cli.js \ @@ -41,5 +33,3 @@ MOCHITEST_FILES = \ MochiKit-Visual.html \ test_Signal.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/ajax/mochikit/tests/SimpleTest/Makefile.in b/dom/tests/mochitest/ajax/mochikit/tests/SimpleTest/Makefile.in index 63d3291cf1d..f28bd2ebf3c 100644 --- a/dom/tests/mochitest/ajax/mochikit/tests/SimpleTest/Makefile.in +++ b/dom/tests/mochitest/ajax/mochikit/tests/SimpleTest/Makefile.in @@ -3,18 +3,8 @@ # License, v. 2.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 = \ SimpleTest.js \ TestRunner.js \ test.css \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/ajax/offline/Makefile.in b/dom/tests/mochitest/ajax/offline/Makefile.in index 946116c01f0..223390db942 100644 --- a/dom/tests/mochitest/ajax/offline/Makefile.in +++ b/dom/tests/mochitest/ajax/offline/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ offlineTests.js \ test_badManifestMagic.html \ @@ -100,5 +92,3 @@ MOCHITEST_FILES = \ $(NULL) # test_offlineMode.html disabled due to bug 656943 - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/ajax/offline/namespace1/Makefile.in b/dom/tests/mochitest/ajax/offline/namespace1/Makefile.in index 52d93593e83..a6de3f4cba2 100644 --- a/dom/tests/mochitest/ajax/offline/namespace1/Makefile.in +++ b/dom/tests/mochitest/ajax/offline/namespace1/Makefile.in @@ -3,18 +3,8 @@ # License, v. 2.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 = \ opp.html \ script.js \ redirectToDifferentOrigin.sjs \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/ajax/offline/namespace1/sub/Makefile.in b/dom/tests/mochitest/ajax/offline/namespace1/sub/Makefile.in index bdc3f703749..8a6ad68cc23 100644 --- a/dom/tests/mochitest/ajax/offline/namespace1/sub/Makefile.in +++ b/dom/tests/mochitest/ajax/offline/namespace1/sub/Makefile.in @@ -3,17 +3,7 @@ # License, v. 2.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 = \ opp.html \ script1.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/ajax/offline/namespace1/sub2/Makefile.in b/dom/tests/mochitest/ajax/offline/namespace1/sub2/Makefile.in index bfc2312c60b..8675ad4a92a 100644 --- a/dom/tests/mochitest/ajax/offline/namespace1/sub2/Makefile.in +++ b/dom/tests/mochitest/ajax/offline/namespace1/sub2/Makefile.in @@ -3,16 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ script2.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/ajax/offline/namespace2/Makefile.in b/dom/tests/mochitest/ajax/offline/namespace2/Makefile.in index 8ef9365dd4c..4a07a75542b 100644 --- a/dom/tests/mochitest/ajax/offline/namespace2/Makefile.in +++ b/dom/tests/mochitest/ajax/offline/namespace2/Makefile.in @@ -3,16 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ script3.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/ajax/prototype/Makefile.in b/dom/tests/mochitest/ajax/prototype/Makefile.in index 0db62f4d6ce..5e40609dd8c 100644 --- a/dom/tests/mochitest/ajax/prototype/Makefile.in +++ b/dom/tests/mochitest/ajax/prototype/Makefile.in @@ -3,17 +3,7 @@ # License, v. 2.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 = \ test_Prototype.html \ manifest.json \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/ajax/prototype/dist/Makefile.in b/dom/tests/mochitest/ajax/prototype/dist/Makefile.in index 29e6fbbc63c..3134dd47f9b 100644 --- a/dom/tests/mochitest/ajax/prototype/dist/Makefile.in +++ b/dom/tests/mochitest/ajax/prototype/dist/Makefile.in @@ -3,16 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ prototype.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/ajax/prototype/test/Makefile.in b/dom/tests/mochitest/ajax/prototype/test/Makefile.in index 10596d5ace1..2489a9a80a2 100644 --- a/dom/tests/mochitest/ajax/prototype/test/Makefile.in +++ b/dom/tests/mochitest/ajax/prototype/test/Makefile.in @@ -3,18 +3,8 @@ # License, v. 2.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 = \ test.css \ browser.html \ console.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/ajax/prototype/test/functional/Makefile.in b/dom/tests/mochitest/ajax/prototype/test/functional/Makefile.in index 4b58640b713..50f5dfe5a37 100644 --- a/dom/tests/mochitest/ajax/prototype/test/functional/Makefile.in +++ b/dom/tests/mochitest/ajax/prototype/test/functional/Makefile.in @@ -3,16 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ event.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/ajax/prototype/test/lib/Makefile.in b/dom/tests/mochitest/ajax/prototype/test/lib/Makefile.in index 6dd897f72d8..7af48fdc807 100644 --- a/dom/tests/mochitest/ajax/prototype/test/lib/Makefile.in +++ b/dom/tests/mochitest/ajax/prototype/test/lib/Makefile.in @@ -3,16 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ unittest.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/ajax/prototype/test/unit/Makefile.in b/dom/tests/mochitest/ajax/prototype/test/unit/Makefile.in index ac447d80a50..d7be5d12401 100644 --- a/dom/tests/mochitest/ajax/prototype/test/unit/Makefile.in +++ b/dom/tests/mochitest/ajax/prototype/test/unit/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ ajax_test.js \ array_test.js \ @@ -28,5 +20,3 @@ MOCHITEST_FILES = \ string_test.js \ unittest_test.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/ajax/prototype/test/unit/fixtures/Makefile.in b/dom/tests/mochitest/ajax/prototype/test/unit/fixtures/Makefile.in index 01f85a3e584..c0c9e0f1bdf 100644 --- a/dom/tests/mochitest/ajax/prototype/test/unit/fixtures/Makefile.in +++ b/dom/tests/mochitest/ajax/prototype/test/unit/fixtures/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES= \ ajax.html \ ajax.js \ @@ -38,5 +30,3 @@ MOCHITEST_FILES= \ string.js \ unittest.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/ajax/prototype/test/unit/tmp/Makefile.in b/dom/tests/mochitest/ajax/prototype/test/unit/tmp/Makefile.in index c72f0f19a38..67125a47c23 100644 --- a/dom/tests/mochitest/ajax/prototype/test/unit/tmp/Makefile.in +++ b/dom/tests/mochitest/ajax/prototype/test/unit/tmp/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES= \ ajax_test.html \ array_test.html \ @@ -28,5 +20,3 @@ MOCHITEST_FILES= \ string_test.html \ unit_test.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/ajax/scriptaculous/Makefile.in b/dom/tests/mochitest/ajax/scriptaculous/Makefile.in index 274e8f8d24d..c1c6656d865 100644 --- a/dom/tests/mochitest/ajax/scriptaculous/Makefile.in +++ b/dom/tests/mochitest/ajax/scriptaculous/Makefile.in @@ -3,17 +3,7 @@ # License, v. 2.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 = \ manifest.json \ test_Scriptaculous.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/ajax/scriptaculous/lib/Makefile.in b/dom/tests/mochitest/ajax/scriptaculous/lib/Makefile.in index 0ec4c44aca2..2011060d156 100644 --- a/dom/tests/mochitest/ajax/scriptaculous/lib/Makefile.in +++ b/dom/tests/mochitest/ajax/scriptaculous/lib/Makefile.in @@ -3,16 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ prototype.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/ajax/scriptaculous/src/Makefile.in b/dom/tests/mochitest/ajax/scriptaculous/src/Makefile.in index fa4e7259c3f..01afaec7e28 100644 --- a/dom/tests/mochitest/ajax/scriptaculous/src/Makefile.in +++ b/dom/tests/mochitest/ajax/scriptaculous/src/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ builder.js \ controls.js \ @@ -21,5 +13,3 @@ MOCHITEST_FILES = \ sound.js \ unittest.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/ajax/scriptaculous/test/unit/Makefile.in b/dom/tests/mochitest/ajax/scriptaculous/test/unit/Makefile.in index e380eb359b1..ef1a6eed59d 100644 --- a/dom/tests/mochitest/ajax/scriptaculous/test/unit/Makefile.in +++ b/dom/tests/mochitest/ajax/scriptaculous/test/unit/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ _ajax_inplaceeditor_result.html \ _ajax_inplaceeditor_text.html \ @@ -32,5 +24,3 @@ MOCHITEST_FILES = \ string_test.html \ unit_test.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/bugs/Makefile.in b/dom/tests/mochitest/bugs/Makefile.in index 7676344fc0e..9d13cabe0f6 100644 --- a/dom/tests/mochitest/bugs/Makefile.in +++ b/dom/tests/mochitest/bugs/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_bug42976.html \ test_bug49312.html \ @@ -148,5 +140,3 @@ MOCHITEST_FILES = \ test_bug876098.html \ test_toJSON.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/chrome/Makefile.in b/dom/tests/mochitest/chrome/Makefile.in index 0f95ef48381..3e6fb8e5966 100644 --- a/dom/tests/mochitest/chrome/Makefile.in +++ b/dom/tests/mochitest/chrome/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_CHROME_FILES = \ MozEnteredDomFullscreen_chrome.xul \ fullscreen.xul \ @@ -88,5 +80,3 @@ MOCHITEST_CHROME_FILES += \ else $(filter disabled-on-os-x-for-intermittent-failures--bug-798848, test_MozEnteredDomFullscreen_event.xul) endif - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/crypto/Makefile.in b/dom/tests/mochitest/crypto/Makefile.in index 3ff37077fa6..f1d29a129d4 100644 --- a/dom/tests/mochitest/crypto/Makefile.in +++ b/dom/tests/mochitest/crypto/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ test_getRandomValues.html \ $(NULL) @@ -23,5 +15,3 @@ MOCHITEST_FILES += \ test_no_legacy.html \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/dom-level0/Makefile.in b/dom/tests/mochitest/dom-level0/Makefile.in index f63a7e28e3d..0b8b2e54b56 100644 --- a/dom/tests/mochitest/dom-level0/Makefile.in +++ b/dom/tests/mochitest/dom-level0/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_crossdomainprops.html \ file_crossdomainprops_inner.html \ @@ -28,5 +20,3 @@ MOCHITEST_FILES = \ test_location_sandboxed.html \ framed_location.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/dom-level1-core/Makefile.in b/dom/tests/mochitest/dom-level1-core/Makefile.in index 59b161a7f6b..98ea225b240 100644 --- a/dom/tests/mochitest/dom-level1-core/Makefile.in +++ b/dom/tests/mochitest/dom-level1-core/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES_A = \ DOMTestCase.js \ activity-home.css \ @@ -567,5 +559,3 @@ MOCHITEST_FILES_G = \ # name is too long for Windows little brain. MOCHITEST_FILES_PARTS := $(foreach part,A B C D E F G,MOCHITEST_FILES_$(part)) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/dom-level1-core/files/Makefile.in b/dom/tests/mochitest/dom-level1-core/files/Makefile.in index 79fb83147a5..e1dbea34407 100644 --- a/dom/tests/mochitest/dom-level1-core/files/Makefile.in +++ b/dom/tests/mochitest/dom-level1-core/files/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ hc_nodtdstaff.html \ hc_nodtdstaff.xhtml \ @@ -32,5 +24,3 @@ MOCHITEST_FILES = \ xhtml-symbol.ent \ xhtml1-strict.dtd \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/dom-level2-core/Makefile.in b/dom/tests/mochitest/dom-level2-core/Makefile.in index e4fb99ac7c3..8381420a2bc 100644 --- a/dom/tests/mochitest/dom-level2-core/Makefile.in +++ b/dom/tests/mochitest/dom-level2-core/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES_A = \ DOMTestCase.js \ exclusions.js \ @@ -275,5 +267,3 @@ MOCHITEST_FILES_F = \ $(NULL) MOCHITEST_FILES_PARTS := $(foreach part,A B C D E F,MOCHITEST_FILES_$(part)) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/dom-level2-core/files/Makefile.in b/dom/tests/mochitest/dom-level2-core/files/Makefile.in index 04084651550..5608244955a 100644 --- a/dom/tests/mochitest/dom-level2-core/files/Makefile.in +++ b/dom/tests/mochitest/dom-level2-core/files/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ hc_staff.html \ hc_staff.svg \ @@ -37,5 +29,3 @@ MOCHITEST_FILES = \ xhtml1-strict.dtd \ xhtml1-transitional.dtd \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/dom-level2-html/Makefile.in b/dom/tests/mochitest/dom-level2-html/Makefile.in index 09d51a24099..fecb7277038 100644 --- a/dom/tests/mochitest/dom-level2-html/Makefile.in +++ b/dom/tests/mochitest/dom-level2-html/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES_A = \ DOMTestCase.js \ test_anchor01.html \ @@ -696,5 +688,3 @@ MOCHITEST_FILES_F = \ $(NULL) MOCHITEST_FILES_PARTS := $(foreach part,A B C D E,MOCHITEST_FILES_$(part)) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/dom-level2-html/files/Makefile.in b/dom/tests/mochitest/dom-level2-html/files/Makefile.in index d2dc024d59c..cc904ccfed2 100644 --- a/dom/tests/mochitest/dom-level2-html/files/Makefile.in +++ b/dom/tests/mochitest/dom-level2-html/files/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ anchor.html \ anchor.xhtml \ @@ -218,5 +210,3 @@ MOCHITEST_FILES = \ xhtml1-strict.dtd \ xhtml1-transitional.dtd \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/dom-level2-html/files/applets/org/w3c/domts/Makefile.in b/dom/tests/mochitest/dom-level2-html/files/applets/org/w3c/domts/Makefile.in index 7de0bc4b8db..f8c35b15a81 100644 --- a/dom/tests/mochitest/dom-level2-html/files/applets/org/w3c/domts/Makefile.in +++ b/dom/tests/mochitest/dom-level2-html/files/applets/org/w3c/domts/Makefile.in @@ -2,16 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES := \ DOMTSApplet.class \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/gamepad/Makefile.in b/dom/tests/mochitest/gamepad/Makefile.in index 3d63b0e083c..90ff525e3f8 100644 --- a/dom/tests/mochitest/gamepad/Makefile.in +++ b/dom/tests/mochitest/gamepad/Makefile.in @@ -2,14 +2,8 @@ # License, v. 2.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 = dom/tests/mochitest/gamepad -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_gamepad.html \ test_gamepad_connect_events.html \ @@ -20,5 +14,3 @@ MOCHITEST_FILES = \ test_navigator_gamepads.html \ mock_gamepad.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/general/Makefile.in b/dom/tests/mochitest/general/Makefile.in index 99767603c24..a3ac0c8913f 100644 --- a/dom/tests/mochitest/general/Makefile.in +++ b/dom/tests/mochitest/general/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test__content.html \ file_MozEnteredDomFullscreen.html \ @@ -67,5 +59,3 @@ MOCHITEST_CHROME_FILES = \ test_offsets.js \ test_offsets.css \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/geolocation/Makefile.in b/dom/tests/mochitest/geolocation/Makefile.in index eec49e8dd70..3fa7bc435f2 100644 --- a/dom/tests/mochitest/geolocation/Makefile.in +++ b/dom/tests/mochitest/geolocation/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_allowCurrent.html \ test_allowWatch.html \ @@ -36,5 +28,3 @@ MOCHITEST_FILES = \ network_geolocation.sjs \ windowTest.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/localstorage/Makefile.in b/dom/tests/mochitest/localstorage/Makefile.in index e2f32625fc7..691b494bec4 100644 --- a/dom/tests/mochitest/localstorage/Makefile.in +++ b/dom/tests/mochitest/localstorage/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ frameAppIsolation.html \ frameChromeSlave.html \ @@ -64,5 +56,3 @@ MOCHITEST_CHROME_FILES = \ frame_clear_browser_data.html \ page_blank.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/notification/Makefile.in b/dom/tests/mochitest/notification/Makefile.in index 1992c32c377..95e35e3a85b 100644 --- a/dom/tests/mochitest/notification/Makefile.in +++ b/dom/tests/mochitest/notification/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_CHROME_FILES = \ test_system_principal.xul \ $(NULL) @@ -23,5 +15,3 @@ MOCHITEST_FILES = \ create_notification.html \ notification_common.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/orientation/Makefile.in b/dom/tests/mochitest/orientation/Makefile.in index 75c7d02393b..415cf52a34d 100644 --- a/dom/tests/mochitest/orientation/Makefile.in +++ b/dom/tests/mochitest/orientation/Makefile.in @@ -2,17 +2,7 @@ # License, v. 2.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 = \ bug507902-frame.html \ test_bug507902.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/pointerlock/Makefile.in b/dom/tests/mochitest/pointerlock/Makefile.in index fa6252c753e..186a1e1122e 100644 --- a/dom/tests/mochitest/pointerlock/Makefile.in +++ b/dom/tests/mochitest/pointerlock/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ pointerlock_utils.js \ file_approval.html \ @@ -40,5 +32,3 @@ MOCHITEST_FILES += \ else $(filter disabled-on-linux-for-intermittent-failures--bug-788164, test_pointerlock-api.html) endif - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/sessionstorage/Makefile.in b/dom/tests/mochitest/sessionstorage/Makefile.in index b21aeb69c34..73b0080ba6f 100644 --- a/dom/tests/mochitest/sessionstorage/Makefile.in +++ b/dom/tests/mochitest/sessionstorage/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ frameReplace.html \ frameEqual.html \ @@ -30,5 +22,3 @@ MOCHITEST_FILES = \ MOCHITEST_CHROME_FILES = \ test_sessionStorageFromChrome.xhtml \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/storageevent/Makefile.in b/dom/tests/mochitest/storageevent/Makefile.in index 2f2508f6882..a95342b7f0a 100644 --- a/dom/tests/mochitest/storageevent/Makefile.in +++ b/dom/tests/mochitest/storageevent/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ frameLocalStorageMaster.html \ frameLocalStorageSlaveEqual.html \ @@ -26,5 +18,3 @@ MOCHITEST_FILES = \ interOriginFrame.js \ interOriginTest2.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/webapps/Makefile.in b/dom/tests/mochitest/webapps/Makefile.in index 046a2fb53d8..b995bf27cf7 100644 --- a/dom/tests/mochitest/webapps/Makefile.in +++ b/dom/tests/mochitest/webapps/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_CHROME_FILES = \ install_and_redirect_helper.xul \ cross_origin.html \ @@ -33,5 +25,3 @@ MOCHITEST_FILES = \ file_bug_779982.js \ file_bug_779982.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/webapps/apps/Makefile.in b/dom/tests/mochitest/webapps/apps/Makefile.in index b88db945c6e..717f28281e3 100644 --- a/dom/tests/mochitest/webapps/apps/Makefile.in +++ b/dom/tests/mochitest/webapps/apps/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_CHROME_FILES = \ basic.webapp \ basic.webapp^headers^ \ @@ -43,5 +35,3 @@ MOCHITEST_CHROME_FILES = \ launch_paths.webapp \ launch_paths.webapp^headers^ \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/webcomponents/Makefile.in b/dom/tests/mochitest/webcomponents/Makefile.in index edbccbe396f..31d9651e603 100644 --- a/dom/tests/mochitest/webcomponents/Makefile.in +++ b/dom/tests/mochitest/webcomponents/Makefile.in @@ -2,19 +2,9 @@ # License, v. 2.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 = \ test_bug900724.html \ test_document_register.html \ test_document_register_lifecycle.html \ test_template.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/tests/mochitest/whatwg/Makefile.in b/dom/tests/mochitest/whatwg/Makefile.in index 2c4a6653d35..a89e812a7e4 100644 --- a/dom/tests/mochitest/whatwg/Makefile.in +++ b/dom/tests/mochitest/whatwg/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ browserFu.js \ test_MessageEvent.html \ @@ -57,5 +49,3 @@ MOCHITEST_FILES = \ MOCHITEST_CHROME_FILES = \ test_postMessage_chrome.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/time/Makefile.in b/dom/time/Makefile.in index 50514d42687..77e0fd39739 100644 --- a/dom/time/Makefile.in +++ b/dom/time/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/voicemail/Makefile.in b/dom/voicemail/Makefile.in index 143590c476a..e2f1f0e3373 100644 --- a/dom/voicemail/Makefile.in +++ b/dom/voicemail/Makefile.in @@ -2,14 +2,4 @@ # License, v. 2.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)/dom/dom-config.mk - -include $(topsrcdir)/config/rules.mk - diff --git a/dom/wifi/Makefile.in b/dom/wifi/Makefile.in index 1e569fdf9c1..6900248f94b 100644 --- a/dom/wifi/Makefile.in +++ b/dom/wifi/Makefile.in @@ -2,17 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 include $(topsrcdir)/dom/dom-config.mk - -include $(topsrcdir)/config/rules.mk - - diff --git a/dom/workers/Makefile.in b/dom/workers/Makefile.in index 511613ed3e6..36593c7eca7 100644 --- a/dom/workers/Makefile.in +++ b/dom/workers/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES = \ -I$(topsrcdir)/content/base/src \ -I$(topsrcdir)/content/events/src \ @@ -16,5 +9,3 @@ LOCAL_INCLUDES = \ -I$(topsrcdir)/dom/system \ -I$(topsrcdir)/xpcom/build \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/workers/test/Makefile.in b/dom/workers/test/Makefile.in index 50507348920..f6913ac62e0 100644 --- a/dom/workers/test/Makefile.in +++ b/dom/workers/test/Makefile.in @@ -2,15 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_404.html \ test_atob.html \ @@ -154,5 +145,3 @@ MOCHITEST_CHROME_FILES = \ test_bug883784.jsm \ jsm_url_worker.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/workers/test/extensions/bootstrap/Makefile.in b/dom/workers/test/extensions/bootstrap/Makefile.in index 96b08d1be7d..eab7a52c57b 100644 --- a/dom/workers/test/extensions/bootstrap/Makefile.in +++ b/dom/workers/test/extensions/bootstrap/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - XPI_NAME = workerbootstrap DIST_FILES = \ diff --git a/dom/workers/test/extensions/traditional/Makefile.in b/dom/workers/test/extensions/traditional/Makefile.in index 07f0fb213f0..d3db4c7e1cc 100644 --- a/dom/workers/test/extensions/traditional/Makefile.in +++ b/dom/workers/test/extensions/traditional/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - XPI_NAME = worker DIST_FILES = \ install.rdf \ diff --git a/dom/workers/test/subdir/Makefile.in b/dom/workers/test/subdir/Makefile.in index 621db8dc83d..5553563e226 100644 --- a/dom/workers/test/subdir/Makefile.in +++ b/dom/workers/test/subdir/Makefile.in @@ -2,18 +2,8 @@ # License, v. 2.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 := \ relativeLoad_sub_worker.js \ relativeLoad_sub_worker2.js \ relativeLoad_sub_import.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/editor/composer/src/Makefile.in b/editor/composer/src/Makefile.in index 592154674c5..8d9f821f062 100644 --- a/editor/composer/src/Makefile.in +++ b/editor/composer/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk @@ -41,4 +34,3 @@ libs:: install:: $(SYSINSTALL) $(IFLAGS1) $(_FILES) $(DESTDIR)$(mozappdir)/res - diff --git a/editor/composer/test/Makefile.in b/editor/composer/test/Makefile.in index 52f5df77623..2e9d17a4dd7 100644 --- a/editor/composer/test/Makefile.in +++ b/editor/composer/test/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_bug348497.html \ test_bug384147.html \ @@ -26,5 +18,3 @@ MOCHITEST_CHROME_FILES = \ test_bug678842.html \ test_async_UpdateCurrentDictionary.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/editor/libeditor/base/Makefile.in b/editor/libeditor/base/Makefile.in index c140237a7b4..304d81aad2b 100644 --- a/editor/libeditor/base/Makefile.in +++ b/editor/libeditor/base/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES += \ -I$(topsrcdir)/editor/libeditor/text \ -I$(topsrcdir)/editor/txmgr/src \ @@ -18,5 +11,3 @@ LOCAL_INCLUDES += \ -I$(topsrcdir)/layout/style \ -I$(topsrcdir)/extensions/spellcheck/src \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/editor/libeditor/base/tests/Makefile.in b/editor/libeditor/base/tests/Makefile.in index 10383b1dc26..9de17b442a9 100644 --- a/editor/libeditor/base/tests/Makefile.in +++ b/editor/libeditor/base/tests/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_bug408231.html \ test_bug502673.html \ @@ -31,6 +23,3 @@ MOCHITEST_CHROME_FILES = \ test_dragdrop.html \ test_bug599983.xul \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/editor/libeditor/html/Makefile.in b/editor/libeditor/html/Makefile.in index cfa7e057d40..158234971ce 100644 --- a/editor/libeditor/html/Makefile.in +++ b/editor/libeditor/html/Makefile.in @@ -3,12 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk INCLUDES += -I$(topsrcdir)/editor/libeditor/base \ diff --git a/editor/libeditor/html/tests/Makefile.in b/editor/libeditor/html/tests/Makefile.in index 1ea47976605..b9adc11dcaf 100644 --- a/editor/libeditor/html/tests/Makefile.in +++ b/editor/libeditor/html/tests/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ green.png \ test_bug200416.html \ diff --git a/editor/libeditor/text/Makefile.in b/editor/libeditor/text/Makefile.in index 6de6eac10bf..bbc7083df0f 100644 --- a/editor/libeditor/text/Makefile.in +++ b/editor/libeditor/text/Makefile.in @@ -3,12 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/editor/libeditor/text/tests/Makefile.in b/editor/libeditor/text/tests/Makefile.in index 4417a8d1f88..5a62866734b 100644 --- a/editor/libeditor/text/tests/Makefile.in +++ b/editor/libeditor/text/tests/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_bug318065.html \ test_bug471722.html \ @@ -51,6 +43,3 @@ MOCHITEST_CHROME_FILES = \ test_bug636465.xul \ test_bug830600.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/editor/txmgr/src/Makefile.in b/editor/txmgr/src/Makefile.in index 230e328fd40..a328285626a 100644 --- a/editor/txmgr/src/Makefile.in +++ b/editor/txmgr/src/Makefile.in @@ -3,12 +3,4 @@ # License, v. 2.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 - diff --git a/embedding/browser/build/Makefile.in b/embedding/browser/build/Makefile.in index 553c1109a44..9adb707ba7e 100644 --- a/embedding/browser/build/Makefile.in +++ b/embedding/browser/build/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 SHARED_LIBRARY_LIBS= \ ../webBrowser/$(LIB_PREFIX)nsWebBrowser_s.$(LIB_SUFFIX) \ diff --git a/embedding/browser/webBrowser/Makefile.in b/embedding/browser/webBrowser/Makefile.in index 6eb70043309..a909f0b1257 100644 --- a/embedding/browser/webBrowser/Makefile.in +++ b/embedding/browser/webBrowser/Makefile.in @@ -3,16 +3,8 @@ # License, v. 2.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 - LOCAL_INCLUDES = \ -I$(srcdir)/../../../content/base/src \ -I$(srcdir)/../../../content/svg/content/src \ $(NULL) -include $(topsrcdir)/config/rules.mk diff --git a/embedding/components/build/Makefile.in b/embedding/components/build/Makefile.in index d2e00747186..51927762849 100644 --- a/embedding/components/build/Makefile.in +++ b/embedding/components/build/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 SHARED_LIBRARY_LIBS = \ ../windowwatcher/src/$(LIB_PREFIX)windowwatcher_s.$(LIB_SUFFIX) \ @@ -49,5 +42,3 @@ endif ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) LOCAL_INCLUDES += -I$(srcdir)/../printingui/src/mac endif - -include $(topsrcdir)/config/rules.mk diff --git a/embedding/components/printingui/src/mac/Makefile.in b/embedding/components/printingui/src/mac/Makefile.in index 94df80c131f..84be2a747fe 100644 --- a/embedding/components/printingui/src/mac/Makefile.in +++ b/embedding/components/printingui/src/mac/Makefile.in @@ -3,13 +3,4 @@ # License, v. 2.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 - diff --git a/embedding/components/printingui/src/os2/Makefile.in b/embedding/components/printingui/src/os2/Makefile.in index 94df80c131f..84be2a747fe 100644 --- a/embedding/components/printingui/src/os2/Makefile.in +++ b/embedding/components/printingui/src/os2/Makefile.in @@ -3,13 +3,4 @@ # License, v. 2.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 - diff --git a/embedding/components/printingui/src/unixshared/Makefile.in b/embedding/components/printingui/src/unixshared/Makefile.in index 94df80c131f..84be2a747fe 100644 --- a/embedding/components/printingui/src/unixshared/Makefile.in +++ b/embedding/components/printingui/src/unixshared/Makefile.in @@ -3,13 +3,4 @@ # License, v. 2.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 - diff --git a/embedding/components/printingui/src/win/Makefile.in b/embedding/components/printingui/src/win/Makefile.in index 94df80c131f..84be2a747fe 100644 --- a/embedding/components/printingui/src/win/Makefile.in +++ b/embedding/components/printingui/src/win/Makefile.in @@ -3,13 +3,4 @@ # License, v. 2.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 - diff --git a/embedding/components/webbrowserpersist/src/Makefile.in b/embedding/components/webbrowserpersist/src/Makefile.in index 3beef4b0fae..726d57a667e 100644 --- a/embedding/components/webbrowserpersist/src/Makefile.in +++ b/embedding/components/webbrowserpersist/src/Makefile.in @@ -3,17 +3,9 @@ # License, v. 2.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$(topsrcdir)/content/html/content/src \ -I$(topsrcdir)/content/base/src \ $(NULL) - diff --git a/embedding/components/windowwatcher/src/Makefile.in b/embedding/components/windowwatcher/src/Makefile.in index c199269872e..dfe3232e371 100644 --- a/embedding/components/windowwatcher/src/Makefile.in +++ b/embedding/components/windowwatcher/src/Makefile.in @@ -3,16 +3,7 @@ # License, v. 2.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 - # For nsJSUtils LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/base \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/embedding/test/Makefile.in b/embedding/test/Makefile.in index 7842e2f3343..74b3841b66e 100644 --- a/embedding/test/Makefile.in +++ b/embedding/test/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_bug293834.html \ bug293834_form.html \ @@ -22,5 +14,3 @@ MOCHITEST_FILES = \ test_private_window_from_content.html \ test_window_open_units.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/embedding/tests/winEmbed/Makefile.in b/embedding/tests/winEmbed/Makefile.in index e3caa35df4f..d705d1f215d 100644 --- a/embedding/tests/winEmbed/Makefile.in +++ b/embedding/tests/winEmbed/Makefile.in @@ -27,13 +27,6 @@ # # ***** END LICENSE BLOCK ***** -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - XPI_NAME = winembed RESFILE = winEmbed.res diff --git a/extensions/auth/Makefile.in b/extensions/auth/Makefile.in index d6e846e05ef..6c17e4e0fb1 100644 --- a/extensions/auth/Makefile.in +++ b/extensions/auth/Makefile.in @@ -3,16 +3,7 @@ # License, v. 2.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 ifeq ($(OS_ARCH),WINNT) LOCAL_INCLUDES += -DUSE_SSPI endif - -include $(topsrcdir)/config/rules.mk diff --git a/extensions/cookie/Makefile.in b/extensions/cookie/Makefile.in index 711dc3a4521..ba6b76d8227 100644 --- a/extensions/cookie/Makefile.in +++ b/extensions/cookie/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 diff --git a/extensions/cookie/test/Makefile.in b/extensions/cookie/test/Makefile.in index 2183452c612..172973049f6 100644 --- a/extensions/cookie/test/Makefile.in +++ b/extensions/cookie/test/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_samedomain.html \ file_testcommon.js \ @@ -60,6 +52,3 @@ MOCHITEST_CHROME_FILES = \ MOCHITEST_BROWSER_FILES = \ browser_test_favicon.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/extensions/gio/Makefile.in b/extensions/gio/Makefile.in index f5a630c97d1..89d651d4ed0 100644 --- a/extensions/gio/Makefile.in +++ b/extensions/gio/Makefile.in @@ -3,14 +3,5 @@ # License, v. 2.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 LOCAL_INCLUDES = $(MOZ_GIO_CFLAGS) - -include $(topsrcdir)/config/rules.mk diff --git a/extensions/gnomevfs/Makefile.in b/extensions/gnomevfs/Makefile.in index 7d64e9727f0..03ceda58873 100644 --- a/extensions/gnomevfs/Makefile.in +++ b/extensions/gnomevfs/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - SHORT_LIBNAME = nkgnomevfs IS_COMPONENT = 1 @@ -26,5 +19,3 @@ EXTRA_DSO_LDOPTS = \ # application. this is necessary since we don't want to force users # to install gnome-vfs2 in order to use the rest of mozilla ;-) FORCE_SHARED_LIB= 1 - -include $(topsrcdir)/config/rules.mk diff --git a/extensions/permissions/Makefile.in b/extensions/permissions/Makefile.in index 3d29be25d14..f76e93c4ff5 100644 --- a/extensions/permissions/Makefile.in +++ b/extensions/permissions/Makefile.in @@ -2,12 +2,4 @@ # License, v. 2.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 diff --git a/extensions/pref/autoconfig/src/Makefile.in b/extensions/pref/autoconfig/src/Makefile.in index ad702409c25..cb691ba431b 100644 --- a/extensions/pref/autoconfig/src/Makefile.in +++ b/extensions/pref/autoconfig/src/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 AUTOCFG_JS_EXPORTS = \ $(srcdir)/prefcalls.js \ @@ -31,6 +24,3 @@ endif endif endif endif - -include $(topsrcdir)/config/rules.mk - diff --git a/extensions/spellcheck/hunspell/src/Makefile.in b/extensions/spellcheck/hunspell/src/Makefile.in index 026922dd24d..dae7fc079e3 100644 --- a/extensions/spellcheck/hunspell/src/Makefile.in +++ b/extensions/spellcheck/hunspell/src/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifndef MOZ_NATIVE_HUNSPELL # This variable is referenced in configure.in. Make sure to change that file # too if you need to change this variable. diff --git a/extensions/spellcheck/locales/Makefile.in b/extensions/spellcheck/locales/Makefile.in index cf6c11abf0c..e31cf9b921e 100644 --- a/extensions/spellcheck/locales/Makefile.in +++ b/extensions/spellcheck/locales/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 diff --git a/extensions/spellcheck/src/Makefile.in b/extensions/spellcheck/src/Makefile.in index 83096b06e6b..5d2370e0611 100644 --- a/extensions/spellcheck/src/Makefile.in +++ b/extensions/spellcheck/src/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 SHARED_LIBRARY_LIBS += ../hunspell/src/$(LIB_PREFIX)hunspell_s.$(LIB_SUFFIX) diff --git a/extensions/spellcheck/tests/chrome/Makefile.in b/extensions/spellcheck/tests/chrome/Makefile.in index bbff6f6f002..c2d73bea134 100644 --- a/extensions/spellcheck/tests/chrome/Makefile.in +++ b/extensions/spellcheck/tests/chrome/Makefile.in @@ -3,15 +3,5 @@ # License, v. 2.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_add_remove_dictionaries.xul \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/extensions/spellcheck/tests/chrome/base/Makefile.in b/extensions/spellcheck/tests/chrome/base/Makefile.in index 0965eaab3e5..f5c9c8c2776 100644 --- a/extensions/spellcheck/tests/chrome/base/Makefile.in +++ b/extensions/spellcheck/tests/chrome/base/Makefile.in @@ -3,16 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_CHROME_FILES = base_utf.dic \ base_utf.aff \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/extensions/spellcheck/tests/chrome/map/Makefile.in b/extensions/spellcheck/tests/chrome/map/Makefile.in index ca847d251ca..45e6d1b5169 100644 --- a/extensions/spellcheck/tests/chrome/map/Makefile.in +++ b/extensions/spellcheck/tests/chrome/map/Makefile.in @@ -3,16 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_CHROME_FILES = maputf.dic \ maputf.aff \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/extensions/universalchardet/src/xpcom/Makefile.in b/extensions/universalchardet/src/xpcom/Makefile.in index 50cdbe77134..99439ba0758 100644 --- a/extensions/universalchardet/src/xpcom/Makefile.in +++ b/extensions/universalchardet/src/xpcom/Makefile.in @@ -3,18 +3,9 @@ # License, v. 2.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 LOCAL_INCLUDES = -I$(srcdir)/../base SHARED_LIBRARY_LIBS = \ ../base/$(LIB_PREFIX)universalchardet_s.$(LIB_SUFFIX) \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/extensions/universalchardet/tests/Makefile.in b/extensions/universalchardet/tests/Makefile.in index 1f370bc6271..f1230640905 100644 --- a/extensions/universalchardet/tests/Makefile.in +++ b/extensions/universalchardet/tests/Makefile.in @@ -3,15 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -relativesrcdir = @relativesrcdir@ - MOCHITEST_CHROME_FILES = \ CharsetDetectionTests.js \ bug9357_text.html \ @@ -70,5 +61,3 @@ MOCHITEST_CHROME_FILES = \ test_bug811363-2-8.html \ test_bug811363-2-9.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/extensions/widgetutils/Makefile.in b/extensions/widgetutils/Makefile.in index f5dd24e99fd..fcd3970d99c 100644 --- a/extensions/widgetutils/Makefile.in +++ b/extensions/widgetutils/Makefile.in @@ -3,13 +3,6 @@ # 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 - XPI_NAME = widgetutils INSTALL_EXTENSION_ID = widgetutils@extensions.mozilla.org @@ -26,5 +19,3 @@ XULAPP_DEFINES = \ ifdef TARGET_XPCOM_ABI XULAPP_DEFINES += -DEM_ABI=$(OS_TARGET)_$(TARGET_XPCOM_ABI) endif - -include $(topsrcdir)/config/rules.mk diff --git a/extensions/widgetutils/src/Makefile.in b/extensions/widgetutils/src/Makefile.in index 75752ead81e..09540c70351 100644 --- a/extensions/widgetutils/src/Makefile.in +++ b/extensions/widgetutils/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - XPI_NAME = widgetutils SHORT_LIBNAME = widgetutils FORCE_SHARED_LIB = 1 @@ -24,5 +17,3 @@ EXTRA_DSO_LDOPTS = \ ifdef TARGET_XPCOM_ABI FINAL_TARGET=$(DIST)/xpi-stage/$(XPI_NAME)/platform/$(OS_TARGET)_$(TARGET_XPCOM_ABI) endif - -include $(topsrcdir)/config/rules.mk diff --git a/gfx/2d/Makefile.in b/gfx/2d/Makefile.in index 51a7000c80b..ade29fb3318 100644 --- a/gfx/2d/Makefile.in +++ b/gfx/2d/Makefile.in @@ -3,13 +3,8 @@ # License, v. 2.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) $(srcdir)/unittest -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 DEFINES += -DMOZ_GFX -DUSE_CAIRO -DGFX2D_INTERNAL diff --git a/gfx/angle/Makefile.in b/gfx/angle/Makefile.in index a92b143c09e..02097a9ee89 100644 --- a/gfx/angle/Makefile.in +++ b/gfx/angle/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifeq (WINNT,$(OS_TARGET)) VISIBILITY_FLAGS = endif diff --git a/gfx/angle/src/libEGL/Makefile.in b/gfx/angle/src/libEGL/Makefile.in index 00d9dcb4056..3570212c9a5 100644 --- a/gfx/angle/src/libEGL/Makefile.in +++ b/gfx/angle/src/libEGL/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # On Windows, we don't automatically get "lib" prepended, but we need it. FORCE_SHARED_LIB = 1 diff --git a/gfx/angle/src/libGLESv2/Makefile.in b/gfx/angle/src/libGLESv2/Makefile.in index 249a3cea479..d7bba7508d9 100644 --- a/gfx/angle/src/libGLESv2/Makefile.in +++ b/gfx/angle/src/libGLESv2/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # On Windows, we don't automatically get "lib" prepended, but we need it. FORCE_SHARED_LIB = 1 diff --git a/gfx/cairo/cairo/src/Makefile.in b/gfx/cairo/cairo/src/Makefile.in index 993d7d2d6c7..b6559ac3ba8 100644 --- a/gfx/cairo/cairo/src/Makefile.in +++ b/gfx/cairo/cairo/src/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifdef GNU_CC ifeq ($(OS_TARGET),Android) MODULE_OPTIMIZE_FLAGS = -O2 @@ -130,4 +123,3 @@ endif ifdef MOZ_TREE_FREETYPE DEFINES += -DHAVE_FT_LIBRARY_SETLCDFILTER -DFT_LCD_FILTER_H="$(topsrcdir)/modules/freetype2/include/freetype/ftlcdfil.h" endif - diff --git a/gfx/cairo/libpixman/src/Makefile.in b/gfx/cairo/libpixman/src/Makefile.in index 2b3ad7f7f42..59d6cb0b2fc 100644 --- a/gfx/cairo/libpixman/src/Makefile.in +++ b/gfx/cairo/libpixman/src/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifeq ($(OS_TARGET),Android) MODULE_OPTIMIZE_FLAGS = -O2 endif diff --git a/gfx/gl/Makefile.in b/gfx/gl/Makefile.in index 4e756f24214..c2ecd980dc3 100644 --- a/gfx/gl/Makefile.in +++ b/gfx/gl/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 ifeq ($(MOZ_WIDGET_TOOLKIT),windows) ifdef MOZ_WEBGL diff --git a/gfx/graphite2/src/Makefile.in b/gfx/graphite2/src/Makefile.in index c9ffeb519c0..a35b5795f65 100644 --- a/gfx/graphite2/src/Makefile.in +++ b/gfx/graphite2/src/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # parameters for the Graphite2 files.mk fragment _NS = _BASE = $(srcdir)/.. @@ -45,4 +38,3 @@ DEFINES += -DGRAPHITE2_NFILEFACE -DGRAPHITE2_NTRACING -DGRAPHITE2_NSEGCACHE # provide a custom header that overrides malloc() and friends, # to ensure safe OOM handling DEFINES += -DGRAPHITE2_CUSTOM_HEADER="\"MozGrMalloc.h\"" - diff --git a/gfx/harfbuzz/src/Makefile.in b/gfx/harfbuzz/src/Makefile.in index 7ae75a3efd3..175ab227ecf 100644 --- a/gfx/harfbuzz/src/Makefile.in +++ b/gfx/harfbuzz/src/Makefile.in @@ -25,13 +25,6 @@ # -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifeq ($(OS_ARCH),WINNT) FORCE_STATIC_LIB = 1 endif diff --git a/gfx/ipc/Makefile.in b/gfx/ipc/Makefile.in index ae6071cd0f7..08092456080 100644 --- a/gfx/ipc/Makefile.in +++ b/gfx/ipc/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/gfx/layers/Makefile.in b/gfx/layers/Makefile.in index 110e22ae6f9..6cb91ac2cc7 100644 --- a/gfx/layers/Makefile.in +++ b/gfx/layers/Makefile.in @@ -3,9 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ VPATH = \ $(srcdir) \ $(srcdir)/basic \ @@ -18,8 +15,6 @@ VPATH = \ $(srcdir)/ipc \ $(NULL) -include $(DEPTH)/config/autoconf.mk - ifdef MOZ_DEBUG DEFINES += -DD3D_DEBUG_INFO endif diff --git a/gfx/ots/src/Makefile.in b/gfx/ots/src/Makefile.in index 39a44bce680..eb64e21db8f 100644 --- a/gfx/ots/src/Makefile.in +++ b/gfx/ots/src/Makefile.in @@ -25,13 +25,6 @@ # -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifeq (WINNT,$(OS_TARGET)) VISIBILITY_FLAGS = FORCE_STATIC_LIB = 1 @@ -50,4 +43,3 @@ DEFINES += -DMOZ_OTS_REPORT_ERRORS ifeq (WINNT,$(OS_TARGET)) DEFINES += -DOTS_DLL -DOTS_DLL_EXPORTS endif - diff --git a/gfx/qcms/Makefile.in b/gfx/qcms/Makefile.in index 61a8f785762..109ba3530e2 100644 --- a/gfx/qcms/Makefile.in +++ b/gfx/qcms/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifeq (86,$(findstring 86,$(OS_TEST))) CSRCS += transform-sse2.c ifdef _MSC_VER diff --git a/gfx/skia/Makefile.in b/gfx/skia/Makefile.in index d617e248810..84014b919c7 100644 --- a/gfx/skia/Makefile.in +++ b/gfx/skia/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 DEFINES += -DSK_A32_SHIFT=24 -DSK_R32_SHIFT=16 -DSK_G32_SHIFT=8 -DSK_B32_SHIFT=0 diff --git a/gfx/src/Makefile.in b/gfx/src/Makefile.in index 47b98f128ee..a5ef9f40b0e 100644 --- a/gfx/src/Makefile.in +++ b/gfx/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk @@ -26,4 +19,3 @@ endif ifeq ($(MOZ_WIDGET_TOOLKIT),qt) CXXFLAGS += $(MOZ_QT_CFLAGS) endif - diff --git a/gfx/tests/Makefile.in b/gfx/tests/Makefile.in index e6e23ad4678..a1c1936508f 100644 --- a/gfx/tests/Makefile.in +++ b/gfx/tests/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOZILLA_INTERNAL_API = 1 MOCHITEST_FILES = $(addprefix mochitest/, \ @@ -18,6 +10,3 @@ MOCHITEST_FILES = $(addprefix mochitest/, \ test_bug513439.html \ test_acceleration.html \ ) - -include $(topsrcdir)/config/rules.mk - diff --git a/gfx/tests/gtest/Makefile.in b/gfx/tests/gtest/Makefile.in index 34bf9654a9b..a6b395bd8d6 100644 --- a/gfx/tests/gtest/Makefile.in +++ b/gfx/tests/gtest/Makefile.in @@ -3,14 +3,7 @@ # License, v. 2.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@ $(srcdir)/$(DEPTH)/gfx/2d/unittest -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS) # Create a GTest library @@ -24,4 +17,3 @@ LOCAL_INCLUDES = \ include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk - diff --git a/gfx/thebes/Makefile.in b/gfx/thebes/Makefile.in index e68c767141c..d74556f48ed 100644 --- a/gfx/thebes/Makefile.in +++ b/gfx/thebes/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 LOCAL_INCLUDES += \ diff --git a/gfx/ycbcr/Makefile.in b/gfx/ycbcr/Makefile.in index dde0947edd0..f46fc241f73 100644 --- a/gfx/ycbcr/Makefile.in +++ b/gfx/ycbcr/Makefile.in @@ -1,10 +1,3 @@ -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/hal/Makefile.in b/hal/Makefile.in index b9fb880a43a..c01fc96070e 100644 --- a/hal/Makefile.in +++ b/hal/Makefile.in @@ -3,9 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ VPATH = \ $(srcdir) \ $(srcdir)/android \ @@ -17,10 +14,6 @@ VPATH = \ $(srcdir)/cocoa \ $(NULL) -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 MOCHITEST_BROWSER_FILES += \ tests/browser_alarms.js \ diff --git a/hal/tests/Makefile.in b/hal/tests/Makefile.in index 9243c8a21f9..b61119f23dd 100644 --- a/hal/tests/Makefile.in +++ b/hal/tests/Makefile.in @@ -2,17 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_BROWSER_FILES = \ browser_alarms.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/image/build/Makefile.in b/image/build/Makefile.in index 7f4cb466898..20eb0a62612 100644 --- a/image/build/Makefile.in +++ b/image/build/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 LOCAL_INCLUDES = \ -I. \ @@ -28,6 +21,3 @@ SHARED_LIBRARY_LIBS = \ ../encoders/jpeg/$(LIB_PREFIX)imgjpege_s.$(LIB_SUFFIX) \ ../encoders/bmp/$(LIB_PREFIX)imgbmpe_s.$(LIB_SUFFIX) \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/image/decoders/Makefile.in b/image/decoders/Makefile.in index 559787ae8f4..6166e3bcf47 100644 --- a/image/decoders/Makefile.in +++ b/image/decoders/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # Decoders need RasterImage.h LOCAL_INCLUDES += -I$(topsrcdir)/image/src/ @@ -17,6 +10,3 @@ LOCAL_INCLUDES += -I$(topsrcdir)/image/src/ DEFINES += -DMOZ_PNG_WRITE \ -DMOZ_PNG_READ \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/image/decoders/icon/Makefile.in b/image/decoders/icon/Makefile.in index 819ac56dd68..70fb6e4fb7e 100644 --- a/image/decoders/icon/Makefile.in +++ b/image/decoders/icon/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 ifdef MOZ_WIDGET_GTK PLATFORM = gtk @@ -38,5 +31,3 @@ endif SHARED_LIBRARY_LIBS = $(PLATFORM)/$(LIB_PREFIX)imgicon$(PLATFORM)_s.$(LIB_SUFFIX) LOCAL_INCLUDES = -I$(srcdir)/$(PLATFORM) - -include $(topsrcdir)/config/rules.mk diff --git a/image/decoders/icon/android/Makefile.in b/image/decoders/icon/android/Makefile.in index 75370a8aeeb..deb6de83a14 100644 --- a/image/decoders/icon/android/Makefile.in +++ b/image/decoders/icon/android/Makefile.in @@ -2,12 +2,5 @@ # License, v. 2.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)/ipc/chromium/chromium-config.mk diff --git a/image/decoders/icon/gtk/Makefile.in b/image/decoders/icon/gtk/Makefile.in index fa149a883cc..322deeed827 100644 --- a/image/decoders/icon/gtk/Makefile.in +++ b/image/decoders/icon/gtk/Makefile.in @@ -3,18 +3,8 @@ # 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 - ifdef MOZ_ENABLE_GNOMEUI LOCAL_INCLUDES += $(MOZ_GNOMEUI_CFLAGS) else LOCAL_INCLUDES += $(TK_CFLAGS) endif - -include $(topsrcdir)/config/rules.mk - diff --git a/image/decoders/icon/qt/Makefile.in b/image/decoders/icon/qt/Makefile.in index f6f6be105e5..80ab8e2a0e0 100644 --- a/image/decoders/icon/qt/Makefile.in +++ b/image/decoders/icon/qt/Makefile.in @@ -2,14 +2,4 @@ # License, v. 2.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 - LOCAL_INCLUDES += $(MOZ_QT_CFLAGS) - -include $(topsrcdir)/config/rules.mk - diff --git a/image/encoders/bmp/Makefile.in b/image/encoders/bmp/Makefile.in index 52ec2fb1cb1..bfdc5f722b8 100644 --- a/image/encoders/bmp/Makefile.in +++ b/image/encoders/bmp/Makefile.in @@ -2,15 +2,4 @@ # License, v. 2.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 - LOCAL_INCLUDES += -I$(topsrcdir)/image/src/ - -include $(topsrcdir)/config/rules.mk - - diff --git a/image/encoders/ico/Makefile.in b/image/encoders/ico/Makefile.in index 613a91c2a8c..5d17eab6513 100644 --- a/image/encoders/ico/Makefile.in +++ b/image/encoders/ico/Makefile.in @@ -2,18 +2,7 @@ # License, v. 2.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 - # Decoders need RasterImage.h LOCAL_INCLUDES += -I$(topsrcdir)/image/src/ LOCAL_INCLUDES += -I$(topsrcdir)/image/encoders/bmp/ LOCAL_INCLUDES += -I$(topsrcdir)/image/encoders/png/ - -include $(topsrcdir)/config/rules.mk - - diff --git a/image/encoders/png/Makefile.in b/image/encoders/png/Makefile.in index 2bb1a80ada2..d6affc6a862 100644 --- a/image/encoders/png/Makefile.in +++ b/image/encoders/png/Makefile.in @@ -2,19 +2,8 @@ # License, v. 2.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 += -DMOZ_PNG_WRITE \ -DMOZ_PNG_READ \ $(NULL) LOCAL_INCLUDES += -I$(topsrcdir)/image/src/ - -include $(topsrcdir)/config/rules.mk - - diff --git a/image/src/Makefile.in b/image/src/Makefile.in index b74bb645caf..fdbef391ae4 100644 --- a/image/src/Makefile.in +++ b/image/src/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - - # We need to instantiate the decoders LOCAL_INCLUDES += -I$(topsrcdir)/image/decoders @@ -31,5 +23,3 @@ include $(topsrcdir)/ipc/chromium/chromium-config.mk # Because imgFrame.cpp includes "cairo.h" CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) - - diff --git a/image/test/browser/Makefile.in b/image/test/browser/Makefile.in index c021eed9a21..24b1f27bc55 100644 --- a/image/test/browser/Makefile.in +++ b/image/test/browser/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_BROWSER_FILES = head.js \ browser_image.js \ image.html \ @@ -19,5 +11,3 @@ MOCHITEST_BROWSER_FILES = head.js \ browser_bug666317.js \ big.png \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/image/test/mochitest/Makefile.in b/image/test/mochitest/Makefile.in index 3935249e510..30c46a52454 100644 --- a/image/test/mochitest/Makefile.in +++ b/image/test/mochitest/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = imgutils.js \ animationPolling.js \ lime100x100.svg \ @@ -118,5 +110,3 @@ MOCHITEST_CHROME_FILES = imgutils.js \ animated2.gif \ test_staticClone.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/intl/build/Makefile.in b/intl/build/Makefile.in index e3bd610b879..dd211dae7af 100644 --- a/intl/build/Makefile.in +++ b/intl/build/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 # see also intl/locale/src/Makefile.in @@ -39,5 +32,3 @@ SHARED_LIBRARY_LIBS = \ ../locale/src/$(LOCALE_DIR)/$(LIB_PREFIX)platlocale_s.$(LIB_SUFFIX) \ ../hyphenation/src/$(HYPHENATION_DIR)/$(LIB_PREFIX)hyphenation_s.$(LIB_SUFFIX) \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/intl/chardet/src/Makefile.in b/intl/chardet/src/Makefile.in index 7cd163587f0..a328285626a 100644 --- a/intl/chardet/src/Makefile.in +++ b/intl/chardet/src/Makefile.in @@ -3,12 +3,4 @@ # License, v. 2.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 diff --git a/intl/locale/src/Makefile.in b/intl/locale/src/Makefile.in index 6432650f77d..18a8c686093 100644 --- a/intl/locale/src/Makefile.in +++ b/intl/locale/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifeq ($(MOZ_WIDGET_TOOLKIT), qt) OS_INCLUDES += $(MOZ_QT_CFLAGS) endif diff --git a/intl/locale/src/mac/Makefile.in b/intl/locale/src/mac/Makefile.in index 170eb4439f7..048239d2993 100644 --- a/intl/locale/src/mac/Makefile.in +++ b/intl/locale/src/mac/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk INCLUDES += -I$(srcdir)/.. diff --git a/intl/locale/src/os2/Makefile.in b/intl/locale/src/os2/Makefile.in index 4c7b1925769..18e043473fb 100644 --- a/intl/locale/src/os2/Makefile.in +++ b/intl/locale/src/os2/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/intl/locale/src/unix/Makefile.in b/intl/locale/src/unix/Makefile.in index cd8fc6a9f66..22d86ca3942 100644 --- a/intl/locale/src/unix/Makefile.in +++ b/intl/locale/src/unix/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk INCLUDES += -I$(srcdir)/.. diff --git a/intl/locale/src/windows/Makefile.in b/intl/locale/src/windows/Makefile.in index 596b7dfd724..d432c3df3bc 100644 --- a/intl/locale/src/windows/Makefile.in +++ b/intl/locale/src/windows/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk INCLUDES += -I$(srcdir)/.. diff --git a/intl/locales/Makefile.in b/intl/locales/Makefile.in index 4490abd17ee..850178990fb 100644 --- a/intl/locales/Makefile.in +++ b/intl/locales/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 diff --git a/intl/lwbrk/src/Makefile.in b/intl/lwbrk/src/Makefile.in index 9d01272aa37..da28c981e5e 100644 --- a/intl/lwbrk/src/Makefile.in +++ b/intl/lwbrk/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk ifdef MOZ_WIDGET_GTK diff --git a/intl/lwbrk/tests/Makefile.in b/intl/lwbrk/tests/Makefile.in index ebac0140463..a859ba938a5 100644 --- a/intl/lwbrk/tests/Makefile.in +++ b/intl/lwbrk/tests/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = -I$(srcdir)/../public diff --git a/intl/uconv/src/Makefile.in b/intl/uconv/src/Makefile.in index d57c8df4e2a..9622fe8028e 100644 --- a/intl/uconv/src/Makefile.in +++ b/intl/uconv/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 LOCAL_INCLUDES = -I$(srcdir)/../util \ -I$(srcdir)/../ucvlatin \ diff --git a/intl/uconv/tests/Makefile.in b/intl/uconv/tests/Makefile.in index 7e216b79409..097b2c95bef 100644 --- a/intl/uconv/tests/Makefile.in +++ b/intl/uconv/tests/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_bug335816.html \ test_bug843434.html \ @@ -21,5 +13,3 @@ MOCHITEST_FILES = \ test_unicode_noncharacters_utf8.html \ test_utf8_overconsumption.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/intl/uconv/tools/Makefile.in b/intl/uconv/tools/Makefile.in index d6d26bb03ee..7643298750a 100644 --- a/intl/uconv/tools/Makefile.in +++ b/intl/uconv/tools/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk # needed for mac linux @@ -18,4 +11,3 @@ ifneq ($(OS_RELEASE),1.2) OS_LIBS += /usr/lib/libdl.so endif endif - diff --git a/intl/uconv/ucvcn/Makefile.in b/intl/uconv/ucvcn/Makefile.in index 9ccce15a2d8..ed7d3d8d1a3 100644 --- a/intl/uconv/ucvcn/Makefile.in +++ b/intl/uconv/ucvcn/Makefile.in @@ -3,13 +3,4 @@ # License, v. 2.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 - LOCAL_INCLUDES = -I$(srcdir)/../util - -include $(topsrcdir)/config/rules.mk diff --git a/intl/uconv/ucvibm/Makefile.in b/intl/uconv/ucvibm/Makefile.in index 9ccce15a2d8..ed7d3d8d1a3 100644 --- a/intl/uconv/ucvibm/Makefile.in +++ b/intl/uconv/ucvibm/Makefile.in @@ -3,13 +3,4 @@ # License, v. 2.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 - LOCAL_INCLUDES = -I$(srcdir)/../util - -include $(topsrcdir)/config/rules.mk diff --git a/intl/uconv/ucvja/Makefile.in b/intl/uconv/ucvja/Makefile.in index f42ee4ba189..0ae97e27907 100644 --- a/intl/uconv/ucvja/Makefile.in +++ b/intl/uconv/ucvja/Makefile.in @@ -3,14 +3,4 @@ # License, v. 2.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 - LOCAL_INCLUDES = -I$(srcdir)/../util - -include $(topsrcdir)/config/rules.mk - diff --git a/intl/uconv/ucvko/Makefile.in b/intl/uconv/ucvko/Makefile.in index 77417d24545..ed7d3d8d1a3 100644 --- a/intl/uconv/ucvko/Makefile.in +++ b/intl/uconv/ucvko/Makefile.in @@ -3,14 +3,4 @@ # License, v. 2.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 - LOCAL_INCLUDES = -I$(srcdir)/../util - -include $(topsrcdir)/config/rules.mk - diff --git a/intl/uconv/ucvlatin/Makefile.in b/intl/uconv/ucvlatin/Makefile.in index ae3abe6bb54..d5cea2de78d 100644 --- a/intl/uconv/ucvlatin/Makefile.in +++ b/intl/uconv/ucvlatin/Makefile.in @@ -3,13 +3,4 @@ # License, v. 2.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 - LOCAL_INCLUDES = -I$(srcdir)/../util -I$(srcdir)/../src - -include $(topsrcdir)/config/rules.mk diff --git a/intl/uconv/ucvtw/Makefile.in b/intl/uconv/ucvtw/Makefile.in index 9ccce15a2d8..ed7d3d8d1a3 100644 --- a/intl/uconv/ucvtw/Makefile.in +++ b/intl/uconv/ucvtw/Makefile.in @@ -3,13 +3,4 @@ # License, v. 2.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 - LOCAL_INCLUDES = -I$(srcdir)/../util - -include $(topsrcdir)/config/rules.mk diff --git a/intl/uconv/ucvtw2/Makefile.in b/intl/uconv/ucvtw2/Makefile.in index f42ee4ba189..0ae97e27907 100644 --- a/intl/uconv/ucvtw2/Makefile.in +++ b/intl/uconv/ucvtw2/Makefile.in @@ -3,14 +3,4 @@ # License, v. 2.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 - LOCAL_INCLUDES = -I$(srcdir)/../util - -include $(topsrcdir)/config/rules.mk - diff --git a/intl/uconv/util/Makefile.in b/intl/uconv/util/Makefile.in index a67f1930d84..a328285626a 100644 --- a/intl/uconv/util/Makefile.in +++ b/intl/uconv/util/Makefile.in @@ -3,13 +3,4 @@ # License, v. 2.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 - diff --git a/intl/unicharutil/tables/Makefile.in b/intl/unicharutil/tables/Makefile.in index caff6062e6e..f4e2c26c732 100644 --- a/intl/unicharutil/tables/Makefile.in +++ b/intl/unicharutil/tables/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk _PROP_TABLES = \ @@ -31,4 +24,3 @@ libs:: $(_PROP_TABLES) install:: $(_PROP_TABLES) $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res/entityTables - diff --git a/intl/unicharutil/tests/Makefile.in b/intl/unicharutil/tests/Makefile.in index 042d0c42f2e..40299b69d96 100644 --- a/intl/unicharutil/tests/Makefile.in +++ b/intl/unicharutil/tests/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - USE_STATIC_LIBS = 1 LIBS = \ @@ -23,4 +15,3 @@ LIBS = \ include $(topsrcdir)/config/rules.mk INCLUDES += -I$(srcdir)/../public - diff --git a/intl/unicharutil/tools/Makefile.in b/intl/unicharutil/tools/Makefile.in index 18d899e6f64..2b8ac433b00 100644 --- a/intl/unicharutil/tools/Makefile.in +++ b/intl/unicharutil/tools/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # XXX need configure test EX_LIBS = $(shell $(GLIB_CONFIG) --libs) @@ -17,4 +10,3 @@ include $(topsrcdir)/config/rules.mk # XXX replace with proper configure test for glib CFLAGS += $(shell $(GLIB_CONFIG) --cflags) - diff --git a/intl/unicharutil/util/Makefile.in b/intl/unicharutil/util/Makefile.in index b8d4c2a0256..ba4967aa414 100644 --- a/intl/unicharutil/util/Makefile.in +++ b/intl/unicharutil/util/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # This makefile builds the unicharutil_external_s library which should be used # by frozen (dependent) linkage components. Internal-linkage code should use # unicharutil_s which is built in the internal/ subdirectory. diff --git a/intl/unicharutil/util/internal/Makefile.in b/intl/unicharutil/util/internal/Makefile.in index 7e0811da40d..2db7551de71 100644 --- a/intl/unicharutil/util/internal/Makefile.in +++ b/intl/unicharutil/util/internal/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # This makefile builds the version of unicharutils_s static library which uses # internal linkage. Components that use frozen (external) linkage should use # unicharutil_external_s. diff --git a/ipc/app/Makefile.in b/ipc/app/Makefile.in index 288caf7bc56..4a55b347e40 100644 --- a/ipc/app/Makefile.in +++ b/ipc/app/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifneq ($(dir $(PROGRAM)),./) GENERATED_DIRS = $(dir $(PROGRAM)) endif diff --git a/ipc/chromium/Makefile.in b/ipc/chromium/Makefile.in index 7a87383ebec..f6c272c86f6 100644 --- a/ipc/chromium/Makefile.in +++ b/ipc/chromium/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - OS_CXXFLAGS := $(filter-out -fshort-wchar,$(OS_CXXFLAGS)) EXPORT_LIBRARY = 1 diff --git a/ipc/dbus/Makefile.in b/ipc/dbus/Makefile.in index cee0b50dcb4..e6feecf596c 100644 --- a/ipc/dbus/Makefile.in +++ b/ipc/dbus/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 ifdef MOZ_ENABLE_DBUS diff --git a/ipc/glue/Makefile.in b/ipc/glue/Makefile.in index 714ab33e009..96c7e1241e3 100644 --- a/ipc/glue/Makefile.in +++ b/ipc/glue/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter EXPORT_LIBRARY = 1 diff --git a/ipc/ipdl/Makefile.in b/ipc/ipdl/Makefile.in index 5608fd6ff29..f26071ab172 100644 --- a/ipc/ipdl/Makefile.in +++ b/ipc/ipdl/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - GARBAGE_DIRS += _ipdlheaders GARBAGE += ipdl_lextab.py ipdl_yacctab.py $(wildcard *.pyc $(srcdir)/ipdl/*.pyc $(srcdir)/ipdl/cxx/*.pyc) diff --git a/ipc/ipdl/test/cxx/Makefile.in b/ipc/ipdl/test/cxx/Makefile.in index 50a4fdd5389..a81d69f6c45 100644 --- a/ipc/ipdl/test/cxx/Makefile.in +++ b/ipc/ipdl/test/cxx/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 IPDLTESTS = \ diff --git a/ipc/ipdl/test/cxx/app/Makefile.in b/ipc/ipdl/test/cxx/app/Makefile.in index fe219f594fe..ee55c3de192 100644 --- a/ipc/ipdl/test/cxx/app/Makefile.in +++ b/ipc/ipdl/test/cxx/app/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - NSDISTMODE = copy LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre diff --git a/ipc/ipdl/test/ipdl/Makefile.in b/ipc/ipdl/test/ipdl/Makefile.in index e42a7651f09..71981c616e3 100644 --- a/ipc/ipdl/test/ipdl/Makefile.in +++ b/ipc/ipdl/test/ipdl/Makefile.in @@ -2,12 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk OKTESTS := $(wildcard $(srcdir)/ok/*.ipdl) $(wildcard $(srcdir)/ok/*.ipdlh) diff --git a/ipc/netd/Makefile.in b/ipc/netd/Makefile.in index 1202c04971b..da4cc22ed66 100644 --- a/ipc/netd/Makefile.in +++ b/ipc/netd/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/ipc/nfc/Makefile.in b/ipc/nfc/Makefile.in index 1202c04971b..da4cc22ed66 100644 --- a/ipc/nfc/Makefile.in +++ b/ipc/nfc/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/ipc/ril/Makefile.in b/ipc/ril/Makefile.in index 1202c04971b..da4cc22ed66 100644 --- a/ipc/ril/Makefile.in +++ b/ipc/ril/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/ipc/testshell/Makefile.in b/ipc/testshell/Makefile.in index 97e53df366a..748f88067e1 100644 --- a/ipc/testshell/Makefile.in +++ b/ipc/testshell/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 # For xpcshell error messages and nsDependentJSString diff --git a/ipc/unixsocket/Makefile.in b/ipc/unixsocket/Makefile.in index 93fd4c0e90c..8e1c861dd39 100644 --- a/ipc/unixsocket/Makefile.in +++ b/ipc/unixsocket/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 diff --git a/js/ductwork/debugger/Makefile.in b/js/ductwork/debugger/Makefile.in index 4d78f806adf..71b3b58a260 100644 --- a/js/ductwork/debugger/Makefile.in +++ b/js/ductwork/debugger/Makefile.in @@ -2,19 +2,9 @@ # License, v. 2.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 - EXPORT_LIBRARY = 1 EXTRA_DSO_LDOPTS += \ $(MOZ_COMPONENT_LIBS) \ $(MOZ_JS_LIBS) \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/js/ipc/Makefile.in b/js/ipc/Makefile.in index 53fcd8f07db..38403206d1e 100644 --- a/js/ipc/Makefile.in +++ b/js/ipc/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/base \ diff --git a/js/jsd/Makefile.in b/js/jsd/Makefile.in index adc6cfeab29..3aa071a64a2 100644 --- a/js/jsd/Makefile.in +++ b/js/jsd/Makefile.in @@ -6,14 +6,6 @@ -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -VPATH = @srcdir@ -srcdir = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 # REQUIRES = java js diff --git a/js/jsd/test/Makefile.in b/js/jsd/test/Makefile.in index bf3273d724f..1538a6be92b 100644 --- a/js/jsd/test/Makefile.in +++ b/js/jsd/test/Makefile.in @@ -3,17 +3,7 @@ # License, v. 2.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 = test_bug507448.html bug507448.js \ test_bug617870-callhooks.html test-bug617870-callhooks.js jsd-test.js \ test_bug638178-execlines.html test-bug638178-execlines.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/js/src/Makefile.in b/js/src/Makefile.in index 8e6996e1e48..ea4a385e976 100644 --- a/js/src/Makefile.in +++ b/js/src/Makefile.in @@ -4,15 +4,9 @@ # License, v. 2.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@ - TOPLEVEL_BUILD := 1 run_for_side_effects := $(shell echo "MAKE: $(MAKE)") -include $(DEPTH)/config/autoconf.mk - STATIC_LIBRARY_NAME = js_static LIBS = $(NSPR_LIBS) diff --git a/js/src/config/Makefile.in b/js/src/config/Makefile.in index e1fe1f8898e..cc5fc4fc386 100644 --- a/js/src/config/Makefile.in +++ b/js/src/config/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # For sanity's sake, we compile nsinstall without the wrapped system # headers, so that we can use it to set up the wrapped system headers. VISIBILITY_FLAGS = diff --git a/js/src/devtools/rootAnalysis/Makefile.in b/js/src/devtools/rootAnalysis/Makefile.in index d1aa349a3d1..4fdac6fa712 100644 --- a/js/src/devtools/rootAnalysis/Makefile.in +++ b/js/src/devtools/rootAnalysis/Makefile.in @@ -12,11 +12,6 @@ # analysis scripts, written in JS, will run over those database files to # produce the final analysis output. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ - -include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk VPATH += $(srcdir) diff --git a/js/src/editline/Makefile.in b/js/src/editline/Makefile.in index 5c3ae6c8d77..ab4d66c17fa 100644 --- a/js/src/editline/Makefile.in +++ b/js/src/editline/Makefile.in @@ -4,16 +4,7 @@ # License, v. 2.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 DEFINES += -DANSI_ARROWS -DHAVE_TCGETATTR -DHIDE -DUSE_DIRENT -DSYS_UNIX \ -DHAVE_STDLIB -DUNIQUE_HISTORY - -include $(topsrcdir)/config/rules.mk diff --git a/js/src/gdb/Makefile.in b/js/src/gdb/Makefile.in index a582dfe5005..29b6823d954 100644 --- a/js/src/gdb/Makefile.in +++ b/js/src/gdb/Makefile.in @@ -4,13 +4,8 @@ # License, v. 2.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@ @srcdir@/tests -include $(DEPTH)/config/autoconf.mk - # Building against js_static requires that we declare mfbt sybols "exported" # on its behalf. DEFINES += -DEXPORT_JS_API -DIMPL_MFBT @@ -34,5 +29,3 @@ GDB_AUTOLOAD_FLAGS := -Dtopsrcdir=$(abspath $(topsrcdir)) INSTALL_TARGETS += GDB_INSTALL_AUTOLOAD GDB_INSTALL_AUTOLOAD_FILES := $(CURDIR)/gdb-tests-gdb.py GDB_INSTALL_AUTOLOAD_DEST := $(DIST)/bin - -include $(topsrcdir)/config/rules.mk diff --git a/js/src/jsapi-tests/Makefile.in b/js/src/jsapi-tests/Makefile.in index 10d70548683..e5d7c6eb935 100644 --- a/js/src/jsapi-tests/Makefile.in +++ b/js/src/jsapi-tests/Makefile.in @@ -4,13 +4,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - DEFINES += -DEXPORT_JS_API # Building against js_static requires that we declare mfbt sybols "exported" # on its behalf. diff --git a/js/src/shell/Makefile.in b/js/src/shell/Makefile.in index 05f591ba183..260aa21bbd2 100644 --- a/js/src/shell/Makefile.in +++ b/js/src/shell/Makefile.in @@ -4,13 +4,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifdef _MSC_VER # unnecessary PGO for js shell. But gcc cannot turn off pgo because it is # necessary to link PGO lib on gcc when a object/static lib are compiled diff --git a/js/src/tests/Makefile.in b/js/src/tests/Makefile.in index 149c02a15cb..5ba7d5d7324 100644 --- a/js/src/tests/Makefile.in +++ b/js/src/tests/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk # test files to be packaged. @@ -46,4 +39,3 @@ stage-package: $(NSINSTALL) -D $(PKG_STAGE)/jsreftest/tests (cd $(srcdir) && tar $(TAR_CREATE_FLAGS) - $(TEST_FILES)) | (cd $(PKG_STAGE)/jsreftest/tests && tar -xf -) $(PYTHON) $(srcdir)/jstests.py --make-manifests $(PKG_STAGE)/jsreftest/tests/ - diff --git a/js/xpconnect/loader/Makefile.in b/js/xpconnect/loader/Makefile.in index e7f53797150..c8109e48823 100644 --- a/js/xpconnect/loader/Makefile.in +++ b/js/xpconnect/loader/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES += \ -I$(srcdir)/../src \ -I$(srcdir)/../wrappers \ diff --git a/js/xpconnect/shell/Makefile.in b/js/xpconnect/shell/Makefile.in index 2742cbb400a..a258573f367 100644 --- a/js/xpconnect/shell/Makefile.in +++ b/js/xpconnect/shell/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FAIL_ON_WARNINGS := 1 SDK_BINARY = $(PROGRAM) diff --git a/js/xpconnect/src/Makefile.in b/js/xpconnect/src/Makefile.in index 2911973d5fd..7a1d05555dd 100644 --- a/js/xpconnect/src/Makefile.in +++ b/js/xpconnect/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES = \ -I$(srcdir)/../wrappers \ -I$(srcdir)/../loader \ diff --git a/js/xpconnect/tests/Makefile.in b/js/xpconnect/tests/Makefile.in index b077dd69795..ef09cffa57b 100644 --- a/js/xpconnect/tests/Makefile.in +++ b/js/xpconnect/tests/Makefile.in @@ -3,19 +3,9 @@ # License, v. 2.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 - LIBS = \ $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ $(LIBS_DIR) \ $(MOZ_JS_LIBS) \ $(MOZ_COMPONENT_LIBS) \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/js/xpconnect/tests/browser/Makefile.in b/js/xpconnect/tests/browser/Makefile.in index 1f8518ac125..cb05b204530 100644 --- a/js/xpconnect/tests/browser/Makefile.in +++ b/js/xpconnect/tests/browser/Makefile.in @@ -2,16 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_BROWSER_FILES := \ browser_dead_object.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/js/xpconnect/tests/chrome/Makefile.in b/js/xpconnect/tests/chrome/Makefile.in index f826e39f566..a1210fff3c5 100644 --- a/js/xpconnect/tests/chrome/Makefile.in +++ b/js/xpconnect/tests/chrome/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_CHROME_FILES = \ test_bug361111.xul \ test_bug448587.xul \ @@ -93,5 +85,3 @@ endif # Disabled due to apparent conservative stack scanner false positives on Linux64 debug. # test_watchpoints.xul \ - -include $(topsrcdir)/config/rules.mk diff --git a/js/xpconnect/tests/components/js/Makefile.in b/js/xpconnect/tests/components/js/Makefile.in index bd3d0f82758..6c1c789665b 100644 --- a/js/xpconnect/tests/components/js/Makefile.in +++ b/js/xpconnect/tests/components/js/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - IS_COMPONENT = 1 MODULE_NAME = xpconnect_test diff --git a/js/xpconnect/tests/components/native/Makefile.in b/js/xpconnect/tests/components/native/Makefile.in index c69fcd8a8f8..9a0cca644d2 100644 --- a/js/xpconnect/tests/components/native/Makefile.in +++ b/js/xpconnect/tests/components/native/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - IS_COMPONENT = 1 MODULE_NAME = xpconnect_test FORCE_SHARED_LIB = 1 diff --git a/js/xpconnect/tests/idl/Makefile.in b/js/xpconnect/tests/idl/Makefile.in index 379d862d400..166bf4665e1 100644 --- a/js/xpconnect/tests/idl/Makefile.in +++ b/js/xpconnect/tests/idl/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk componentdir = js/xpconnect/tests/components diff --git a/js/xpconnect/tests/mochitest/Makefile.in b/js/xpconnect/tests/mochitest/Makefile.in index aca7ae38620..1d58390ff8f 100644 --- a/js/xpconnect/tests/mochitest/Makefile.in +++ b/js/xpconnect/tests/mochitest/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = chrome_wrappers_helper.html \ file_documentdomain.html \ file_doublewrappedcompartments.html \ @@ -100,6 +92,3 @@ MOCHITEST_FILES = chrome_wrappers_helper.html \ test_asmjs.html \ file_asmjs.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/js/xpconnect/wrappers/Makefile.in b/js/xpconnect/wrappers/Makefile.in index c1d1c7d086c..93c13e5d07f 100644 --- a/js/xpconnect/wrappers/Makefile.in +++ b/js/xpconnect/wrappers/Makefile.in @@ -2,15 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES = \ -I$(srcdir)/../src \ -I$(srcdir)/../../../dom/base \ - -include $(topsrcdir)/config/rules.mk diff --git a/layout/base/Makefile.in b/layout/base/Makefile.in index 3f105c5393f..158a72bdfaf 100644 --- a/layout/base/Makefile.in +++ b/layout/base/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/layout/base/tests/Makefile.in b/layout/base/tests/Makefile.in index 06ff1081ded..7d12354a404 100644 --- a/layout/base/tests/Makefile.in +++ b/layout/base/tests/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ border_radius_hit_testing_iframe.html \ test_preserve3d_sorting_hit_testing.html \ @@ -366,5 +358,3 @@ endif MOCHITEST_BROWSER_FILES = \ browser_bug617076.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/layout/base/tests/chrome/Makefile.in b/layout/base/tests/chrome/Makefile.in index e3954192f91..f20a9541cf4 100644 --- a/layout/base/tests/chrome/Makefile.in +++ b/layout/base/tests/chrome/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_CHROME_FILES = \ test_bug370436.html \ test_bug396367-1.html \ @@ -63,5 +55,3 @@ MOCHITEST_CHROME_FILES += \ $(NULL) endif endif - -include $(topsrcdir)/config/rules.mk diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in index 0db2d8428cf..6cfafbacf95 100644 --- a/layout/build/Makefile.in +++ b/layout/build/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # Solaris sh blows ifeq ($(OS_ARCH),SunOS) SHELL := ksh @@ -339,4 +332,3 @@ LOCAL_INCLUDES += -I$(topsrcdir)/content/media/webspeech/synth endif #} LOCAL_INCLUDES += -I$(topsrcdir)/dom/camera - diff --git a/layout/forms/Makefile.in b/layout/forms/Makefile.in index 6ec071a7d54..1158c5242ae 100644 --- a/layout/forms/Makefile.in +++ b/layout/forms/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ @@ -22,4 +15,3 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../../editor/libeditor/text \ -I$(srcdir)/../../editor/txmgr/src \ $(NULL) - diff --git a/layout/forms/test/Makefile.in b/layout/forms/test/Makefile.in index 5bcb187be94..57d90c70959 100644 --- a/layout/forms/test/Makefile.in +++ b/layout/forms/test/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = test_bug231389.html \ test_bug287446.html \ bug287446_subframe.html \ @@ -56,5 +48,3 @@ MOCHITEST_CHROME_FILES = \ test_bug665540.html \ bug665540_window.xul \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/layout/generic/Makefile.in b/layout/generic/Makefile.in index e73c623db33..2e91333fb8a 100644 --- a/layout/generic/Makefile.in +++ b/layout/generic/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - RESOURCES_HTML = \ $(srcdir)/folder.png \ $(NULL) @@ -46,4 +39,3 @@ libs:: install:: $(SYSINSTALL) $(IFLAGS1) $(RESOURCES_HTML) $(DESTDIR)$(mozappdir)/res/html - diff --git a/layout/generic/test/Makefile.in b/layout/generic/test/Makefile.in index 45c331b682d..51ccf3b42c8 100644 --- a/layout/generic/test/Makefile.in +++ b/layout/generic/test/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - # in the list below, we make sure that the tests that require focus # run before test_plugin_clipping, which can steal focus for its window. MOCHITEST_FILES = \ @@ -131,5 +123,3 @@ MOCHITEST_CHROME_FILES = \ file_bug514732_window.xul \ test_selection_preventDefault.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/layout/inspector/src/Makefile.in b/layout/inspector/src/Makefile.in index 49c8934ec12..9b12a12515b 100644 --- a/layout/inspector/src/Makefile.in +++ b/layout/inspector/src/Makefile.in @@ -3,17 +3,8 @@ # License, v. 2.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 - LOCAL_INCLUDES += \ -I$(srcdir)/../../style \ -I$(topsrcdir)/content/base/src \ -I$(topsrcdir)/content/xbl/src \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/layout/inspector/tests/Makefile.in b/layout/inspector/tests/Makefile.in index 27fa9d12388..4b021ade049 100644 --- a/layout/inspector/tests/Makefile.in +++ b/layout/inspector/tests/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES =\ test_bug462787.html \ test_bug462789.html \ @@ -26,5 +18,3 @@ MOCHITEST_FILES =\ test_bug877690.html \ test_get_all_style_sheets.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/layout/inspector/tests/chrome/Makefile.in b/layout/inspector/tests/chrome/Makefile.in index 62231aa8732..aa09c529769 100644 --- a/layout/inspector/tests/chrome/Makefile.in +++ b/layout/inspector/tests/chrome/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_CHROME_FILES =\ test_bug467669.xul \ test_bug467669.css \ @@ -22,5 +14,3 @@ MOCHITEST_CHROME_FILES =\ test_bug727834.xul \ test_bug727834.css \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/layout/ipc/Makefile.in b/layout/ipc/Makefile.in index 494e6254fe5..654fa19b0af 100644 --- a/layout/ipc/Makefile.in +++ b/layout/ipc/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 diff --git a/layout/mathml/Makefile.in b/layout/mathml/Makefile.in index db15a65438f..380af3c038f 100644 --- a/layout/mathml/Makefile.in +++ b/layout/mathml/Makefile.in @@ -4,13 +4,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH=@DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES = \ -I$(srcdir)/../style \ -I$(srcdir)/../base \ @@ -53,4 +46,3 @@ $(DIST)/bin/res/fonts/$(math_properties) $(DESTDIR)$(mozappdir)/res/fonts/$(math libs:: $(DIST)/bin/res/fonts/$(math_properties) install:: $(DESTDIR)$(mozappdir)/res/fonts/$(math_properties) - diff --git a/layout/mathml/tests/Makefile.in b/layout/mathml/tests/Makefile.in index 90f84cce699..aca0a4567ae 100644 --- a/layout/mathml/tests/Makefile.in +++ b/layout/mathml/tests/Makefile.in @@ -3,19 +3,9 @@ # License, v. 2.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 =\ test_bug706406.html \ test_bug553917.html \ test_bug827713-2.html \ test_bug827713.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/layout/media/Makefile.in b/layout/media/Makefile.in index 53b744862ba..21962b9f006 100644 --- a/layout/media/Makefile.in +++ b/layout/media/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = $(DIST)/lib ifeq (WINNT,$(OS_TARGET)) FORCE_SHARED_LIB = 1 diff --git a/layout/printing/Makefile.in b/layout/printing/Makefile.in index d425fd8974c..a71bfcf9775 100644 --- a/layout/printing/Makefile.in +++ b/layout/printing/Makefile.in @@ -2,17 +2,9 @@ # License, v. 2.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)/../../content/base/src \ $(NULL) - diff --git a/layout/reftests/fonts/Makefile.in b/layout/reftests/fonts/Makefile.in index 65d9c1a188f..30a2f72bd5d 100644 --- a/layout/reftests/fonts/Makefile.in +++ b/layout/reftests/fonts/Makefile.in @@ -3,16 +3,8 @@ # License, v. 2.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 = fonts -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ Ahem.ttf \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/layout/reftests/fonts/mplus/Makefile.in b/layout/reftests/fonts/mplus/Makefile.in index e5b28c9b39d..5b0759daed5 100644 --- a/layout/reftests/fonts/mplus/Makefile.in +++ b/layout/reftests/fonts/mplus/Makefile.in @@ -3,16 +3,8 @@ # License, v. 2.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 = fonts/mplus -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ mplus-1p-regular.ttf \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/layout/style/Makefile.in b/layout/style/Makefile.in index 776f3bea45f..1f83b885b6a 100644 --- a/layout/style/Makefile.in +++ b/layout/style/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifdef GNU_CC OS_CFLAGS := $(OS_CFLAGS) -Wshadow OS_CXXFLAGS := $(OS_CXXFLAGS) -Wshadow @@ -54,4 +47,3 @@ libs:: $(_FILES) install:: $(_FILES) $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res - diff --git a/layout/style/test/Makefile.in b/layout/style/test/Makefile.in index 94908439f25..2e898bcaeb0 100644 --- a/layout/style/test/Makefile.in +++ b/layout/style/test/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - HOST_CPPSRCS = \ ListCSSProperties.cpp \ $(NULL) diff --git a/layout/style/test/chrome/Makefile.in b/layout/style/test/chrome/Makefile.in index 30a81d8bea4..c9d1c032717 100644 --- a/layout/style/test/chrome/Makefile.in +++ b/layout/style/test/chrome/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_CHROME_FILES = \ test_bug535806.xul \ bug535806-css.css \ @@ -25,5 +17,3 @@ MOCHITEST_FILES = \ moz_document_helper.html \ additional_sheets_helper.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/layout/svg/Makefile.in b/layout/svg/Makefile.in index 74bb3d11a02..028bc339746 100644 --- a/layout/svg/Makefile.in +++ b/layout/svg/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ @@ -27,5 +20,3 @@ libs:: install:: $(SYSINSTALL) $(IFLAGS1) $(srcdir)/svg.css $(DESTDIR)$(mozappdir)/res - - diff --git a/layout/tables/Makefile.in b/layout/tables/Makefile.in index e41c30be438..696156bfb5c 100644 --- a/layout/tables/Makefile.in +++ b/layout/tables/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk DEFINES += -DDEBUG_TABLE_STRATEGY_off diff --git a/layout/tables/test/Makefile.in b/layout/tables/test/Makefile.in index f1c75c942ed..1178cdde8cb 100644 --- a/layout/tables/test/Makefile.in +++ b/layout/tables/test/Makefile.in @@ -3,17 +3,7 @@ # License, v. 2.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 = \ test_bug337124.html \ test_bug541668_table_event_delivery.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/layout/tools/layout-debug/src/Makefile.in b/layout/tools/layout-debug/src/Makefile.in index 88811c529c0..08662c92cf5 100644 --- a/layout/tools/layout-debug/src/Makefile.in +++ b/layout/tools/layout-debug/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/layout/tools/reftest/Makefile.in b/layout/tools/reftest/Makefile.in index f716fda4798..5424b94e0ee 100644 --- a/layout/tools/reftest/Makefile.in +++ b/layout/tools/reftest/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifdef XPI_NAME NO_JS_MANIFEST = 1 DIST_FILES = install.rdf diff --git a/layout/xul/base/src/Makefile.in b/layout/xul/base/src/Makefile.in index 2a6261dc47d..7cab3c0272e 100644 --- a/layout/xul/base/src/Makefile.in +++ b/layout/xul/base/src/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ @@ -19,4 +12,3 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../../../generic \ -I$(srcdir)/../../../style \ $(NULL) - diff --git a/layout/xul/base/test/Makefile.in b/layout/xul/base/test/Makefile.in index c9fe036a8b5..58dd783e33e 100644 --- a/layout/xul/base/test/Makefile.in +++ b/layout/xul/base/test/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = test_bug511075.html \ test_splitter.xul \ test_resizer_incontent.xul \ @@ -26,5 +18,3 @@ MOCHITEST_CHROME_FILES = test_bug381167.xhtml \ window_resizer_element.xul \ test_windowminmaxsize.xul \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/layout/xul/grid/Makefile.in b/layout/xul/grid/Makefile.in index f1797eee63d..156b892c201 100644 --- a/layout/xul/grid/Makefile.in +++ b/layout/xul/grid/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES = \ -I$(srcdir) \ -I$(srcdir)/../base/src \ @@ -17,5 +10,3 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../../style \ -I$(srcdir)/../../forms \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/layout/xul/test/Makefile.in b/layout/xul/test/Makefile.in index df82e07ee4f..632fa8a72d1 100644 --- a/layout/xul/test/Makefile.in +++ b/layout/xul/test/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES =\ test_bug386386.html \ test_bug394800.xhtml \ @@ -30,5 +22,3 @@ MOCHITEST_BROWSER_FILES = \ browser_bug703210.js \ browser_bug706743.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/layout/xul/tree/Makefile.in b/layout/xul/tree/Makefile.in index 21dc290365e..4480f66a475 100644 --- a/layout/xul/tree/Makefile.in +++ b/layout/xul/tree/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES = \ -I$(srcdir) \ -I$(topsrcdir)/content/events/src \ @@ -20,5 +13,3 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../../style \ -I$(srcdir)/../../forms \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/media/kiss_fft/Makefile.in b/media/kiss_fft/Makefile.in index c0af2b97bc6..d1bf3291346 100644 --- a/media/kiss_fft/Makefile.in +++ b/media/kiss_fft/Makefile.in @@ -2,15 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifeq (WINNT,$(OS_TARGET)) VISIBILITY_FLAGS = endif -include $(topsrcdir)/config/rules.mk - diff --git a/media/libcubeb/src/Makefile.in b/media/libcubeb/src/Makefile.in index 6e9ec8e828b..0b427fe5e8d 100644 --- a/media/libcubeb/src/Makefile.in +++ b/media/libcubeb/src/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_STATIC_LIB= 1 ifeq ($(OS_TARGET),WINNT) VISIBILITY_FLAGS = diff --git a/media/libjpeg/Makefile.in b/media/libjpeg/Makefile.in index 9351e2d140d..77779c64c5f 100644 --- a/media/libjpeg/Makefile.in +++ b/media/libjpeg/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifeq ($(OS_ARCH),WINNT) VISIBILITY_FLAGS = endif diff --git a/media/libnestegg/src/Makefile.in b/media/libnestegg/src/Makefile.in index a01dfc33a27..0a73e700fe1 100644 --- a/media/libnestegg/src/Makefile.in +++ b/media/libnestegg/src/Makefile.in @@ -2,16 +2,7 @@ # License, v. 2.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 ifeq (WINNT,$(OS_TARGET)) VISIBILITY_FLAGS = endif - -include $(topsrcdir)/config/rules.mk diff --git a/media/libogg/src/Makefile.in b/media/libogg/src/Makefile.in index a01dfc33a27..0a73e700fe1 100644 --- a/media/libogg/src/Makefile.in +++ b/media/libogg/src/Makefile.in @@ -2,16 +2,7 @@ # License, v. 2.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 ifeq (WINNT,$(OS_TARGET)) VISIBILITY_FLAGS = endif - -include $(topsrcdir)/config/rules.mk diff --git a/media/libopus/Makefile.in b/media/libopus/Makefile.in index fd15d63ecd2..e23955f7079 100644 --- a/media/libopus/Makefile.in +++ b/media/libopus/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_STATIC_LIB= 1 DEFINES += \ @@ -71,5 +64,3 @@ LOCAL_INCLUDES += -I$(srcdir)/silk/float VPATH += $(srcdir)/silk/float CSRCS += $(notdir $(SILK_SOURCES_FLOAT)) endif - -include $(topsrcdir)/config/rules.mk diff --git a/media/libpng/Makefile.in b/media/libpng/Makefile.in index 36e022bc378..958b62d73a5 100644 --- a/media/libpng/Makefile.in +++ b/media/libpng/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_STATIC_LIB= 1 ifeq ($(OS_ARCH),WINNT) VISIBILITY_FLAGS= @@ -21,5 +14,3 @@ DEFINES += \ $(NULL) FORCE_STATIC_LIB = 1 - -include $(topsrcdir)/config/rules.mk diff --git a/media/libsoundtouch/src/Makefile.in b/media/libsoundtouch/src/Makefile.in index f1939894abd..8967702b09d 100644 --- a/media/libsoundtouch/src/Makefile.in +++ b/media/libsoundtouch/src/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - SHORT_LIBNAME = soundt VISIBILITY_FLAGS = EXTRA_DSO_LDOPTS += $(MOZALLOC_LIB) @@ -28,4 +21,3 @@ mmx_optimized.$(OBJ_SUFFIX): OS_CXXFLAGS += -xarch=sse2 -xO4 sse_optimized.$(OBJ_SUFFIX): OS_CXXFLAGS += -xarch=sse2 -xO4 endif endif - diff --git a/media/libspeex_resampler/src/Makefile.in b/media/libspeex_resampler/src/Makefile.in index cb0b02570e3..430be9a9641 100644 --- a/media/libspeex_resampler/src/Makefile.in +++ b/media/libspeex_resampler/src/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_STATIC_LIB = 1 # We don't compile the full speex codec, only the resampler. diff --git a/media/libtheora/lib/Makefile.in b/media/libtheora/lib/Makefile.in index 57fbd8d4be9..43f5841f47c 100644 --- a/media/libtheora/lib/Makefile.in +++ b/media/libtheora/lib/Makefile.in @@ -2,12 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_STATIC_LIB = 1 ifeq (WINNT,$(OS_TARGET)) VISIBILITY_FLAGS = diff --git a/media/libtremor/lib/Makefile.in b/media/libtremor/lib/Makefile.in index 5eb7a418801..44950ec28fc 100644 --- a/media/libtremor/lib/Makefile.in +++ b/media/libtremor/lib/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_STATIC_LIB= 1 LOCAL_INCLUDES += -I$(topsrcdir)/media/libtremor/include/tremor @@ -19,5 +12,3 @@ endif ifeq (arm_1_, $(TARGET_CPU)_$(GNU_CC)_$(MOZ_THUMB2)) DEFINES += -D_ARM_ASSEM_ endif - -include $(topsrcdir)/config/rules.mk diff --git a/media/libvorbis/lib/Makefile.in b/media/libvorbis/lib/Makefile.in index 030d2c1625f..81a708daf66 100644 --- a/media/libvorbis/lib/Makefile.in +++ b/media/libvorbis/lib/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_STATIC_LIB= 1 ifeq (WINNT,$(OS_TARGET)) VISIBILITY_FLAGS = @@ -17,5 +10,3 @@ endif ifeq ($(OS_ARCH),AIX) DEFINES += -Dalloca=__alloca endif - -include $(topsrcdir)/config/rules.mk diff --git a/media/libvpx/Makefile.in b/media/libvpx/Makefile.in index 923568845c1..c6f0edb6f2c 100644 --- a/media/libvpx/Makefile.in +++ b/media/libvpx/Makefile.in @@ -3,13 +3,6 @@ # 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 += -DHAVE_CONFIG_H=vpx_config.h FORCE_STATIC_LIB= 1 diff --git a/media/mtransport/build/Makefile.in b/media/mtransport/build/Makefile.in index 7a0d94b977d..72e14e19040 100644 --- a/media/mtransport/build/Makefile.in +++ b/media/mtransport/build/Makefile.in @@ -2,13 +2,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 - EXTRA_DEPS += $(srcdir)/../objs.mk ifeq (WINNT,$(OS_TARGET)) @@ -31,5 +24,3 @@ DEFINES += \ else ifeq (Linux,$(OS_TARGET)) DEFINES += -DLINUX endif - -include $(topsrcdir)/config/rules.mk diff --git a/media/mtransport/standalone/Makefile.in b/media/mtransport/standalone/Makefile.in index 55b8e1e7874..e479344827c 100644 --- a/media/mtransport/standalone/Makefile.in +++ b/media/mtransport/standalone/Makefile.in @@ -2,12 +2,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 $(srcdir)/../objs.mk EXTRA_DEPS += $(srcdir)/../objs.mk @@ -32,5 +26,3 @@ DEFINES += -DLINUX endif include $(srcdir)/../objs.mk - -include $(topsrcdir)/config/rules.mk diff --git a/media/mtransport/test/Makefile.in b/media/mtransport/test/Makefile.in index 47c35e3e188..0322d419aa0 100644 --- a/media/mtransport/test/Makefile.in +++ b/media/mtransport/test/Makefile.in @@ -2,13 +2,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 - DEFINES += \ -DHAVE_STRDUP -DNR_SOCKET_IS_VOID_PTR -DSCTP_DEBUG -DINET @@ -105,5 +98,3 @@ DEFINES += \ -DGTEST_USE_OWN_TR1_TUPLE=1 \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk diff --git a/media/mtransport/third_party/Makefile.in b/media/mtransport/third_party/Makefile.in index 478f151e04e..c80d579cece 100644 --- a/media/mtransport/third_party/Makefile.in +++ b/media/mtransport/third_party/Makefile.in @@ -3,13 +3,4 @@ # 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 - NO_SUBMAKEFILES_RULE = 1 - -include $(topsrcdir)/config/rules.mk diff --git a/media/omx-plugin/Makefile.in b/media/omx-plugin/Makefile.in index c86197ec60c..f2d747c7afd 100644 --- a/media/omx-plugin/Makefile.in +++ b/media/omx-plugin/Makefile.in @@ -12,13 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - MODULE_NAME = omxplugin FORCE_SHARED_LIB = 1 diff --git a/media/omx-plugin/froyo/Makefile.in b/media/omx-plugin/froyo/Makefile.in index d866553acec..0fe23352798 100644 --- a/media/omx-plugin/froyo/Makefile.in +++ b/media/omx-plugin/froyo/Makefile.in @@ -12,13 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - MODULE_NAME = omxpluginfroyo FORCE_SHARED_LIB = 1 diff --git a/media/omx-plugin/gb/Makefile.in b/media/omx-plugin/gb/Makefile.in index c45f9fa5404..3d43c011efe 100644 --- a/media/omx-plugin/gb/Makefile.in +++ b/media/omx-plugin/gb/Makefile.in @@ -12,13 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - MODULE_NAME = omxplugingb FORCE_SHARED_LIB = 1 diff --git a/media/omx-plugin/gb235/Makefile.in b/media/omx-plugin/gb235/Makefile.in index 3ef93235fcf..f5867de3ba6 100644 --- a/media/omx-plugin/gb235/Makefile.in +++ b/media/omx-plugin/gb235/Makefile.in @@ -12,13 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - MODULE_NAME = omxplugingb235 FORCE_SHARED_LIB = 1 diff --git a/media/omx-plugin/hc/Makefile.in b/media/omx-plugin/hc/Makefile.in index 06b667100f5..6e7cc9618da 100644 --- a/media/omx-plugin/hc/Makefile.in +++ b/media/omx-plugin/hc/Makefile.in @@ -12,13 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - MODULE_NAME = omxpluginhc FORCE_SHARED_LIB = 1 diff --git a/media/omx-plugin/lib/froyo/libstagefright/Makefile.in b/media/omx-plugin/lib/froyo/libstagefright/Makefile.in index a82a9b2a219..80c277633e9 100644 --- a/media/omx-plugin/lib/froyo/libstagefright/Makefile.in +++ b/media/omx-plugin/lib/froyo/libstagefright/Makefile.in @@ -11,13 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - MODULE_NAME = libandroidstagefrightfroyo FORCE_SHARED_LIB = 1 @@ -46,5 +39,3 @@ EXTRA_DSO_LDOPTS += \ -L$(DEPTH)/media/omx-plugin/lib/gb/libutils \ -lutils \ $(NULL) - - diff --git a/media/omx-plugin/lib/gb/libstagefright/Makefile.in b/media/omx-plugin/lib/gb/libstagefright/Makefile.in index 9b38a810800..901f974a64a 100644 --- a/media/omx-plugin/lib/gb/libstagefright/Makefile.in +++ b/media/omx-plugin/lib/gb/libstagefright/Makefile.in @@ -11,13 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - MODULE_NAME = libandroidstagefrightgb FORCE_SHARED_LIB = 1 @@ -46,5 +39,3 @@ EXTRA_DSO_LDOPTS += \ -L$(DEPTH)/media/omx-plugin/lib/gb/libutils \ -lutils \ $(NULL) - - diff --git a/media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in b/media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in index 3b95793e2d6..d5c8ebd1c16 100644 --- a/media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in +++ b/media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in @@ -11,13 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - MODULE_NAME = libstagefright_color_conversion FORCE_SHARED_LIB = 1 diff --git a/media/omx-plugin/lib/gb/libutils/Makefile.in b/media/omx-plugin/lib/gb/libutils/Makefile.in index 45b3c4bb91a..0d0c1e61cd6 100644 --- a/media/omx-plugin/lib/gb/libutils/Makefile.in +++ b/media/omx-plugin/lib/gb/libutils/Makefile.in @@ -11,13 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - MODULE_NAME = libandroidutilsgb FORCE_SHARED_LIB = 1 diff --git a/media/omx-plugin/lib/gb235/libstagefright/Makefile.in b/media/omx-plugin/lib/gb235/libstagefright/Makefile.in index 063813c7711..b5f0e922080 100644 --- a/media/omx-plugin/lib/gb235/libstagefright/Makefile.in +++ b/media/omx-plugin/lib/gb235/libstagefright/Makefile.in @@ -11,13 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - MODULE_NAME = libandroidstagefrightgb234 FORCE_SHARED_LIB = 1 @@ -46,5 +39,3 @@ EXTRA_DSO_LDOPTS += \ -L$(DEPTH)/media/omx-plugin/lib/gb/libutils \ -lutils \ $(NULL) - - diff --git a/media/omx-plugin/lib/hc/libstagefright/Makefile.in b/media/omx-plugin/lib/hc/libstagefright/Makefile.in index 898d76dda30..dd0782a0a8c 100644 --- a/media/omx-plugin/lib/hc/libstagefright/Makefile.in +++ b/media/omx-plugin/lib/hc/libstagefright/Makefile.in @@ -11,13 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - MODULE_NAME = libandroidstagefrighthc FORCE_SHARED_LIB = 1 @@ -46,5 +39,3 @@ EXTRA_DSO_LDOPTS += \ -L$(DEPTH)/media/omx-plugin/lib/gb/libutils \ -lutils \ $(NULL) - - diff --git a/media/omx-plugin/lib/ics/libstagefright/Makefile.in b/media/omx-plugin/lib/ics/libstagefright/Makefile.in index e9cf04780df..52778b4f735 100644 --- a/media/omx-plugin/lib/ics/libstagefright/Makefile.in +++ b/media/omx-plugin/lib/ics/libstagefright/Makefile.in @@ -11,13 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - MODULE_NAME = libandroidstagefright FORCE_SHARED_LIB = 1 @@ -46,5 +39,3 @@ EXTRA_DSO_LDOPTS += \ -L$(DEPTH)/media/omx-plugin/lib/ics/libutils \ -lutils \ $(NULL) - - diff --git a/media/omx-plugin/lib/ics/libutils/Makefile.in b/media/omx-plugin/lib/ics/libutils/Makefile.in index f7bfdbbdfba..86ec95bde5d 100644 --- a/media/omx-plugin/lib/ics/libutils/Makefile.in +++ b/media/omx-plugin/lib/ics/libutils/Makefile.in @@ -11,13 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - MODULE_NAME = libandroidutils FORCE_SHARED_LIB = 1 diff --git a/media/webrtc/Makefile.in b/media/webrtc/Makefile.in index 7e9c02a5cd8..72442409e44 100644 --- a/media/webrtc/Makefile.in +++ b/media/webrtc/Makefile.in @@ -2,13 +2,5 @@ # License, v. 2.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 - # These Makefiles don't have corresponding Makefile.ins NO_SUBMAKEFILES_RULE = 1 -include $(topsrcdir)/config/rules.mk diff --git a/media/webrtc/signaling/test/Makefile.in b/media/webrtc/signaling/test/Makefile.in index f3eb6c44243..b7bd0f1f72f 100644 --- a/media/webrtc/signaling/test/Makefile.in +++ b/media/webrtc/signaling/test/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. */ -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LIBS = \ $(XPCOM_LIBS) \ $(NSPR_LIBS) \ diff --git a/memory/build/Makefile.in b/memory/build/Makefile.in index fd4dbb869d0..44665d167d5 100644 --- a/memory/build/Makefile.in +++ b/memory/build/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_STATIC_LIB = 1 STLFLAGS = ifdef MOZ_GLUE_PROGRAM_LDFLAGS @@ -39,5 +32,3 @@ ifeq (Darwin,$(OS_TARGET)) LOCAL_INCLUDES += -I$(topsrcdir)/memory/jemalloc/src/include endif endif - -include $(topsrcdir)/config/rules.mk diff --git a/memory/jemalloc/Makefile.in b/memory/jemalloc/Makefile.in index 27cfffdd72b..c303c5b95ef 100644 --- a/memory/jemalloc/Makefile.in +++ b/memory/jemalloc/Makefile.in @@ -2,14 +2,8 @@ # License, v. 2.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) $(srcdir)/src/src -include $(DEPTH)/config/autoconf.mk - FORCE_STATIC_LIB = 1 ifdef MOZ_GLUE_PROGRAM_LDFLAGS diff --git a/memory/mozalloc/Makefile.in b/memory/mozalloc/Makefile.in index 9a00956eaff..c9be51d0196 100644 --- a/memory/mozalloc/Makefile.in +++ b/memory/mozalloc/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - VISIBILITY_FLAGS= STL_FLAGS = ifdef _MSC_VER @@ -36,5 +29,3 @@ SDK_LIBRARY = $(SHARED_LIBRARY) endif LOCAL_INCLUDES += -I$(DEPTH)/xpcom - -include $(topsrcdir)/config/rules.mk diff --git a/memory/mozjemalloc/Makefile.in b/memory/mozjemalloc/Makefile.in index da3a04ea284..2da90445f1f 100644 --- a/memory/mozjemalloc/Makefile.in +++ b/memory/mozjemalloc/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifndef MOZ_JEMALLOC3 FORCE_STATIC_LIB= 1 @@ -42,5 +35,3 @@ DEFINES += -DMOZ_REPLACE_MALLOC endif DEFINES += -DMOZ_JEMALLOC_IMPL - -include $(topsrcdir)/config/rules.mk diff --git a/memory/replace/dmd/Makefile.in b/memory/replace/dmd/Makefile.in index 71833134375..597c5121fde 100644 --- a/memory/replace/dmd/Makefile.in +++ b/memory/replace/dmd/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_SHARED_LIB= 1 DEFINES += -DMOZ_NO_MOZALLOC @@ -27,5 +20,3 @@ STL_FLAGS = ifeq ($(OS_ARCH),WINNT) OS_LIBS += $(call EXPAND_LIBNAME,dbghelp) endif - -include $(topsrcdir)/config/rules.mk diff --git a/memory/replace/dummy/Makefile.in b/memory/replace/dummy/Makefile.in index 217cbefe1f2..c509e01b41e 100644 --- a/memory/replace/dummy/Makefile.in +++ b/memory/replace/dummy/Makefile.in @@ -2,13 +2,4 @@ # License, v. 2.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_SHARED_LIB = 1 - -include $(topsrcdir)/config/rules.mk diff --git a/memory/replace/jemalloc/Makefile.in b/memory/replace/jemalloc/Makefile.in index 122468dc64c..6dc55c8378d 100644 --- a/memory/replace/jemalloc/Makefile.in +++ b/memory/replace/jemalloc/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_SHARED_LIB = 1 SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc) @@ -22,5 +15,3 @@ VPATH += $(topsrcdir)/memory/build MOZ_GLUE_LDFLAGS = # Don't link against mozglue WRAP_LDFLAGS = # Never wrap malloc function calls with -Wl,--wrap - -include $(topsrcdir)/config/rules.mk diff --git a/mfbt/Makefile.in b/mfbt/Makefile.in index c74f8d2ed1e..5d656acceb7 100644 --- a/mfbt/Makefile.in +++ b/mfbt/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_STATIC_LIB = 1 STL_FLAGS = @@ -24,5 +17,3 @@ MFBT_ROOT = $(srcdir) include $(MFBT_ROOT)/sources.mk DEFINES += -DIMPL_MFBT - -include $(topsrcdir)/config/rules.mk diff --git a/mfbt/tests/Makefile.in b/mfbt/tests/Makefile.in index fab82648a71..e7a4567e7cf 100644 --- a/mfbt/tests/Makefile.in +++ b/mfbt/tests/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - STL_FLAGS = # in order to prevent rules.mk from trying to link to libraries that are diff --git a/mobile/android/Makefile.in b/mobile/android/Makefile.in index 1c89b2ed9d2..e86aaf15ab8 100644 --- a/mobile/android/Makefile.in +++ b/mobile/android/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 diff --git a/mobile/android/app/Makefile.in b/mobile/android/app/Makefile.in index fea286acced..92ea3350707 100644 --- a/mobile/android/app/Makefile.in +++ b/mobile/android/app/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - dist_dest = $(DIST)/$(APP_NAME).app PREF_JS_EXPORTS = $(srcdir)/mobile.js diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in index b60b7620201..9320b24bcca 100644 --- a/mobile/android/base/Makefile.in +++ b/mobile/android/base/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - DIST_FILES = package-name.txt include $(topsrcdir)/mobile/android/base/android-services-files.mk diff --git a/mobile/android/base/locales/Makefile.in b/mobile/android/base/locales/Makefile.in index b39d334895a..d792f5cf9ca 100644 --- a/mobile/android/base/locales/Makefile.in +++ b/mobile/android/base/locales/Makefile.in @@ -2,12 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - include $(topsrcdir)/config/config.mk # special case some locale codes, he and id @@ -76,5 +70,3 @@ $(dir-strings-xml)/strings.xml: $(strings-xml-preqs) -DMOZ_APP_DISPLAYNAME="@MOZ_APP_DISPLAYNAME@" \ $< \ > $@ - -include $(topsrcdir)/config/rules.mk diff --git a/mobile/android/branding/aurora/locales/Makefile.in b/mobile/android/branding/aurora/locales/Makefile.in index 2839d474fe5..82f614ecea2 100644 --- a/mobile/android/branding/aurora/locales/Makefile.in +++ b/mobile/android/branding/aurora/locales/Makefile.in @@ -2,14 +2,4 @@ # License, v. 2.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 diff --git a/mobile/android/branding/beta/locales/Makefile.in b/mobile/android/branding/beta/locales/Makefile.in index 2839d474fe5..82f614ecea2 100644 --- a/mobile/android/branding/beta/locales/Makefile.in +++ b/mobile/android/branding/beta/locales/Makefile.in @@ -2,14 +2,4 @@ # License, v. 2.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 diff --git a/mobile/android/branding/nightly/locales/Makefile.in b/mobile/android/branding/nightly/locales/Makefile.in index 2839d474fe5..82f614ecea2 100644 --- a/mobile/android/branding/nightly/locales/Makefile.in +++ b/mobile/android/branding/nightly/locales/Makefile.in @@ -2,14 +2,4 @@ # License, v. 2.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 diff --git a/mobile/android/branding/official/locales/Makefile.in b/mobile/android/branding/official/locales/Makefile.in index 2839d474fe5..82f614ecea2 100644 --- a/mobile/android/branding/official/locales/Makefile.in +++ b/mobile/android/branding/official/locales/Makefile.in @@ -2,14 +2,4 @@ # License, v. 2.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 diff --git a/mobile/android/branding/unofficial/locales/Makefile.in b/mobile/android/branding/unofficial/locales/Makefile.in index 2839d474fe5..82f614ecea2 100644 --- a/mobile/android/branding/unofficial/locales/Makefile.in +++ b/mobile/android/branding/unofficial/locales/Makefile.in @@ -2,14 +2,4 @@ # License, v. 2.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 diff --git a/mobile/android/chrome/Makefile.in b/mobile/android/chrome/Makefile.in index 9c5d9451bce..6bfb40097c7 100644 --- a/mobile/android/chrome/Makefile.in +++ b/mobile/android/chrome/Makefile.in @@ -2,17 +2,8 @@ # License, v. 2.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) \ -DANDROID_PACKAGE_NAME=$(ANDROID_PACKAGE_NAME) \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/mobile/android/components/Makefile.in b/mobile/android/components/Makefile.in index affdc59832d..5f4a13ec49c 100644 --- a/mobile/android/components/Makefile.in +++ b/mobile/android/components/Makefile.in @@ -2,15 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - DEFINES += \ -DANDROID_PACKAGE_NAME=$(ANDROID_PACKAGE_NAME) \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/mobile/android/components/build/Makefile.in b/mobile/android/components/build/Makefile.in index e2c6ba886e8..7eced15d51c 100644 --- a/mobile/android/components/build/Makefile.in +++ b/mobile/android/components/build/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 ifdef MOZ_ANDROID_HISTORY @@ -17,5 +10,3 @@ LOCAL_INCLUDES += \ -I$(topsrcdir)/content/base/src \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk diff --git a/mobile/android/fonts/Makefile.in b/mobile/android/fonts/Makefile.in index 9e5fa705453..39692487322 100644 --- a/mobile/android/fonts/Makefile.in +++ b/mobile/android/fonts/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - packaged_fonts = \ CharisSILCompact-R.ttf \ CharisSILCompact-B.ttf \ @@ -29,4 +22,3 @@ include $(topsrcdir)/testing/testsuite-targets.mk libs:: $(packaged_fonts) $(INSTALL) $^ $(DIST)/bin/res/fonts/ - diff --git a/mobile/android/installer/Makefile.in b/mobile/android/installer/Makefile.in index 53d02bd9acc..a2f3cb8a9d5 100644 --- a/mobile/android/installer/Makefile.in +++ b/mobile/android/installer/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - STANDALONE_MAKEFILE := 1 # overwrite mobile-l10n.js with a matchOS=true one for multi-locale builds diff --git a/mobile/android/locales/Makefile.in b/mobile/android/locales/Makefile.in index 85385d74e5e..d38cfe357c5 100644 --- a/mobile/android/locales/Makefile.in +++ b/mobile/android/locales/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk SUBMAKEFILES += \ diff --git a/mobile/locales/Makefile.in b/mobile/locales/Makefile.in index 6a6053c7330..18505c6ffd9 100644 --- a/mobile/locales/Makefile.in +++ b/mobile/locales/Makefile.in @@ -12,13 +12,6 @@ # based on current locale. ##################################################################################### -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk USE_AUTOTARGETS_MK=1 @@ -215,4 +208,3 @@ $(bookmarks): $(bookmarks-ts) export:: searchplugins bookmarks - diff --git a/modules/libbz2/src/Makefile.in b/modules/libbz2/src/Makefile.in index e8df0a2c33a..353b8f8199b 100644 --- a/modules/libbz2/src/Makefile.in +++ b/modules/libbz2/src/Makefile.in @@ -4,13 +4,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_STATIC_LIB= 1 ifeq ($(OS_ARCH),WINNT) USE_STATIC_LIBS = 1 @@ -27,4 +20,3 @@ include $(topsrcdir)/config/rules.mk # The intermediate (.ii/.s) files for host and target can have the same name... # disable parallel builds .NOTPARALLEL: - diff --git a/modules/libjar/Makefile.in b/modules/libjar/Makefile.in index 711dc3a4521..ba6b76d8227 100644 --- a/modules/libjar/Makefile.in +++ b/modules/libjar/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 diff --git a/modules/libjar/test/chrome/Makefile.in b/modules/libjar/test/chrome/Makefile.in index b8ab6369c16..f27e52624a5 100644 --- a/modules/libjar/test/chrome/Makefile.in +++ b/modules/libjar/test/chrome/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_CHROME_FILES = \ test_bug386153.html \ signed.zip \ @@ -19,5 +11,3 @@ MOCHITEST_CHROME_FILES = \ signed-tampered.zip \ signed-added.zip \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/modules/libjar/test/mochitest/Makefile.in b/modules/libjar/test/mochitest/Makefile.in index b967bf55039..3be35c78087 100644 --- a/modules/libjar/test/mochitest/Makefile.in +++ b/modules/libjar/test/mochitest/Makefile.in @@ -3,19 +3,9 @@ # License, v. 2.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 = \ test_bug403331.html \ bug403331.zip \ bug403331.zip^headers^ \ openredirect.sjs \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/modules/libjar/zipwriter/src/Makefile.in b/modules/libjar/zipwriter/src/Makefile.in index 6a11f41acd1..a172e01cf04 100644 --- a/modules/libjar/zipwriter/src/Makefile.in +++ b/modules/libjar/zipwriter/src/Makefile.in @@ -2,12 +2,4 @@ # License, v. 2.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 diff --git a/modules/libmar/sign/Makefile.in b/modules/libmar/sign/Makefile.in index c36adb7010d..40a5958c3b3 100644 --- a/modules/libmar/sign/Makefile.in +++ b/modules/libmar/sign/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_STATIC_LIB = 1 ifeq ($(OS_ARCH),WINNT) USE_STATIC_LIBS = 1 diff --git a/modules/libmar/src/Makefile.in b/modules/libmar/src/Makefile.in index 5b1f66beb89..fa4276ab4de 100644 --- a/modules/libmar/src/Makefile.in +++ b/modules/libmar/src/Makefile.in @@ -4,13 +4,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_STATIC_LIB = 1 ifeq ($(OS_ARCH),WINNT) USE_STATIC_LIBS = 1 diff --git a/modules/libmar/tests/Makefile.in b/modules/libmar/tests/Makefile.in index 4f3de04a32f..4eb252cf7b6 100644 --- a/modules/libmar/tests/Makefile.in +++ b/modules/libmar/tests/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - TESTROOT = $(call core_abspath,$(DEPTH))/_tests/xpcshell/$(relativesrcdir) DEFINES += -DBIN_SUFFIX=$(BIN_SUFFIX) diff --git a/modules/libmar/tool/Makefile.in b/modules/libmar/tool/Makefile.in index 797a8983b58..2a548812a97 100644 --- a/modules/libmar/tool/Makefile.in +++ b/modules/libmar/tool/Makefile.in @@ -4,13 +4,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifeq ($(OS_ARCH),WINNT) USE_STATIC_LIBS = 1 endif diff --git a/modules/libmar/verify/Makefile.in b/modules/libmar/verify/Makefile.in index 60eb6a93dd8..a57d7f1b55f 100644 --- a/modules/libmar/verify/Makefile.in +++ b/modules/libmar/verify/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_STATIC_LIB = 1 ifeq ($(OS_ARCH),WINNT) USE_STATIC_LIBS = 1 diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in index f5a52b922fe..7aedc604d37 100644 --- a/modules/libpref/src/Makefile.in +++ b/modules/libpref/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 DEFINES += -DOS_ARCH=$(OS_ARCH) \ -DMOZ_WIDGET_TOOLKIT=$(MOZ_WIDGET_TOOLKIT) \ diff --git a/modules/zlib/src/Makefile.in b/modules/zlib/src/Makefile.in index f836d2c380a..aea729a99c7 100644 --- a/modules/zlib/src/Makefile.in +++ b/modules/zlib/src/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk include $(srcdir)/objs.mk CSRCS = $(MODULES_ZLIB_SRC_LCSRCS) - -include $(topsrcdir)/config/rules.mk diff --git a/mozglue/android/Makefile.in b/mozglue/android/Makefile.in index d3ac49fcb9e..36c31370d56 100644 --- a/mozglue/android/Makefile.in +++ b/mozglue/android/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_STATIC_LIB = 1 STL_FLAGS= DEFINES += \ diff --git a/mozglue/build/Makefile.in b/mozglue/build/Makefile.in index 4587181f671..f0f1ee3b21c 100644 --- a/mozglue/build/Makefile.in +++ b/mozglue/build/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - DIST_INSTALL = 1 # Build mozglue as a shared lib on Windows, OSX and Android. diff --git a/mozglue/linker/Makefile.in b/mozglue/linker/Makefile.in index e50fd33f317..7016ef70b42 100644 --- a/mozglue/linker/Makefile.in +++ b/mozglue/linker/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_STATIC_LIB= 1 STL_FLAGS = diff --git a/mozglue/tests/Makefile.in b/mozglue/tests/Makefile.in index 9eeee4fa2de..981315e2ec7 100644 --- a/mozglue/tests/Makefile.in +++ b/mozglue/tests/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifdef MOZ_LINKER STL_FLAGS = diff --git a/netwerk/Makefile.in b/netwerk/Makefile.in index 900f0ea07a1..ab3a7e9c507 100644 --- a/netwerk/Makefile.in +++ b/netwerk/Makefile.in @@ -2,14 +2,7 @@ # License, v. 2.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@ - INSTALL_TARGETS += neckoconfig neckoconfig_FILES := necko-config.h neckoconfig_DEST = $(DIST)/include neckoconfig_TARGET := export - -include $(topsrcdir)/config/rules.mk diff --git a/netwerk/base/public/Makefile.in b/netwerk/base/public/Makefile.in index 11a39f90e87..67b5881f5c7 100644 --- a/netwerk/base/public/Makefile.in +++ b/netwerk/base/public/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -include $(DEPTH)/config/autoconf.mk - - include $(topsrcdir)/config/rules.mk DEFINES += -DIMPL_LIBXUL diff --git a/netwerk/base/src/Makefile.in b/netwerk/base/src/Makefile.in index 848e7d33845..ebfc06537f3 100644 --- a/netwerk/base/src/Makefile.in +++ b/netwerk/base/src/Makefile.in @@ -4,13 +4,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES += -I$(topsrcdir)/dom/base ifdef MOZ_ENABLE_QTNETWORK diff --git a/netwerk/build/Makefile.in b/netwerk/build/Makefile.in index 11b2010a06f..11bcf362833 100644 --- a/netwerk/build/Makefile.in +++ b/netwerk/build/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 SHARED_LIBRARY_LIBS = \ ../base/src/$(LIB_PREFIX)neckobase_s.$(LIB_SUFFIX) \ @@ -110,4 +103,3 @@ endif include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk - diff --git a/netwerk/cache/Makefile.in b/netwerk/cache/Makefile.in index 0dd1d76ba80..d8f6272eaad 100644 --- a/netwerk/cache/Makefile.in +++ b/netwerk/cache/Makefile.in @@ -3,16 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES = \ -I$(srcdir)/../base/src \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/netwerk/cookie/Makefile.in b/netwerk/cookie/Makefile.in index 9229b065a31..5003dd940a3 100644 --- a/netwerk/cookie/Makefile.in +++ b/netwerk/cookie/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - ifdef NECKO_COOKIES LOCAL_INCLUDES = \ @@ -22,4 +14,3 @@ endif include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk - diff --git a/netwerk/dash/mpd/Makefile.in b/netwerk/dash/mpd/Makefile.in index e50488494c1..993b41e582c 100644 --- a/netwerk/dash/mpd/Makefile.in +++ b/netwerk/dash/mpd/Makefile.in @@ -8,18 +8,8 @@ # Contributor(s): # Steve Workman -DEPTH := @DEPTH@ -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES := \ -I$(topsrcdir)/content/base/src \ -I$(topsrcdir)/content/html/content/public \ -I$(topsrcdir)/content/html/content/src \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/netwerk/dns/Makefile.in b/netwerk/dns/Makefile.in index ba242011bae..296accc9523 100644 --- a/netwerk/dns/Makefile.in +++ b/netwerk/dns/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # need to include etld_data.inc LOCAL_INCLUDES = \ -I$(srcdir)/../base/src \ diff --git a/netwerk/ipc/Makefile.in b/netwerk/ipc/Makefile.in index 6b42f3aa945..8b1a255e83f 100644 --- a/netwerk/ipc/Makefile.in +++ b/netwerk/ipc/Makefile.in @@ -2,12 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 LOCAL_INCLUDES += \ -I$(srcdir)/../protocol/http \ diff --git a/netwerk/locales/Makefile.in b/netwerk/locales/Makefile.in index 3e9aa00c44f..82f614ecea2 100644 --- a/netwerk/locales/Makefile.in +++ b/netwerk/locales/Makefile.in @@ -2,14 +2,4 @@ # License, v. 2.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 diff --git a/netwerk/protocol/about/Makefile.in b/netwerk/protocol/about/Makefile.in index a96a2dca740..60585d841eb 100644 --- a/netwerk/protocol/about/Makefile.in +++ b/netwerk/protocol/about/Makefile.in @@ -3,16 +3,9 @@ # License, v. 2.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 - LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ $(NULL) include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk - diff --git a/netwerk/protocol/data/Makefile.in b/netwerk/protocol/data/Makefile.in index fc155171b29..92f40ea0ef6 100644 --- a/netwerk/protocol/data/Makefile.in +++ b/netwerk/protocol/data/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/netwerk/protocol/device/Makefile.in b/netwerk/protocol/device/Makefile.in index 698b6714c09..aeb87f02900 100644 --- a/netwerk/protocol/device/Makefile.in +++ b/netwerk/protocol/device/Makefile.in @@ -2,15 +2,8 @@ # License, v. 2.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 - LOCAL_INCLUDES = -I$(srcdir)/../../base/src/ \ $(NULL) include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk - diff --git a/netwerk/protocol/file/Makefile.in b/netwerk/protocol/file/Makefile.in index 30ab47b11c5..0bcc7e12f8d 100644 --- a/netwerk/protocol/file/Makefile.in +++ b/netwerk/protocol/file/Makefile.in @@ -3,16 +3,7 @@ # License, v. 2.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 - LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ -I$(topsrcdir)/xpcom/ds \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/netwerk/protocol/ftp/Makefile.in b/netwerk/protocol/ftp/Makefile.in index 2a53b1c2256..d1ccabda512 100644 --- a/netwerk/protocol/ftp/Makefile.in +++ b/netwerk/protocol/ftp/Makefile.in @@ -3,12 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ -I$(topsrcdir)/xpcom/ds \ @@ -24,4 +18,3 @@ DEFINES += -DFORCE_PR_LOG endif endif endif # WINNT - diff --git a/netwerk/protocol/http/Makefile.in b/netwerk/protocol/http/Makefile.in index f1b1a9e5114..545fe295a29 100644 --- a/netwerk/protocol/http/Makefile.in +++ b/netwerk/protocol/http/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ -I$(topsrcdir)/xpcom/ds \ @@ -19,4 +12,3 @@ LOCAL_INCLUDES = \ include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk - diff --git a/netwerk/protocol/res/Makefile.in b/netwerk/protocol/res/Makefile.in index a3cbb9faba3..3b661470308 100644 --- a/netwerk/protocol/res/Makefile.in +++ b/netwerk/protocol/res/Makefile.in @@ -3,17 +3,9 @@ # License, v. 2.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 - LOCAL_INCLUDES = \ -I$(topsrcdir)/netwerk/base/src \ $(NULL) include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk - diff --git a/netwerk/protocol/viewsource/Makefile.in b/netwerk/protocol/viewsource/Makefile.in index 8705772dda6..92f40ea0ef6 100644 --- a/netwerk/protocol/viewsource/Makefile.in +++ b/netwerk/protocol/viewsource/Makefile.in @@ -3,15 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/netwerk/protocol/websocket/Makefile.in b/netwerk/protocol/websocket/Makefile.in index 92f9dab7576..ee9a044e97a 100644 --- a/netwerk/protocol/websocket/Makefile.in +++ b/netwerk/protocol/websocket/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ -I$(topsrcdir)/content/base/src \ @@ -18,4 +11,3 @@ LOCAL_INCLUDES = \ include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk - diff --git a/netwerk/protocol/wyciwyg/Makefile.in b/netwerk/protocol/wyciwyg/Makefile.in index 0ef6835f507..fe882683144 100644 --- a/netwerk/protocol/wyciwyg/Makefile.in +++ b/netwerk/protocol/wyciwyg/Makefile.in @@ -2,17 +2,9 @@ # License, v. 2.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 - LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ $(NULL) include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk - diff --git a/netwerk/sctp/datachannel/Makefile.in b/netwerk/sctp/datachannel/Makefile.in index 07abd70d0a8..c2e9b3348ee 100644 --- a/netwerk/sctp/datachannel/Makefile.in +++ b/netwerk/sctp/datachannel/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - NO_PROFILE_GUIDED_OPTIMIZE = 1 # Don't PGO LOCAL_INCLUDES = \ -I$(topsrcdir)/xpcom/ds \ @@ -37,4 +30,3 @@ endif include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk - diff --git a/netwerk/sctp/src/Makefile.in b/netwerk/sctp/src/Makefile.in index 304af4310b4..9697bf363b7 100644 --- a/netwerk/sctp/src/Makefile.in +++ b/netwerk/sctp/src/Makefile.in @@ -3,17 +3,12 @@ # License, v. 2.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@ \ @srcdir@/netinet \ @srcdir@/netinet6 \ $(NULL) -include $(DEPTH)/config/autoconf.mk - NO_PROFILE_GUIDED_OPTIMIZE = 1 # Don't PGO LOCAL_INCLUDES = \ @@ -99,4 +94,3 @@ include $(topsrcdir)/ipc/chromium/chromium-config.mk ifdef GNU_CC CFLAGS += -std=gnu99 endif - diff --git a/netwerk/srtp/src/Makefile.in b/netwerk/srtp/src/Makefile.in index 13b6889eb58..690edcb9e34 100644 --- a/netwerk/srtp/src/Makefile.in +++ b/netwerk/srtp/src/Makefile.in @@ -3,9 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ VPATH = \ @srcdir@ \ @srcdir@/srtp \ @@ -18,8 +15,6 @@ VPATH = \ @srcdir@/crypto/rng \ $(NULL) -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES = \ -I$(srcdir)/include \ -I$(srcdir)/crypto/include \ @@ -74,4 +69,3 @@ include $(topsrcdir)/ipc/chromium/chromium-config.mk ifdef GNU_CC CFLAGS += -std=gnu99 endif - diff --git a/netwerk/streamconv/converters/Makefile.in b/netwerk/streamconv/converters/Makefile.in index 791cb810576..d7f2a0a8adb 100644 --- a/netwerk/streamconv/converters/Makefile.in +++ b/netwerk/streamconv/converters/Makefile.in @@ -3,16 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES = \ -I$(topsrcdir)/netwerk/base/src \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/netwerk/streamconv/test/Makefile.in b/netwerk/streamconv/test/Makefile.in index 360a151c606..8a395e5af00 100644 --- a/netwerk/streamconv/test/Makefile.in +++ b/netwerk/streamconv/test/Makefile.in @@ -3,12 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -include $(DEPTH)/config/autoconf.mk - LIBS = \ $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ $(XPCOM_LIBS) \ @@ -30,4 +24,3 @@ ifdef NGPREFS DEFINES += -DNGPREFS endif endif # WINNT - diff --git a/netwerk/system/android/Makefile.in b/netwerk/system/android/Makefile.in index a3ea1c27f70..d655dcd961e 100644 --- a/netwerk/system/android/Makefile.in +++ b/netwerk/system/android/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += -I$(srcdir)/../../base/src - diff --git a/netwerk/system/qt/Makefile.in b/netwerk/system/qt/Makefile.in index 114cebb2386..a1d0afdee2c 100644 --- a/netwerk/system/qt/Makefile.in +++ b/netwerk/system/qt/Makefile.in @@ -3,12 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk OS_INCLUDES += $(MOZ_QT_CFLAGS) diff --git a/netwerk/test/Makefile.in b/netwerk/test/Makefile.in index 8da4a57f6c1..542298f6f2c 100644 --- a/netwerk/test/Makefile.in +++ b/netwerk/test/Makefile.in @@ -4,14 +4,8 @@ # License, v. 2.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@ FAIL_ON_WARNINGS := 1 -include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk LIBS = $(XPCOM_LIBS) \ diff --git a/netwerk/test/browser/Makefile.in b/netwerk/test/browser/Makefile.in index 03b63904c86..c2a32052b2c 100644 --- a/netwerk/test/browser/Makefile.in +++ b/netwerk/test/browser/Makefile.in @@ -2,16 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_BROWSER_FILES = \ browser_NetUtil.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/netwerk/test/httpserver/Makefile.in b/netwerk/test/httpserver/Makefile.in index 3e22f2348eb..21fed0e9dee 100644 --- a/netwerk/test/httpserver/Makefile.in +++ b/netwerk/test/httpserver/Makefile.in @@ -4,14 +4,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - NO_INTERFACES_MANIFEST = 1 ifdef XPI_NAME @@ -24,5 +16,3 @@ EXTRA_COMPONENTS += \ endif TESTING_JS_MODULES = httpd.js - -include $(topsrcdir)/config/rules.mk diff --git a/netwerk/test/mochitests/Makefile.in b/netwerk/test/mochitests/Makefile.in index 0e2a36a7620..681212e0dda 100644 --- a/netwerk/test/mochitests/Makefile.in +++ b/netwerk/test/mochitests/Makefile.in @@ -4,18 +4,9 @@ # License, v. 2.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 = \ partial_content.sjs \ test_partially_cached_content.html \ user_agent.sjs \ test_user_agent_overrides.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/netwerk/wifi/Makefile.in b/netwerk/wifi/Makefile.in index b875c6d0695..3b05a9d1c1d 100644 --- a/netwerk/wifi/Makefile.in +++ b/netwerk/wifi/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifeq ($(OS_ARCH),SunOS) OS_INCLUDES += $(GLIB_CFLAGS) endif @@ -16,6 +9,3 @@ endif ifdef NECKO_WIFI_DBUS OS_INCLUDES += $(MOZ_DBUS_GLIB_CFLAGS) endif - -include $(topsrcdir)/config/rules.mk - diff --git a/other-licenses/android/Makefile.in b/other-licenses/android/Makefile.in index f6da3203e25..ba1f67dbaf3 100644 --- a/other-licenses/android/Makefile.in +++ b/other-licenses/android/Makefile.in @@ -2,13 +2,4 @@ # License, v. 2.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 - -include $(topsrcdir)/config/rules.mk diff --git a/other-licenses/bsdiff/Makefile.in b/other-licenses/bsdiff/Makefile.in index 89611336c14..8bb65714ba3 100644 --- a/other-licenses/bsdiff/Makefile.in +++ b/other-licenses/bsdiff/Makefile.in @@ -22,13 +22,6 @@ # # ***** END LICENSE BLOCK ***** -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # This program is output to dist/host/bin because it is only needed by the # build system and is not intended to be included in Mozilla distributions. HOST_PROGRAM = mbsdiff$(BIN_SUFFIX) diff --git a/other-licenses/skia-npapi/Makefile.in b/other-licenses/skia-npapi/Makefile.in index 185336e2bb4..192a4930c34 100644 --- a/other-licenses/skia-npapi/Makefile.in +++ b/other-licenses/skia-npapi/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 DEFINES += \ @@ -22,6 +15,3 @@ LOCAL_INCLUDES += \ -I$(topsrcdir)/gfx/skia/include/config \ -I$(topsrcdir)/gfx/gl \ $(NULL) - - -include $(topsrcdir)/config/rules.mk diff --git a/other-licenses/snappy/Makefile.in b/other-licenses/snappy/Makefile.in index d3e3fe90b98..d77e96d68be 100644 --- a/other-licenses/snappy/Makefile.in +++ b/other-licenses/snappy/Makefile.in @@ -2,17 +2,9 @@ # License, v. 2.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@ \ $(topsrcdir)/other-licenses/snappy/src $(NULL) -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 - -include $(topsrcdir)/config/rules.mk diff --git a/parser/expat/lib/Makefile.in b/parser/expat/lib/Makefile.in index cad77fbbc5a..8dc75814023 100644 --- a/parser/expat/lib/Makefile.in +++ b/parser/expat/lib/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # We want only the static lib, not the shared lib FORCE_STATIC_LIB = 1 diff --git a/parser/html/Makefile.in b/parser/html/Makefile.in index 97a3eaf678a..37e8b4518da 100644 --- a/parser/html/Makefile.in +++ b/parser/html/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/parser/htmlparser/src/Makefile.in b/parser/htmlparser/src/Makefile.in index e1a11a885a7..4c6703813ce 100644 --- a/parser/htmlparser/src/Makefile.in +++ b/parser/htmlparser/src/Makefile.in @@ -2,16 +2,7 @@ # License, v. 2.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 SHARED_LIBRARY_LIBS = \ $(DEPTH)/parser/xml/src/$(LIB_PREFIX)saxp.$(LIB_SUFFIX) \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/parser/htmlparser/tests/mochitest/Makefile.in b/parser/htmlparser/tests/mochitest/Makefile.in index 91654785bde..6a1406f345b 100644 --- a/parser/htmlparser/tests/mochitest/Makefile.in +++ b/parser/htmlparser/tests/mochitest/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = parser_datreader.js \ parser_web_testrunner.js \ html5_tree_construction_exceptions.js \ @@ -92,5 +84,3 @@ MOCHITEST_FILES = parser_datreader.js \ # Disable test due to frequent orange on Mac # test_bug534293.html \ - -include $(topsrcdir)/config/rules.mk diff --git a/parser/htmlparser/tests/mochitest/dir_bug534293/Makefile.in b/parser/htmlparser/tests/mochitest/dir_bug534293/Makefile.in index 1cc24f94d37..678338f40d7 100644 --- a/parser/htmlparser/tests/mochitest/dir_bug534293/Makefile.in +++ b/parser/htmlparser/tests/mochitest/dir_bug534293/Makefile.in @@ -3,15 +3,5 @@ # License, v. 2.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 = file_bug534293.sjs \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/parser/htmlparser/tests/mochitest/html5lib_tree_construction/Makefile.in b/parser/htmlparser/tests/mochitest/html5lib_tree_construction/Makefile.in index 83119c7a382..5bcacc656f5 100644 --- a/parser/htmlparser/tests/mochitest/html5lib_tree_construction/Makefile.in +++ b/parser/htmlparser/tests/mochitest/html5lib_tree_construction/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = adoption01.dat \ adoption02.dat \ comments01.dat \ @@ -56,5 +48,3 @@ MOCHITEST_FILES = adoption01.dat \ webkit02.dat \ main-element.dat \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/parser/htmlparser/tests/mochitest/html5lib_tree_construction/scripted/Makefile.in b/parser/htmlparser/tests/mochitest/html5lib_tree_construction/scripted/Makefile.in index dea1f9d5791..3d2f5ace363 100644 --- a/parser/htmlparser/tests/mochitest/html5lib_tree_construction/scripted/Makefile.in +++ b/parser/htmlparser/tests/mochitest/html5lib_tree_construction/scripted/Makefile.in @@ -3,17 +3,7 @@ # License, v. 2.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 = adoption01.dat \ webkit01.dat \ ark.dat \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/parser/xml/src/Makefile.in b/parser/xml/src/Makefile.in index e94516bfe7f..befbfd9820f 100644 --- a/parser/xml/src/Makefile.in +++ b/parser/xml/src/Makefile.in @@ -2,12 +2,4 @@ # License, v. 2.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 - MOZILLA_INTERNAL_API = 1 -include $(topsrcdir)/config/rules.mk diff --git a/probes/Makefile.in b/probes/Makefile.in index 8a1e44b7283..6d18f342545 100644 --- a/probes/Makefile.in +++ b/probes/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifdef HAVE_DTRACE export:: $(DIST)/include/mozilla-trace.h @@ -19,5 +12,3 @@ $(DIST)/include/mozilla-trace.h: mozilla-trace.d Makefile mozilla-trace.h.tmp > $(DIST)/include/mozilla-trace.h rm mozilla-trace.h.tmp endif - -include $(topsrcdir)/config/rules.mk diff --git a/profile/dirserviceprovider/src/Makefile.in b/profile/dirserviceprovider/src/Makefile.in index ae8a2ea936b..134152550b4 100644 --- a/profile/dirserviceprovider/src/Makefile.in +++ b/profile/dirserviceprovider/src/Makefile.in @@ -2,17 +2,9 @@ # License, v. 2.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 $(srcdir)/objs.mk MOZILLA_INTERNAL_API = 1 # we don't want the shared lib FORCE_STATIC_LIB = 1 - -include $(topsrcdir)/config/rules.mk diff --git a/profile/dirserviceprovider/standalone/Makefile.in b/profile/dirserviceprovider/standalone/Makefile.in index d9a6ede9d28..e7724b92f96 100644 --- a/profile/dirserviceprovider/standalone/Makefile.in +++ b/profile/dirserviceprovider/standalone/Makefile.in @@ -2,12 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk include $(srcdir)/../src/objs.mk FORCE_STATIC_LIB = 1 diff --git a/python/Makefile.in b/python/Makefile.in index bce07dc5bed..05d48b48716 100644 --- a/python/Makefile.in +++ b/python/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH := @DEPTH@ -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - test_dirs := \ mozbuild/mozbuild/test \ mozbuild/mozbuild/test/backend \ @@ -20,7 +13,3 @@ test_dirs := \ $(NULL) PYTHON_UNIT_TESTS := $(foreach dir,$(test_dirs),$(wildcard $(srcdir)/$(dir)/*.py)) - -include $(topsrcdir)/config/rules.mk - - diff --git a/python/mozbuild/mozbuild/test/backend/data/stub0/dir1/Makefile.in b/python/mozbuild/mozbuild/test/backend/data/stub0/dir1/Makefile.in index a038825a942..17c147d97aa 100644 --- a/python/mozbuild/mozbuild/test/backend/data/stub0/dir1/Makefile.in +++ b/python/mozbuild/mozbuild/test/backend/data/stub0/dir1/Makefile.in @@ -1,11 +1,6 @@ # Any copyright is dedicated to the Public Domain. # http://creativecommons.org/publicdomain/zero/1.0/ -DEPTH := @DEPTH@ -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH = @srcdir@ - include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk diff --git a/python/mozbuild/mozbuild/test/backend/data/stub0/dir3/Makefile.in b/python/mozbuild/mozbuild/test/backend/data/stub0/dir3/Makefile.in index a038825a942..17c147d97aa 100644 --- a/python/mozbuild/mozbuild/test/backend/data/stub0/dir3/Makefile.in +++ b/python/mozbuild/mozbuild/test/backend/data/stub0/dir3/Makefile.in @@ -1,11 +1,6 @@ # Any copyright is dedicated to the Public Domain. # http://creativecommons.org/publicdomain/zero/1.0/ -DEPTH := @DEPTH@ -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH = @srcdir@ - include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk diff --git a/rdf/build/Makefile.in b/rdf/build/Makefile.in index ed3993579cd..9efccb32e52 100644 --- a/rdf/build/Makefile.in +++ b/rdf/build/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 SHARED_LIBRARY_LIBS = \ ../base/src/$(LIB_PREFIX)rdfbase_s.$(LIB_SUFFIX) \ @@ -23,4 +16,3 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../content/src \ -I$(srcdir)/../datasource/src \ $(NULL) - diff --git a/rdf/datasource/src/Makefile.in b/rdf/datasource/src/Makefile.in index 1e473e7cc47..18018946910 100644 --- a/rdf/datasource/src/Makefile.in +++ b/rdf/datasource/src/Makefile.in @@ -3,16 +3,8 @@ # License, v. 2.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 # XXX This is a dependency on rdfutil.h: it'll go away once that becomes # a first-class XPCOM interface. INCLUDES += -I$(srcdir)/../../base/src - diff --git a/rdf/tests/dsds/Makefile.in b/rdf/tests/dsds/Makefile.in index c3bdbdd8fc3..9c0d3d06404 100644 --- a/rdf/tests/dsds/Makefile.in +++ b/rdf/tests/dsds/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - MOZILLA_INTERNAL_API = 1 @@ -38,4 +31,3 @@ libs:: install:: $(RESOURCE_SAMPLES) $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res/samples/rdf - diff --git a/rdf/tests/rdfcat/Makefile.in b/rdf/tests/rdfcat/Makefile.in index bd37bf3f504..6d305cdc881 100644 --- a/rdf/tests/rdfcat/Makefile.in +++ b/rdf/tests/rdfcat/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LIBS = \ $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ $(LIBS_DIR) \ diff --git a/rdf/tests/rdfpoll/Makefile.in b/rdf/tests/rdfpoll/Makefile.in index 4095c9f9eaf..ad93a989acb 100644 --- a/rdf/tests/rdfpoll/Makefile.in +++ b/rdf/tests/rdfpoll/Makefile.in @@ -3,19 +3,9 @@ # License, v. 2.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 = \ $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ $(LIBS_DIR) \ $(XPCOM_LIBS) \ $(NSPR_LIBS) \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/rdf/tests/triplescat/Makefile.in b/rdf/tests/triplescat/Makefile.in index bd37bf3f504..6d305cdc881 100644 --- a/rdf/tests/triplescat/Makefile.in +++ b/rdf/tests/triplescat/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LIBS = \ $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ $(LIBS_DIR) \ diff --git a/rdf/util/src/Makefile.in b/rdf/util/src/Makefile.in index 6ae2f6117b6..7abda44bbaa 100644 --- a/rdf/util/src/Makefile.in +++ b/rdf/util/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # This makefile builds the rdfutil_external_s library which should be # used by frozen (dependent) linkage components. The internal-linkage code should use # rdfutil_s which is built in the internal/ subdirectory. @@ -22,6 +15,3 @@ DIST_INSTALL = 1 # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 - -include $(topsrcdir)/config/rules.mk - diff --git a/rdf/util/src/internal/Makefile.in b/rdf/util/src/internal/Makefile.in index a2aef58f1b2..f8cee05b3db 100644 --- a/rdf/util/src/internal/Makefile.in +++ b/rdf/util/src/internal/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # This makefile builds the version of unicharutils_s static library which uses # internal linkage. Components that use frozen (external) linkage should use # rdfutil_external_s. diff --git a/security/build/Makefile.in b/security/build/Makefile.in index 98af252dd98..4874f714683 100644 --- a/security/build/Makefile.in +++ b/security/build/Makefile.in @@ -3,12 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk CC_WRAPPER = CXX_WRAPPER = diff --git a/security/manager/boot/src/Makefile.in b/security/manager/boot/src/Makefile.in index 98ad1033e0f..64f1d7d5396 100644 --- a/security/manager/boot/src/Makefile.in +++ b/security/manager/boot/src/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/security/manager/locales/Makefile.in b/security/manager/locales/Makefile.in index 3e9aa00c44f..82f614ecea2 100644 --- a/security/manager/locales/Makefile.in +++ b/security/manager/locales/Makefile.in @@ -2,14 +2,4 @@ # License, v. 2.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 diff --git a/security/manager/pki/src/Makefile.in b/security/manager/pki/src/Makefile.in index 91591b89cdf..260028568a5 100644 --- a/security/manager/pki/src/Makefile.in +++ b/security/manager/pki/src/Makefile.in @@ -4,17 +4,7 @@ # License, v. 2.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 INCLUDES += \ -I$(DIST)/public/nss \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in index 29e94ee41a4..ad4d28f260e 100644 --- a/security/manager/ssl/src/Makefile.in +++ b/security/manager/ssl/src/Makefile.in @@ -4,19 +4,9 @@ # License, v. 2.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 DEFINES += \ -DNSS_ENABLE_ECC \ -DDLL_PREFIX=\"$(DLL_PREFIX)\" \ -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/security/manager/ssl/tests/mochitest/browser/Makefile.in b/security/manager/ssl/tests/mochitest/browser/Makefile.in index 91d1b50815a..b97ab96fc07 100644 --- a/security/manager/ssl/tests/mochitest/browser/Makefile.in +++ b/security/manager/ssl/tests/mochitest/browser/Makefile.in @@ -3,17 +3,7 @@ # License, v. 2.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_bug627234_perwindowpb.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/security/manager/ssl/tests/mochitest/bugs/Makefile.in b/security/manager/ssl/tests/mochitest/bugs/Makefile.in index 515130d8f55..b9c0966d1ca 100644 --- a/security/manager/ssl/tests/mochitest/bugs/Makefile.in +++ b/security/manager/ssl/tests/mochitest/bugs/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_bug480509.html \ test_bug483440.html \ @@ -33,5 +25,3 @@ MOCHITEST_CHROME_FILES = \ test_bug480619.html \ test_bug644006.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in b/security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in index 582ff18ba91..653bf8150ab 100644 --- a/security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in +++ b/security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ alloworigin.sjs \ backward.html \ @@ -70,5 +62,3 @@ MOCHITEST_FILES = \ # test_dynUnsecureRedirect.html \ intermitently fails, quit often, bug 487402 # test_unsecureIframeMetaRedirect.html \ also intermittently fails, less often, bug 487632 - -include $(topsrcdir)/config/rules.mk diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/Makefile.in b/security/manager/ssl/tests/mochitest/stricttransportsecurity/Makefile.in index 1dde9f22d25..30b94027e34 100644 --- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/Makefile.in +++ b/security/manager/ssl/tests/mochitest/stricttransportsecurity/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ plain_bootstrap.html \ plain_bootstrap.html^headers^ \ @@ -25,5 +17,3 @@ MOCHITEST_CHROME_FILES += \ test_sts_privatebrowsing_perwindowpb.html \ page_blank.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/security/manager/ssl/tests/unit/test_ocsp_stapling/Makefile.in b/security/manager/ssl/tests/unit/test_ocsp_stapling/Makefile.in index 3ff49c4e97f..9c8647bcd3f 100644 --- a/security/manager/ssl/tests/unit/test_ocsp_stapling/Makefile.in +++ b/security/manager/ssl/tests/unit/test_ocsp_stapling/Makefile.in @@ -4,15 +4,8 @@ # License, v. 2.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@ FAIL_ON_WARNINGS := 1 -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/config.mk LIBS = \ @@ -22,5 +15,3 @@ LIBS = \ $(NULL) DEFINES += $(TK_CFLAGS) - -include $(topsrcdir)/config/rules.mk diff --git a/security/sandbox/Makefile.in b/security/sandbox/Makefile.in index 3edac69c69f..a52b8195280 100644 --- a/security/sandbox/Makefile.in +++ b/security/sandbox/Makefile.in @@ -2,16 +2,8 @@ # License, v. 2.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 FAIL_ON_WARNINGS = 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk - diff --git a/services/common/Makefile.in b/services/common/Makefile.in index ac7305b058c..aa3e4a5d71a 100644 --- a/services/common/Makefile.in +++ b/services/common/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - modules := \ log4moz.js \ storageservice.js \ diff --git a/services/crypto/Makefile.in b/services/crypto/Makefile.in index 15ea2752581..a97069dca66 100644 --- a/services/crypto/Makefile.in +++ b/services/crypto/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - modules := \ utils.js \ WeaveCrypto.js \ @@ -17,5 +10,3 @@ modules := \ CRYPTO_MODULE_FILES := $(addprefix modules/,$(modules)) CRYPTO_MODULE_DEST = $(FINAL_TARGET)/modules/services-crypto INSTALL_TARGETS += CRYPTO_MODULE - -include $(topsrcdir)/config/rules.mk diff --git a/services/crypto/component/Makefile.in b/services/crypto/component/Makefile.in index 9ba68107e60..36ed8aed8ad 100644 --- a/services/crypto/component/Makefile.in +++ b/services/crypto/component/Makefile.in @@ -2,14 +2,5 @@ # License, v. 2.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 MOZILLA_INTERNAL_API := 1 - -include $(topsrcdir)/config/rules.mk diff --git a/services/datareporting/Makefile.in b/services/datareporting/Makefile.in index 8cf6bba12d8..6e8e2b1fefa 100644 --- a/services/datareporting/Makefile.in +++ b/services/datareporting/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - MODULES := policy.jsm sessions.jsm MODULES_PATH = $(FINAL_TARGET)/modules/services/datareporting PP_TARGETS += MODULES diff --git a/services/healthreport/Makefile.in b/services/healthreport/Makefile.in index 0df91f059fa..eb6e2d14a6d 100644 --- a/services/healthreport/Makefile.in +++ b/services/healthreport/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - modules := \ healthreporter.jsm \ profile.jsm \ @@ -50,4 +43,3 @@ include $(topsrcdir)/config/rules.mk # Add extra prerequisites until bug 837792 is addressed. $(FINAL_TARGET)/modules/HealthReport.jsm: $(healthreport_depends) - diff --git a/services/metrics/Makefile.in b/services/metrics/Makefile.in index 0d33f646dd8..9cf3f105b3e 100644 --- a/services/metrics/Makefile.in +++ b/services/metrics/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - testing_modules := \ mocks.jsm \ $(NULL) @@ -28,5 +21,3 @@ include $(topsrcdir)/config/rules.mk # Add extra prerequisites until bug 837792 is addressed. $(FINAL_TARGET)/modules/Metrics.jsm: Metrics.jsm providermanager.jsm dataprovider.jsm storage.jsm - - diff --git a/services/sync/Makefile.in b/services/sync/Makefile.in index 2a7dd01ab95..ce827ea9dad 100644 --- a/services/sync/Makefile.in +++ b/services/sync/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH := @DEPTH@ -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # Definitions used by constants.js. weave_version := 1.28.0 weave_id := {340c2bbc-ce74-4362-90b5-7c26312808ef} @@ -82,5 +75,3 @@ INSTALL_TARGETS += SYNC_STAGES TESTING_JS_MODULES := $(addprefix modules-testing/,$(sync_testing_modules)) TESTING_JS_MODULE_DIR := services/sync - -include $(topsrcdir)/config/rules.mk diff --git a/services/sync/locales/Makefile.in b/services/sync/locales/Makefile.in index 1975558f3ed..82f614ecea2 100644 --- a/services/sync/locales/Makefile.in +++ b/services/sync/locales/Makefile.in @@ -2,14 +2,4 @@ # License, v. 2.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 diff --git a/startupcache/Makefile.in b/startupcache/Makefile.in index b0ca4419928..e8ff94a2cf7 100644 --- a/startupcache/Makefile.in +++ b/startupcache/Makefile.in @@ -3,12 +3,4 @@ # 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 diff --git a/startupcache/test/Makefile.in b/startupcache/test/Makefile.in index 5b4bf3e9ff8..9bd1b637835 100644 --- a/startupcache/test/Makefile.in +++ b/startupcache/test/Makefile.in @@ -3,13 +3,4 @@ # License, v. 2.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 += $(MOZ_COMPONENT_LIBS) - -include $(topsrcdir)/config/rules.mk diff --git a/storage/build/Makefile.in b/storage/build/Makefile.in index fb8e601bc23..de999a9151b 100644 --- a/storage/build/Makefile.in +++ b/storage/build/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH=@DEPTH@ -topsrcdir=@top_srcdir@ -srcdir=@srcdir@ -VPATH=@srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 LOCAL_INCLUDES = \ $(SQLITE_CFLAGS) \ @@ -18,6 +11,3 @@ LOCAL_INCLUDES = \ SHARED_LIBRARY_LIBS = \ ../src/$(LIB_PREFIX)storage_s.$(LIB_SUFFIX) \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/storage/src/Makefile.in b/storage/src/Makefile.in index 75763f61e67..94186401532 100644 --- a/storage/src/Makefile.in +++ b/storage/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # Don't use the jemalloc allocator on Android, because we can't guarantee # that Gecko will configure sqlite before it is first used (bug 730495). # @@ -32,5 +25,3 @@ LOCAL_INCLUDES = \ # This is the default value. If we ever change it when compiling sqlite, we # will need to change it here as well. DEFINES += -DSQLITE_MAX_LIKE_PATTERN_LENGTH=50000 - -include $(topsrcdir)/config/rules.mk diff --git a/storage/test/Makefile.in b/storage/test/Makefile.in index fc444cdf5b2..07914f614de 100644 --- a/storage/test/Makefile.in +++ b/storage/test/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES = \ -I$(srcdir)/../src \ $(NULL) @@ -20,5 +12,3 @@ LIBS = \ $(MOZ_COMPONENT_LIBS) \ $(SQLITE_LIBS) \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/testing/gtest/Makefile.in b/testing/gtest/Makefile.in index 50af72f9c18..318f66f979f 100644 --- a/testing/gtest/Makefile.in +++ b/testing/gtest/Makefile.in @@ -5,9 +5,6 @@ # Avoid recursive make to avoid having to add files to the gtest/ subdirectory # (which is third-party code), and to make the build faster. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ VPATH = \ $(srcdir) \ $(srcdir)/gtest/src \ @@ -15,8 +12,6 @@ VPATH = \ $(srcdir)/gmock/src \ $(NULL) -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 LOCAL_INCLUDES += \ -I$(srcdir)/gtest \ @@ -41,4 +36,3 @@ endif $(PYTHON) $(topsrcdir)/testing/gtest/rungtests.py --xre-path=$(DIST)/bin --symbols-path=$(DIST)/crashreporter-symbols $(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX) endif endif - diff --git a/testing/marionette/Makefile.in b/testing/marionette/Makefile.in index 65cbf611285..0e1861faeed 100644 --- a/testing/marionette/Makefile.in +++ b/testing/marionette/Makefile.in @@ -2,15 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifdef ENABLE_TESTS DEFINES += -DENABLE_TESTS endif - -include $(topsrcdir)/config/rules.mk diff --git a/testing/marionette/components/Makefile.in b/testing/marionette/components/Makefile.in index 010c22fb0d8..542a6efb68f 100644 --- a/testing/marionette/components/Makefile.in +++ b/testing/marionette/components/Makefile.in @@ -2,15 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifdef ENABLE_MARIONETTE DEFINES += -DENABLE_MARIONETTE=1 endif - -include $(topsrcdir)/config/rules.mk diff --git a/testing/mochitest/Makefile.in b/testing/mochitest/Makefile.in index cb595b46d23..59e20277c54 100644 --- a/testing/mochitest/Makefile.in +++ b/testing/mochitest/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - NO_JS_MANIFEST = 1 MOZ_CHROME_FILE_FORMAT = jar DIST_FILES = install.rdf diff --git a/testing/mochitest/MochiKit/Makefile.in b/testing/mochitest/MochiKit/Makefile.in index 2b9bb0e0ae8..7b76a2a93a6 100644 --- a/testing/mochitest/MochiKit/Makefile.in +++ b/testing/mochitest/MochiKit/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk _JS_FILES = Async.js \ diff --git a/testing/mochitest/chrome/Makefile.in b/testing/mochitest/chrome/Makefile.in index 96a0c160e6b..64162c0fdd3 100644 --- a/testing/mochitest/chrome/Makefile.in +++ b/testing/mochitest/chrome/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk _STATIC_FILES = test_sample.xul \ diff --git a/testing/mochitest/dynamic/Makefile.in b/testing/mochitest/dynamic/Makefile.in index a1925e35248..4a42bb890eb 100644 --- a/testing/mochitest/dynamic/Makefile.in +++ b/testing/mochitest/dynamic/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk _STATIC_FILES = \ diff --git a/testing/mochitest/roboextender/Makefile.in b/testing/mochitest/roboextender/Makefile.in index 48fb5b4e179..0cd167f272a 100644 --- a/testing/mochitest/roboextender/Makefile.in +++ b/testing/mochitest/roboextender/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - _TEST_FILES = \ bootstrap.js \ install.rdf \ diff --git a/testing/mochitest/ssltunnel/Makefile.in b/testing/mochitest/ssltunnel/Makefile.in index c965e42e694..9936c4eb5ac 100644 --- a/testing/mochitest/ssltunnel/Makefile.in +++ b/testing/mochitest/ssltunnel/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # This isn't XPCOM code, but it wants to use STL, so disable the STL # wrappers STL_FLAGS = @@ -19,5 +12,3 @@ LIBS = \ $(NSS_LIBS) \ $(MOZALLOC_LIB) \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/testing/mochitest/static/Makefile.in b/testing/mochitest/static/Makefile.in index 7c36843bfed..464e09abcb4 100644 --- a/testing/mochitest/static/Makefile.in +++ b/testing/mochitest/static/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk _STATIC_FILES = test.template.txt \ diff --git a/testing/mochitest/tests/Makefile.in b/testing/mochitest/tests/Makefile.in index 29f3570af13..327b3027432 100644 --- a/testing/mochitest/tests/Makefile.in +++ b/testing/mochitest/tests/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk _TEST_FILES = \ diff --git a/testing/mochitest/tests/MochiKit-1.4.2/MochiKit/Makefile.in b/testing/mochitest/tests/MochiKit-1.4.2/MochiKit/Makefile.in index ad52619f4ba..bdd6d085b4e 100644 --- a/testing/mochitest/tests/MochiKit-1.4.2/MochiKit/Makefile.in +++ b/testing/mochitest/tests/MochiKit-1.4.2/MochiKit/Makefile.in @@ -4,13 +4,6 @@ # 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/rules.mk _MOCHIKIT_FILES = \ diff --git a/testing/mochitest/tests/MochiKit-1.4.2/tests/Makefile.in b/testing/mochitest/tests/MochiKit-1.4.2/tests/Makefile.in index 9ce5e2cb712..1da95a70a43 100644 --- a/testing/mochitest/tests/MochiKit-1.4.2/tests/Makefile.in +++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/Makefile.in @@ -4,14 +4,6 @@ # 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/rules.mk _TEST_FILES = \ diff --git a/testing/mochitest/tests/MochiKit-1.4.2/tests/SimpleTest/Makefile.in b/testing/mochitest/tests/MochiKit-1.4.2/tests/SimpleTest/Makefile.in index e3de691f61c..184885cb23f 100644 --- a/testing/mochitest/tests/MochiKit-1.4.2/tests/SimpleTest/Makefile.in +++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/SimpleTest/Makefile.in @@ -8,13 +8,6 @@ # We want to run the tests in our own (modified) harness. # -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk _STUBS_FILES = \ diff --git a/testing/mochitest/tests/SimpleTest/Makefile.in b/testing/mochitest/tests/SimpleTest/Makefile.in index 3d1d974db36..129b0545e90 100644 --- a/testing/mochitest/tests/SimpleTest/Makefile.in +++ b/testing/mochitest/tests/SimpleTest/Makefile.in @@ -2,13 +2,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@ -relativesrcdir = @relativesrcdir@ -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk _SIMPLETEST_FILES = LogController.js \ SimpleTest.js \ @@ -28,4 +21,3 @@ _SIMPLETEST_FILES = LogController.js \ libs:: $(_SIMPLETEST_FILES) $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/$(relativesrcdir) - diff --git a/testing/mochitest/tests/browser/Makefile.in b/testing/mochitest/tests/browser/Makefile.in index f17a1a79076..e72b3e47b47 100644 --- a/testing/mochitest/tests/browser/Makefile.in +++ b/testing/mochitest/tests/browser/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_BROWSER_FILES = \ head.js \ browser_head.js \ @@ -36,5 +28,3 @@ MOCHITEST_BROWSER_FILES = \ # # Disabled because it would take too long, useful to check functionality though. # browser_requestLongerTimeout.js \ - -include $(topsrcdir)/config/rules.mk diff --git a/testing/modules/Makefile.in b/testing/modules/Makefile.in index a83e570eb25..2fdde35eec6 100644 --- a/testing/modules/Makefile.in +++ b/testing/modules/Makefile.in @@ -2,16 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - TESTING_JS_MODULES := \ AppInfo.jsm \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/testing/mozbase/Makefile.in b/testing/mozbase/Makefile.in index 1212eeb33a2..4da71e1310b 100644 --- a/testing/mozbase/Makefile.in +++ b/testing/mozbase/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - PYTHON_UNIT_TESTS := \ test.py \ $(NULL) diff --git a/testing/peptest/Makefile.in b/testing/peptest/Makefile.in index 1de2e21606a..bfa66b649bd 100644 --- a/testing/peptest/Makefile.in +++ b/testing/peptest/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk PEPTEST_HARNESS = \ diff --git a/testing/profiles/Makefile.in b/testing/profiles/Makefile.in index c45e0502f0c..1693f3bf305 100644 --- a/testing/profiles/Makefile.in +++ b/testing/profiles/Makefile.in @@ -2,12 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk MOCHITEST_PROFILE_FILES = \ diff --git a/testing/specialpowers/Makefile.in b/testing/specialpowers/Makefile.in index caf8c8bef48..9ead39736c7 100644 --- a/testing/specialpowers/Makefile.in +++ b/testing/specialpowers/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - NO_JS_MANIFEST = 1 MOZ_CHROME_FILE_FORMAT = flat DIST_FILES = \ @@ -41,4 +33,3 @@ libs:: $(libs-preqs) cp -RL $(DEPTH)/testing/specialpowers/specialpowers $(DEPTH)/_tests/testing/mochitest/extensions $(NSINSTALL) -D $(DEPTH)/_tests/reftest/specialpowers cp -RL $(DEPTH)/testing/specialpowers/specialpowers $(DEPTH)/_tests/reftest - diff --git a/testing/tools/screenshot/Makefile.in b/testing/tools/screenshot/Makefile.in index eb276a919ce..8384ca15e3d 100644 --- a/testing/tools/screenshot/Makefile.in +++ b/testing/tools/screenshot/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifdef MOZ_WIDGET_GTK ifdef MOZ_X11 @@ -29,5 +22,3 @@ WIN32_EXE_LDFLAGS = -municode endif endif # windows - -include $(topsrcdir)/config/rules.mk diff --git a/testing/xpcshell/Makefile.in b/testing/xpcshell/Makefile.in index ead4483db2b..4670bb629e8 100644 --- a/testing/xpcshell/Makefile.in +++ b/testing/xpcshell/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # Run selftests PYTHON_UNIT_TESTS := \ selftest.py diff --git a/toolkit/Makefile.in b/toolkit/Makefile.in index 1f1c870bd05..92df822fcfe 100644 --- a/toolkit/Makefile.in +++ b/toolkit/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk export:: diff --git a/toolkit/components/aboutmemory/tests/Makefile.in b/toolkit/components/aboutmemory/tests/Makefile.in index f241ef31f2f..4c08c5a7fc7 100644 --- a/toolkit/components/aboutmemory/tests/Makefile.in +++ b/toolkit/components/aboutmemory/tests/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_CHROME_FILES = \ memory-reports-good.json \ memory-reports-bad.json \ @@ -29,6 +21,3 @@ MOCHITEST_CHROME_FILES += \ test_memoryReporters.xul \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk - diff --git a/toolkit/components/alerts/Makefile.in b/toolkit/components/alerts/Makefile.in index a898e8b2665..eec8bdc94d9 100644 --- a/toolkit/components/alerts/Makefile.in +++ b/toolkit/components/alerts/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/ include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/alerts/test/Makefile.in b/toolkit/components/alerts/test/Makefile.in index d6bb8e04c5e..68cc3214ac9 100644 --- a/toolkit/components/alerts/test/Makefile.in +++ b/toolkit/components/alerts/test/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - # Mochitest tests # Synchronous tests like test_alerts.html must come before # asynchronous tests like test_alerts_noobserve.html! @@ -19,5 +11,3 @@ MOCHITEST_FILES = \ test_alerts.html \ test_alerts_noobserve.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/autocomplete/Makefile.in b/toolkit/components/autocomplete/Makefile.in index 554ea27e53e..15aff14ed53 100644 --- a/toolkit/components/autocomplete/Makefile.in +++ b/toolkit/components/autocomplete/Makefile.in @@ -2,12 +2,4 @@ # License, v. 2.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 diff --git a/toolkit/components/build/Makefile.in b/toolkit/components/build/Makefile.in index abf6dfd7854..6d7d1e75f23 100644 --- a/toolkit/components/build/Makefile.in +++ b/toolkit/components/build/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH=@DEPTH@ -topsrcdir=@top_srcdir@ -srcdir=@srcdir@ -VPATH=@srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 LOCAL_INCLUDES = \ -I$(srcdir)/../alerts \ @@ -54,5 +47,3 @@ endif ifdef MOZ_FEEDS SHARED_LIBRARY_LIBS += ../feeds/$(LIB_PREFIX)feed_s.$(LIB_SUFFIX) endif - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/commandlines/Makefile.in b/toolkit/components/commandlines/Makefile.in index 86f1a688612..15aff14ed53 100644 --- a/toolkit/components/commandlines/Makefile.in +++ b/toolkit/components/commandlines/Makefile.in @@ -2,12 +2,4 @@ # License, v. 2.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 diff --git a/toolkit/components/console/tests/Makefile.in b/toolkit/components/console/tests/Makefile.in index 12613c70a52..ac04ecd252c 100644 --- a/toolkit/components/console/tests/Makefile.in +++ b/toolkit/components/console/tests/Makefile.in @@ -3,16 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_CHROME_FILES = \ test_hugeURIs.xul \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/ctypes/Makefile.in b/toolkit/components/ctypes/Makefile.in index 4da5d6d31cc..4d35ffaf34a 100644 --- a/toolkit/components/ctypes/Makefile.in +++ b/toolkit/components/ctypes/Makefile.in @@ -2,17 +2,8 @@ # License, v. 2.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 LOCAL_INCLUDES := \ -I$(topsrcdir)/js/xpconnect/loader \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/ctypes/tests/Makefile.in b/toolkit/components/ctypes/tests/Makefile.in index 8d2a5bd6add..c8a1666c7cf 100644 --- a/toolkit/components/ctypes/tests/Makefile.in +++ b/toolkit/components/ctypes/tests/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - SHORT_LIBNAME = jscttest FORCE_SHARED_LIB = 1 diff --git a/toolkit/components/diskspacewatcher/Makefile.in b/toolkit/components/diskspacewatcher/Makefile.in index 2eed6114270..8e1c861dd39 100644 --- a/toolkit/components/diskspacewatcher/Makefile.in +++ b/toolkit/components/diskspacewatcher/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -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 diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in index bd53a3dcc09..8fdc90994a1 100644 --- a/toolkit/components/downloads/Makefile.in +++ b/toolkit/components/downloads/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk CXXFLAGS += $(TK_CFLAGS) -DGOOGLE_PROTOBUF_NO_RTTI diff --git a/toolkit/components/downloads/test/browser/Makefile.in b/toolkit/components/downloads/test/browser/Makefile.in index 720ee9cc745..98f2c5e7726 100644 --- a/toolkit/components/downloads/test/browser/Makefile.in +++ b/toolkit/components/downloads/test/browser/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_BROWSER_FILES = \ browser_nsIDownloadManagerUI.js \ browser_download_history.js \ @@ -20,5 +12,3 @@ MOCHITEST_FILES = \ download.html \ download.test \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/feeds/Makefile.in b/toolkit/components/feeds/Makefile.in index 5e901809cdd..026ec2e3b4b 100644 --- a/toolkit/components/feeds/Makefile.in +++ b/toolkit/components/feeds/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - MOZILLA_INTERNAL_API = 1 include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/feeds/test/Makefile.in b/toolkit/components/feeds/test/Makefile.in index 702fc71980b..d21cd8214a9 100644 --- a/toolkit/components/feeds/test/Makefile.in +++ b/toolkit/components/feeds/test/Makefile.in @@ -3,16 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_CHROME_FILES = \ test_bug675492.xul \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/filepicker/Makefile.in b/toolkit/components/filepicker/Makefile.in index 3ab977f8b59..5aa5764bee3 100644 --- a/toolkit/components/filepicker/Makefile.in +++ b/toolkit/components/filepicker/Makefile.in @@ -4,17 +4,8 @@ # 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 - ifdef MOZ_XUL ifeq (,$(filter android qt os2 cocoa windows,$(MOZ_WIDGET_TOOLKIT))) EXPORT_LIBRARY = 1 endif endif - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/jsdownloads/src/Makefile.in b/toolkit/components/jsdownloads/src/Makefile.in index 09f092d08e0..c97efbc03e9 100644 --- a/toolkit/components/jsdownloads/src/Makefile.in +++ b/toolkit/components/jsdownloads/src/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk CXXFLAGS += $(TK_CFLAGS) diff --git a/toolkit/components/jsdownloads/test/data/Makefile.in b/toolkit/components/jsdownloads/test/data/Makefile.in index 223aa6f5bca..6e009860ab0 100644 --- a/toolkit/components/jsdownloads/test/data/Makefile.in +++ b/toolkit/components/jsdownloads/test/data/Makefile.in @@ -1,15 +1,6 @@ # 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 - FILES = \ empty.txt \ source.txt \ diff --git a/toolkit/components/maintenanceservice/Makefile.in b/toolkit/components/maintenanceservice/Makefile.in index 45085c3ef7f..10a39a3508b 100644 --- a/toolkit/components/maintenanceservice/Makefile.in +++ b/toolkit/components/maintenanceservice/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # For debugging purposes only #DEFINES += -DDISABLE_UPDATER_AUTHENTICODE_CHECK diff --git a/toolkit/components/mediasniffer/Makefile.in b/toolkit/components/mediasniffer/Makefile.in index 4301cae66bf..15aff14ed53 100644 --- a/toolkit/components/mediasniffer/Makefile.in +++ b/toolkit/components/mediasniffer/Makefile.in @@ -2,13 +2,4 @@ # License, v. 2.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 diff --git a/toolkit/components/microformats/tests/Makefile.in b/toolkit/components/microformats/tests/Makefile.in index 3e2c0ca67fb..71ac09c5279 100644 --- a/toolkit/components/microformats/tests/Makefile.in +++ b/toolkit/components/microformats/tests/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_Microformats.html \ test_Microformats_hCard.html \ @@ -22,5 +15,3 @@ MOCHITEST_FILES = \ test_framerecursion.html \ geo.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/osfile/tests/mochi/Makefile.in b/toolkit/components/osfile/tests/mochi/Makefile.in index 25cf80b2932..51537ae51f5 100644 --- a/toolkit/components/osfile/tests/mochi/Makefile.in +++ b/toolkit/components/osfile/tests/mochi/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_CHROME_FILES := \ test_osfile_back.xul \ worker_handler.js \ @@ -23,5 +15,3 @@ MOCHITEST_CHROME_FILES := \ test_osfile_async.xul \ main_test_osfile_async.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/passwordmgr/test/Makefile.in b/toolkit/components/passwordmgr/test/Makefile.in index 0852f8bf88a..b2ea222f1ad 100644 --- a/toolkit/components/passwordmgr/test/Makefile.in +++ b/toolkit/components/passwordmgr/test/Makefile.in @@ -3,12 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - include $(topsrcdir)/config/config.mk # Mochitest tests @@ -91,5 +85,3 @@ MOCHITEST_CHROME_FILES += \ # This test doesn't pass because we can't ensure a cross-platform # event that occurs between DOMContentLoaded and Pageload # test_bug_221634.html - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/passwordmgr/test/auth2/Makefile.in b/toolkit/components/passwordmgr/test/auth2/Makefile.in index d7588520b84..bd9fd24a529 100644 --- a/toolkit/components/passwordmgr/test/auth2/Makefile.in +++ b/toolkit/components/passwordmgr/test/auth2/Makefile.in @@ -2,16 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ authenticate.sjs \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/passwordmgr/test/browser/Makefile.in b/toolkit/components/passwordmgr/test/browser/Makefile.in index 304ffbebd6f..8205c924a92 100644 --- a/toolkit/components/passwordmgr/test/browser/Makefile.in +++ b/toolkit/components/passwordmgr/test/browser/Makefile.in @@ -3,19 +3,9 @@ # License, v. 2.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_passwordmgrdlg.js \ browser_passwordmgr_sort.js \ browser_passwordmgrcopypwd.js \ browser_passwordmgr_observers.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/perf/Makefile.in b/toolkit/components/perf/Makefile.in index 038daa92023..02ae543b4d4 100644 --- a/toolkit/components/perf/Makefile.in +++ b/toolkit/components/perf/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 LOCAL_INCLUDES := \ -I$(topsrcdir)/js/xpconnect/loader \ @@ -19,5 +12,3 @@ MOCHITEST_CHROME_FILES = \ test_pm.xul \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/places/Makefile.in b/toolkit/components/places/Makefile.in index 7006d6f4a8c..9819e67912c 100644 --- a/toolkit/components/places/Makefile.in +++ b/toolkit/components/places/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifdef MOZ_PLACES EXPORT_LIBRARY = 1 diff --git a/toolkit/components/places/tests/Makefile.in b/toolkit/components/places/tests/Makefile.in index 1cc089626de..9c1395d0533 100644 --- a/toolkit/components/places/tests/Makefile.in +++ b/toolkit/components/places/tests/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - # Files in the main "tests" folder. XPCSHELL_TESTS_COMMON = \ head_common.js \ diff --git a/toolkit/components/places/tests/browser/Makefile.in b/toolkit/components/places/tests/browser/Makefile.in index 2a8a98b6570..0990f7d19e7 100644 --- a/toolkit/components/places/tests/browser/Makefile.in +++ b/toolkit/components/places/tests/browser/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_BROWSER_FILES = \ head.js \ browser_bug248970.js \ @@ -55,5 +47,3 @@ MOCHITEST_FILES = \ favicon-normal32.png \ favicon.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/places/tests/chrome/Makefile.in b/toolkit/components/places/tests/chrome/Makefile.in index 7b54f1723f2..5153bdc1b6e 100644 --- a/toolkit/components/places/tests/chrome/Makefile.in +++ b/toolkit/components/places/tests/chrome/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ sample_feed.atom \ bad_links.atom \ @@ -32,5 +24,3 @@ MOCHITEST_CHROME_FILES = \ history_post.sjs \ test_reloadLivemarks.xul \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/places/tests/mochitest/bug_411966/Makefile.in b/toolkit/components/places/tests/mochitest/bug_411966/Makefile.in index 69bdc35452f..1b43efcac00 100644 --- a/toolkit/components/places/tests/mochitest/bug_411966/Makefile.in +++ b/toolkit/components/places/tests/mochitest/bug_411966/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ redirect.js \ TypedPage.htm \ @@ -20,5 +12,3 @@ MOCHITEST_FILES = \ TempRedirectPage.htm^headers^ \ PermRedirectPage.htm \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/places/tests/mochitest/bug_461710/Makefile.in b/toolkit/components/places/tests/mochitest/bug_461710/Makefile.in index aac587d78a8..ceb3734bb48 100644 --- a/toolkit/components/places/tests/mochitest/bug_461710/Makefile.in +++ b/toolkit/components/places/tests/mochitest/bug_461710/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ visited_page.html \ link_page.html \ @@ -18,5 +10,3 @@ MOCHITEST_FILES = \ link_page-3.html \ iframe.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/prompts/test/Makefile.in b/toolkit/components/prompts/test/Makefile.in index ba0244466c4..ca40c5e5e0e 100644 --- a/toolkit/components/prompts/test/Makefile.in +++ b/toolkit/components/prompts/test/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - # Mochitest tests MOCHITEST_FILES = \ test_modal_select.html \ @@ -23,5 +15,3 @@ MOCHITEST_FILES = \ bug619644_inner.html \ bug625187_iframe.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/protobuf/Makefile.in b/toolkit/components/protobuf/Makefile.in index 7a51a803e8d..82af0c9c02a 100644 --- a/toolkit/components/protobuf/Makefile.in +++ b/toolkit/components/protobuf/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - VPATH = \ @srcdir@ \ @srcdir@/google/protobuf \ diff --git a/toolkit/components/reflect/Makefile.in b/toolkit/components/reflect/Makefile.in index 20a0aa89f9c..216d04cfd8f 100644 --- a/toolkit/components/reflect/Makefile.in +++ b/toolkit/components/reflect/Makefile.in @@ -2,18 +2,9 @@ # License, v. 2.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 EXTRA_DSO_LDOPTS += \ $(MOZ_COMPONENT_LIBS) \ $(MOZ_JS_LIBS) \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/remote/Makefile.in b/toolkit/components/remote/Makefile.in index 8382e419743..6265b246d1e 100644 --- a/toolkit/components/remote/Makefile.in +++ b/toolkit/components/remote/Makefile.in @@ -3,16 +3,8 @@ # License, v. 2.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 CXXFLAGS += $(TK_CFLAGS) - diff --git a/toolkit/components/satchel/Makefile.in b/toolkit/components/satchel/Makefile.in index fff31c9f1d6..5a02721032c 100644 --- a/toolkit/components/satchel/Makefile.in +++ b/toolkit/components/satchel/Makefile.in @@ -2,18 +2,8 @@ # License, v. 2.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 LOCAL_INCLUDES = \ -I$(srcdir)/../build \ $(NULL) - - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/satchel/test/Makefile.in b/toolkit/components/satchel/test/Makefile.in index ed5e614a67f..9d72b1ee274 100644 --- a/toolkit/components/satchel/test/Makefile.in +++ b/toolkit/components/satchel/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_bug_511615.html \ test_bug_787624.html \ @@ -22,6 +14,3 @@ MOCHITEST_FILES = \ subtst_form_submission_1.html \ subtst_privbrowsing.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/toolkit/components/satchel/test/browser/Makefile.in b/toolkit/components/satchel/test/browser/Makefile.in index 6c9329a44b7..e78af561ab5 100644 --- a/toolkit/components/satchel/test/browser/Makefile.in +++ b/toolkit/components/satchel/test/browser/Makefile.in @@ -2,19 +2,8 @@ # License, v. 2.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 \ ../subtst_privbrowsing.html \ browser_privbrowsing_perwindowpb.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/toolkit/components/search/Makefile.in b/toolkit/components/search/Makefile.in index cb5b5feeaba..7355d13216c 100644 --- a/toolkit/components/search/Makefile.in +++ b/toolkit/components/search/Makefile.in @@ -2,14 +2,4 @@ # License, v. 2.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 += -DMOZ_DISTRIBUTION_ID=$(MOZ_DISTRIBUTION_ID) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/social/test/browser/Makefile.in b/toolkit/components/social/test/browser/Makefile.in index 20eed500104..8d77d0f4351 100644 --- a/toolkit/components/social/test/browser/Makefile.in +++ b/toolkit/components/social/test/browser/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - ifdef MOZ_SOCIAL # social is turned off for android @@ -31,5 +23,3 @@ MOCHITEST_BROWSER_FILES = \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/startup/tests/browser/Makefile.in b/toolkit/components/startup/tests/browser/Makefile.in index d493dd085b2..6f9385228b9 100644 --- a/toolkit/components/startup/tests/browser/Makefile.in +++ b/toolkit/components/startup/tests/browser/Makefile.in @@ -2,19 +2,9 @@ # License, v. 2.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_bug511456.js \ browser_bug537449.js \ browser_crash_detection.js \ beforeunload.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/telemetry/Makefile.in b/toolkit/components/telemetry/Makefile.in index c91cbad5609..ed1429e1623 100644 --- a/toolkit/components/telemetry/Makefile.in +++ b/toolkit/components/telemetry/Makefile.in @@ -3,12 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk USE_RCS_MK := 1 include $(topsrcdir)/config/makefiles/rcs.mk diff --git a/toolkit/components/thumbnails/test/Makefile.in b/toolkit/components/thumbnails/test/Makefile.in index 335c1dbe7f0..1d17831e85f 100644 --- a/toolkit/components/thumbnails/test/Makefile.in +++ b/toolkit/components/thumbnails/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_BROWSER_FILES := \ browser_thumbnails_background.js \ browser_thumbnails_capture.js \ @@ -30,5 +22,3 @@ MOCHITEST_BROWSER_FILES := \ thumbnails_background.sjs \ thumbnails_update.sjs \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/url-classifier/Makefile.in b/toolkit/components/url-classifier/Makefile.in index 844f17d5b61..934d6dc2b8e 100644 --- a/toolkit/components/url-classifier/Makefile.in +++ b/toolkit/components/url-classifier/Makefile.in @@ -3,17 +3,7 @@ # 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 - LOCAL_INCLUDES = \ -I$(srcdir)/../build \ $(SQLITE_CFLAGS) \ $(NULL) - - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/url-classifier/tests/Makefile.in b/toolkit/components/url-classifier/tests/Makefile.in index 24236f07141..905791dc053 100644 --- a/toolkit/components/url-classifier/tests/Makefile.in +++ b/toolkit/components/url-classifier/tests/Makefile.in @@ -4,14 +4,6 @@ # 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 - MOZILLA_INTERNAL_API = 1 # XXX Get this to work in libxul builds. @@ -19,5 +11,3 @@ MOZILLA_INTERNAL_API = 1 #CPP_UNIT_TESTS = \ # TestUrlClassifierUtils.cpp \ # $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/url-classifier/tests/mochitest/Makefile.in b/toolkit/components/url-classifier/tests/mochitest/Makefile.in index 49c1f1a2fe1..15b189baa8a 100644 --- a/toolkit/components/url-classifier/tests/mochitest/Makefile.in +++ b/toolkit/components/url-classifier/tests/mochitest/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_classifier.html \ test_classifier_worker.html \ @@ -26,6 +18,3 @@ MOCHITEST_FILES = \ MOCHITEST_CHROME_FILES = \ test_lookup_system_principal.html \ $(NULL) - - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/urlformatter/Makefile.in b/toolkit/components/urlformatter/Makefile.in index a6bb8bad8b4..4bbb6e4368c 100644 --- a/toolkit/components/urlformatter/Makefile.in +++ b/toolkit/components/urlformatter/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - - export:: google_api_key EXTRA_PP_COMPONENTS_FLAGS = -I google_api_key diff --git a/toolkit/components/viewsource/test/Makefile.in b/toolkit/components/viewsource/test/Makefile.in index 4892ebb4b75..ca082b7fe57 100644 --- a/toolkit/components/viewsource/test/Makefile.in +++ b/toolkit/components/viewsource/test/Makefile.in @@ -4,16 +4,6 @@ # 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_428653.xul \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/viewsource/test/browser/Makefile.in b/toolkit/components/viewsource/test/browser/Makefile.in index 2df7cf9d81b..04efe6f28c6 100644 --- a/toolkit/components/viewsource/test/browser/Makefile.in +++ b/toolkit/components/viewsource/test/browser/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_BROWSER_FILES = \ browser_bug699356.js \ browser_bug713810.js \ @@ -19,5 +11,3 @@ MOCHITEST_BROWSER_FILES = \ browser_viewsourceprefs_nonhtml.js \ head.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/workerloader/Makefile.in b/toolkit/components/workerloader/Makefile.in index 41b9e8487e6..1bbcea7946a 100644 --- a/toolkit/components/workerloader/Makefile.in +++ b/toolkit/components/workerloader/Makefile.in @@ -2,19 +2,9 @@ # License, v. 2.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 - WORKER_FILES := require.js \ $(NULL) INSTALL_TARGETS += WORKER WORKER_DEST = $(FINAL_TARGET)/modules/workers - -include $(topsrcdir)/config/rules.mk - diff --git a/toolkit/components/workerloader/tests/Makefile.in b/toolkit/components/workerloader/tests/Makefile.in index b270a13c750..42b727cd5d4 100644 --- a/toolkit/components/workerloader/tests/Makefile.in +++ b/toolkit/components/workerloader/tests/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_CHROME_FILES := \ test_loading.xul \ worker_test_loading.js \ @@ -24,5 +16,3 @@ MOCHITEST_CHROME_FILES := \ moduleG-throws-later.js \ moduleH-module-dot-exports.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/content/Makefile.in b/toolkit/content/Makefile.in index d108440f133..8675ba2c2e6 100644 --- a/toolkit/content/Makefile.in +++ b/toolkit/content/Makefile.in @@ -4,14 +4,8 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - CHROME_DEPS = buildconfig.html -include $(DEPTH)/config/autoconf.mk USE_RCS_MK := 1 include $(topsrcdir)/config/makefiles/makeutils.mk @@ -47,5 +41,3 @@ endif BUILD_HOSTNAME = $(shell hostname -s || hostname) DEFINES += -DBUILD_HOSTNAME="$(BUILD_HOSTNAME)" - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/content/tests/browser/Makefile.in b/toolkit/content/tests/browser/Makefile.in index 7245a542796..457ae82c386 100644 --- a/toolkit/content/tests/browser/Makefile.in +++ b/toolkit/content/tests/browser/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_BROWSER_FILES = \ browser_keyevents_during_autoscrolling.js \ browser_bug295977_autoscroll_overflow.js \ @@ -20,5 +12,3 @@ MOCHITEST_BROWSER_FILES = \ browser_default_image_filename.js \ browser_input_file_tooltips.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/content/tests/browser/common/Makefile.in b/toolkit/content/tests/browser/common/Makefile.in index 3e6bac2c7cf..eead015eb16 100644 --- a/toolkit/content/tests/browser/common/Makefile.in +++ b/toolkit/content/tests/browser/common/Makefile.in @@ -3,16 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_BROWSER_FILES = \ mockTransfer.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/content/tests/browser/data/Makefile.in b/toolkit/content/tests/browser/data/Makefile.in index 17e9e9f590b..347b2a9c8f4 100644 --- a/toolkit/content/tests/browser/data/Makefile.in +++ b/toolkit/content/tests/browser/data/Makefile.in @@ -3,17 +3,7 @@ # License, v. 2.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 = \ post_form_inner.sjs \ post_form_outer.sjs \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/content/tests/chrome/Makefile.in b/toolkit/content/tests/chrome/Makefile.in index e9eb4e1fe6a..93ab10dd1ae 100644 --- a/toolkit/content/tests/chrome/Makefile.in +++ b/toolkit/content/tests/chrome/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_CHROME_FILES = \ ../widgets/popup_shared.js \ ../widgets/tree_shared.js \ @@ -177,5 +169,3 @@ MOCHITEST_CHROME_FILES += $(filter disabled-temporarily, test_cursorsnap.xul) \ window_cursorsnap_dialog.xul \ window_cursorsnap_wizard.xul endif - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/content/tests/chrome/rtlchrome/Makefile.in b/toolkit/content/tests/chrome/rtlchrome/Makefile.in index 67656bde5df..4f782262162 100644 --- a/toolkit/content/tests/chrome/rtlchrome/Makefile.in +++ b/toolkit/content/tests/chrome/rtlchrome/Makefile.in @@ -2,18 +2,8 @@ # License, v. 2.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 := \ rtl.css \ rtl.dtd \ rtl.manifest \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/content/tests/chrome/rtltest/Makefile.in b/toolkit/content/tests/chrome/rtltest/Makefile.in index 3c72d00b171..1144f581b05 100644 --- a/toolkit/content/tests/chrome/rtltest/Makefile.in +++ b/toolkit/content/tests/chrome/rtltest/Makefile.in @@ -2,16 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_CHROME_FILES := \ righttoleft.manifest \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/content/tests/chrome/rtltest/content/Makefile.in b/toolkit/content/tests/chrome/rtltest/content/Makefile.in index 47bece880c4..cf3fff2f6a0 100644 --- a/toolkit/content/tests/chrome/rtltest/content/Makefile.in +++ b/toolkit/content/tests/chrome/rtltest/content/Makefile.in @@ -2,16 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_CHROME_FILES := \ dirtest.xul \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/content/tests/widgets/Makefile.in b/toolkit/content/tests/widgets/Makefile.in index 44f9fd773e7..d9e8fb434a7 100644 --- a/toolkit/content/tests/widgets/Makefile.in +++ b/toolkit/content/tests/widgets/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_contextmenu_nested.xul \ tree_shared.js \ @@ -59,5 +51,3 @@ MOCHITEST_FILES += \ test_popupanchor.xul \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/crashreporter/Makefile.in b/toolkit/crashreporter/Makefile.in index ddd1b40550d..c56af5e478e 100644 --- a/toolkit/crashreporter/Makefile.in +++ b/toolkit/crashreporter/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifeq ($(OS_ARCH),Linux) # MOZ_APP_NAME is needed on Android, where we # need to launch by package name. diff --git a/toolkit/crashreporter/breakpad-windows-libxul/Makefile.in b/toolkit/crashreporter/breakpad-windows-libxul/Makefile.in index 1bd1672e544..ad732f1fba1 100644 --- a/toolkit/crashreporter/breakpad-windows-libxul/Makefile.in +++ b/toolkit/crashreporter/breakpad-windows-libxul/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_STATIC_LIB = 1 STL_FLAGS = @@ -28,5 +21,3 @@ VPATH += \ $(NULL) DEFINES += -DUNICODE -DUNICODE_ -DBREAKPAD_NO_TERMINATE_THREAD -DNOMINMAX - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/crashreporter/breakpad-windows-standalone/Makefile.in b/toolkit/crashreporter/breakpad-windows-standalone/Makefile.in index 5192abc59b8..21b66aad643 100644 --- a/toolkit/crashreporter/breakpad-windows-standalone/Makefile.in +++ b/toolkit/crashreporter/breakpad-windows-standalone/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_STATIC_LIB = 1 USE_STATIC_LIBS = 1 MOZ_GLUE_LDFLAGS = @@ -28,5 +21,3 @@ VPATH += \ $(NULL) DEFINES += -DUNICODE -DUNICODE_ -DBREAKPAD_NO_TERMINATE_THREAD -DNOMINMAX - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/crashreporter/client/Makefile.in b/toolkit/crashreporter/client/Makefile.in index de89dde2bd7..01e7388e919 100644 --- a/toolkit/crashreporter/client/Makefile.in +++ b/toolkit/crashreporter/client/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - # Don't use the STL wrappers in the crashreporter clients; they don't # link with -lmozalloc, and it really doesn't matter here anyway. STL_FLAGS = diff --git a/toolkit/crashreporter/google-breakpad/src/client/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/Makefile.in index adde49f88b9..24270f18c95 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/client/Makefile.in @@ -2,18 +2,9 @@ # License, v. 2.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 - XPI_NAME = crashreporter LOCAL_INCLUDES = -I$(srcdir)/.. # need static lib FORCE_STATIC_LIB = 1 - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/Makefile.in index 343e7cf52af..a4af3425c69 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES = \ -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src \ $(NULL) diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in index 0b1d2bf9499..7b251bc7447 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifdef MOZ_THUMB2 #{ # The syscall number is passed through r7 in the linux ARM ABI, but r7 # is also the THUMB frame pointer. (Unfortunate, but ah well.) gcc @@ -39,5 +32,3 @@ ifeq ($(OS_TARGET),Android) DEFINES += -D_STLP_CONST_CONSTRUCTOR_BUG -D_STLP_NO_MEMBER_TEMPLATES LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/android/include/ endif - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/Makefile.in index 6b7feee07b6..085a48f4a60 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - XPI_NAME = crashreporter LOCAL_INCLUDES = \ @@ -25,5 +18,3 @@ endif ifeq (gonk,$(MOZ_WIDGET_TOOLKIT)) DEFINES += -DELFSIZE=32 endif - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/Makefile.in index df06cbf72ca..36fc5716116 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/Makefile.in @@ -2,18 +2,9 @@ # License, v. 2.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 - XPI_NAME = crashreporter LOCAL_INCLUDES = -I$(srcdir)/../../.. # need static lib FORCE_STATIC_LIB = 1 - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile.in index df06cbf72ca..36fc5716116 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile.in @@ -2,18 +2,9 @@ # License, v. 2.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 - XPI_NAME = crashreporter LOCAL_INCLUDES = -I$(srcdir)/../../.. # need static lib FORCE_STATIC_LIB = 1 - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/Makefile.in index df06cbf72ca..36fc5716116 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/Makefile.in @@ -2,18 +2,9 @@ # License, v. 2.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 - XPI_NAME = crashreporter LOCAL_INCLUDES = -I$(srcdir)/../../.. # need static lib FORCE_STATIC_LIB = 1 - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in index d92731f14ff..72994734173 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifneq (WINNT,$(OS_TARGET)) ifdef MOZ_CRASHREPORTER endif diff --git a/toolkit/crashreporter/google-breakpad/src/common/dwarf/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/dwarf/Makefile.in index 1c5b9d73dad..29029e05375 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/dwarf/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/common/dwarf/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifdef MOZ_CRASHREPORTER LOCAL_INCLUDES = -I$(srcdir)/../.. @@ -27,5 +20,3 @@ HOST_CXXFLAGS := -funsigned-char $(filter-out -fno-rtti,$(HOST_CXXFLAGS)) # need static lib FORCE_STATIC_LIB = 1 - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in index 99357ac6039..908f3d7bec9 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifdef MOZ_CRASHREPORTER endif diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in index d17854c24a5..e4f6fbc4f43 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - - LOCAL_INCLUDES = -I$(srcdir)/../.. # This is a little weird, but we're building a host and a target lib here. diff --git a/toolkit/crashreporter/google-breakpad/src/common/solaris/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/solaris/Makefile.in index 04d3f8e85a3..589f0b95848 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/solaris/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/common/solaris/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - - LOCAL_INCLUDES = -I$(srcdir)/../.. # not compiling http_upload.cc currently @@ -22,5 +14,3 @@ HOST_CPPSRCS = \ # need static lib FORCE_STATIC_LIB = 1 - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/crashreporter/google-breakpad/src/processor/Makefile.in b/toolkit/crashreporter/google-breakpad/src/processor/Makefile.in index b5daa36670f..bef12cad85c 100644 --- a/toolkit/crashreporter/google-breakpad/src/processor/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/processor/Makefile.in @@ -2,16 +2,7 @@ # License, v. 2.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 - LOCAL_INCLUDES = -I$(srcdir)/../.. -I$(srcdir)/.. # need static lib FORCE_STATIC_LIB = 1 - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in b/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in index 07036fee670..ff3a0873a4c 100644 --- a/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - HOST_PROGRAM = dump_syms LOCAL_INCLUDES = \ @@ -25,5 +18,3 @@ HOST_LIBS += \ $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/$(LIB_PREFIX)host_breakpad_common_s.$(LIB_SUFFIX) \ $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/dwarf/$(LIB_PREFIX)host_breakpad_dwarf_s.$(LIB_SUFFIX) \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/Makefile.in b/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/Makefile.in index 33d31c38f9a..d62363170e7 100644 --- a/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - HOST_PROGRAM = dump_syms LOCAL_INCLUDES = \ @@ -29,5 +22,3 @@ HOST_LIBS += \ HOST_LDFLAGS += \ -framework Foundation \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/Makefile.in b/toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/Makefile.in index 7d7a9cac4af..bd0147096db 100644 --- a/toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - HOST_PROGRAM = dump_syms LOCAL_INCLUDES = \ @@ -26,5 +19,3 @@ HOST_LIBS += \ $(NULL) HOST_LDFLAGS += -lelf -ldemangle - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/crashreporter/injector/Makefile.in b/toolkit/crashreporter/injector/Makefile.in index 2fd65673afc..f5a66b85d32 100644 --- a/toolkit/crashreporter/injector/Makefile.in +++ b/toolkit/crashreporter/injector/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_SHARED_LIB = 1 USE_STATIC_LIBS = 1 STL_FLAGS = diff --git a/toolkit/crashreporter/test/Makefile.in b/toolkit/crashreporter/test/Makefile.in index f65357c33f1..cebe4615f87 100644 --- a/toolkit/crashreporter/test/Makefile.in +++ b/toolkit/crashreporter/test/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_SHARED_LIB = 1 VPATH += \ @@ -42,4 +34,3 @@ libs:: $(MOCHITEST_BROWSER_FILES) libs:: $(SHARED_LIBRARY) $(EXTRA_JS_MODULES) $(INSTALL) $^ $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit/ $(INSTALL) $^ $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit_ipc/ - diff --git a/toolkit/devtools/Makefile.in b/toolkit/devtools/Makefile.in index bba70493084..7501dba5848 100644 --- a/toolkit/devtools/Makefile.in +++ b/toolkit/devtools/Makefile.in @@ -2,11 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - include $(topsrcdir)/config/rules.mk libs:: diff --git a/toolkit/devtools/client/Makefile.in b/toolkit/devtools/client/Makefile.in index eaae4c6f08b..23506e61c6d 100644 --- a/toolkit/devtools/client/Makefile.in +++ b/toolkit/devtools/client/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk libs:: diff --git a/toolkit/devtools/gcli/Makefile.in b/toolkit/devtools/gcli/Makefile.in index fe75dad69a8..f75d4ac50e0 100644 --- a/toolkit/devtools/gcli/Makefile.in +++ b/toolkit/devtools/gcli/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk libs:: diff --git a/toolkit/devtools/server/Makefile.in b/toolkit/devtools/server/Makefile.in index 9402dbeb04e..7f61c3e0aee 100644 --- a/toolkit/devtools/server/Makefile.in +++ b/toolkit/devtools/server/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 EXTRA_DSO_LDOPTS += \ diff --git a/toolkit/devtools/server/tests/mochitest/Makefile.in b/toolkit/devtools/server/tests/mochitest/Makefile.in index 86a0f782f02..3b6d826755e 100644 --- a/toolkit/devtools/server/tests/mochitest/Makefile.in +++ b/toolkit/devtools/server/tests/mochitest/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_CHROME_FILES = \ inspector-helpers.js \ inspector-traversal-data.html \ @@ -39,5 +31,3 @@ MOCHITEST_CHROME_FILES = \ test_connection-manager.html \ test_device.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/devtools/sourcemap/Makefile.in b/toolkit/devtools/sourcemap/Makefile.in index 8890154f78a..aad3588f054 100644 --- a/toolkit/devtools/sourcemap/Makefile.in +++ b/toolkit/devtools/sourcemap/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk libs:: diff --git a/toolkit/devtools/webconsole/Makefile.in b/toolkit/devtools/webconsole/Makefile.in index fe3837d4756..45ffcf18666 100644 --- a/toolkit/devtools/webconsole/Makefile.in +++ b/toolkit/devtools/webconsole/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk libs:: diff --git a/toolkit/devtools/webconsole/test/Makefile.in b/toolkit/devtools/webconsole/test/Makefile.in index 64b5348446d..7d4d02651ca 100644 --- a/toolkit/devtools/webconsole/test/Makefile.in +++ b/toolkit/devtools/webconsole/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_CHROME_FILES = \ test_basics.html \ test_cached_messages.html \ @@ -30,5 +22,3 @@ MOCHITEST_CHROME_FILES = \ data.json^headers^ \ common.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/forgetaboutsite/test/browser/Makefile.in b/toolkit/forgetaboutsite/test/browser/Makefile.in index 8abe5e26f58..1c531a5c72f 100644 --- a/toolkit/forgetaboutsite/test/browser/Makefile.in +++ b/toolkit/forgetaboutsite/test/browser/Makefile.in @@ -2,16 +2,7 @@ # License, v. 2.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 - MOCHITEST_BROWSER_FILES := \ browser_clearplugindata.js \ browser_clearplugindata.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/identity/Makefile.in b/toolkit/identity/Makefile.in index fa79dcc3230..275538dce73 100644 --- a/toolkit/identity/Makefile.in +++ b/toolkit/identity/Makefile.in @@ -2,13 +2,4 @@ # License, v. 2.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 diff --git a/toolkit/identity/tests/chrome/Makefile.in b/toolkit/identity/tests/chrome/Makefile.in index 0d8c172e5f0..693db85ff79 100644 --- a/toolkit/identity/tests/chrome/Makefile.in +++ b/toolkit/identity/tests/chrome/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_CHROME_FILES = \ sandbox_content.html \ sandbox_content_alert.html \ @@ -21,5 +13,3 @@ MOCHITEST_CHROME_FILES = \ sandbox_content.sjs \ test_sandbox.xul \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in index 5c4063f0f6d..c6885253d68 100644 --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/rdf/util/src/objs.mk include $(topsrcdir)/intl/unicharutil/util/objs.mk @@ -714,5 +707,3 @@ endif $(FINAL_TARGET)/dependentlibs.list: dependentlibs.py $(SHARED_LIBRARY) $(wildcard $(if $(wildcard $(FINAL_TARGET)/dependentlibs.list),$(addprefix $(FINAL_TARGET)/,$(shell cat $(FINAL_TARGET)/dependentlibs.list)))) $(PYTHON) $< $(SHARED_LIBRARY) -L $(FINAL_TARGET) $(if $(TOOLCHAIN_PREFIX),$(addprefix -p ,$(TOOLCHAIN_PREFIX))) > $@ - - diff --git a/toolkit/library/winvccorlib/Makefile.in b/toolkit/library/winvccorlib/Makefile.in index 0c004402223..8f6203ffbf7 100644 --- a/toolkit/library/winvccorlib/Makefile.in +++ b/toolkit/library/winvccorlib/Makefile.in @@ -2,20 +2,10 @@ # License, v. 2.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@ - # When we're linking GTest we recurse into this directory but don't need # to generate this library ifndef LINK_GTEST -include $(DEPTH)/config/autoconf.mk - FORCE_SHARED_LIB=1 endif - -include $(topsrcdir)/config/rules.mk - diff --git a/toolkit/locales/Makefile.in b/toolkit/locales/Makefile.in index 4548cc42ba0..e3e28e44bf3 100644 --- a/toolkit/locales/Makefile.in +++ b/toolkit/locales/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - DEFINES += -DAB_CD=$(AB_CD) XULPPFLAGS += -I$(LOCALE_SRCDIR)/defines.inc diff --git a/toolkit/modules/Makefile.in b/toolkit/modules/Makefile.in index 273612e6554..f9d643c8e1b 100644 --- a/toolkit/modules/Makefile.in +++ b/toolkit/modules/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifdef MOZ_TOOLKIT_SEARCH DEFINES += -DMOZ_TOOLKIT_SEARCH endif @@ -17,5 +10,3 @@ DEFINES += \ -DMOZ_APP_NAME=$(MOZ_APP_NAME) \ -DMOZ_BUILD_APP=$(MOZ_BUILD_APP) \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/modules/tests/browser/Makefile.in b/toolkit/modules/tests/browser/Makefile.in index 22610f45e82..f30e8d08b85 100644 --- a/toolkit/modules/tests/browser/Makefile.in +++ b/toolkit/modules/tests/browser/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_BROWSER_FILES = \ browser_DeferredTask.js \ browser_Deprecated.js \ @@ -19,5 +11,3 @@ MOCHITEST_BROWSER_FILES = \ browser_Troubleshoot.js \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/modules/tests/chrome/Makefile.in b/toolkit/modules/tests/chrome/Makefile.in index 9c3ed48eb65..0e4c38bca7b 100644 --- a/toolkit/modules/tests/chrome/Makefile.in +++ b/toolkit/modules/tests/chrome/Makefile.in @@ -2,17 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_CHROME_FILES = \ test_bug544442_checkCert.xul \ $(NULL) - - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/mozapps/downloads/tests/Makefile.in b/toolkit/mozapps/downloads/tests/Makefile.in index ba4bdd28913..2a5fe66d574 100644 --- a/toolkit/mozapps/downloads/tests/Makefile.in +++ b/toolkit/mozapps/downloads/tests/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk libs:: diff --git a/toolkit/mozapps/downloads/tests/chrome/Makefile.in b/toolkit/mozapps/downloads/tests/chrome/Makefile.in index 9555a89efbf..573dc97be5f 100644 --- a/toolkit/mozapps/downloads/tests/chrome/Makefile.in +++ b/toolkit/mozapps/downloads/tests/chrome/Makefile.in @@ -3,14 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - # temporarily disabled test (bug 483200) # test_retention_is_0_closes.xul \ @@ -58,5 +50,3 @@ MOCHITEST_CHROME_FILES += \ $(filter disabled-for-very-frequent-orange--bug-630567, test_taskbarprogress_service.xul) \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/mozapps/extensions/Makefile.in b/toolkit/mozapps/extensions/Makefile.in index 5eeb7947b6e..33851f05f3f 100644 --- a/toolkit/mozapps/extensions/Makefile.in +++ b/toolkit/mozapps/extensions/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifeq (,$(filter aurora beta release esr,$(MOZ_UPDATE_CHANNEL))) DEFINES += -DMOZ_COMPATIBILITY_NIGHTLY=1 endif @@ -31,5 +24,3 @@ EXTRA_DSO_LDOPTS = \ $(MOZ_UNICHARUTIL_LIBS) \ $(MOZ_COMPONENT_LIBS) \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/mozapps/extensions/test/Makefile.in b/toolkit/mozapps/extensions/test/Makefile.in index 43f32ec30d4..3ef6ffbc45b 100644 --- a/toolkit/mozapps/extensions/test/Makefile.in +++ b/toolkit/mozapps/extensions/test/Makefile.in @@ -2,18 +2,10 @@ # License, v. 2.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@ ADDONSRC = $(srcdir)/addons -relativesrcdir = @relativesrcdir@ - TESTROOT = $(CURDIR)/$(DEPTH)/_tests/xpcshell/$(relativesrcdir) TESTXPI = $(TESTROOT)/xpcshell/addons -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk libs:: diff --git a/toolkit/mozapps/extensions/test/browser/Makefile.in b/toolkit/mozapps/extensions/test/browser/Makefile.in index af6e1ea663a..881366f130d 100644 --- a/toolkit/mozapps/extensions/test/browser/Makefile.in +++ b/toolkit/mozapps/extensions/test/browser/Makefile.in @@ -2,16 +2,9 @@ # License, v. 2.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@ ADDONSRC = $(srcdir)/addons TESTXPI = $(CURDIR)/$(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)/addons -include $(DEPTH)/config/autoconf.mk - MOCHITEST_BROWSER_MAIN = \ head.js \ browser_about.js \ diff --git a/toolkit/mozapps/extensions/test/mochitest/Makefile.in b/toolkit/mozapps/extensions/test/mochitest/Makefile.in index fc8266cbad4..c18651775c5 100644 --- a/toolkit/mozapps/extensions/test/mochitest/Makefile.in +++ b/toolkit/mozapps/extensions/test/mochitest/Makefile.in @@ -3,15 +3,5 @@ # License, v. 2.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 = test_bug609794.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/mozapps/extensions/test/xpinstall/Makefile.in b/toolkit/mozapps/extensions/test/xpinstall/Makefile.in index 20742d1fa1a..32affc875df 100644 --- a/toolkit/mozapps/extensions/test/xpinstall/Makefile.in +++ b/toolkit/mozapps/extensions/test/xpinstall/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - # browser_bug672485.js is disabled due to a leak. See bug 682410. MOCHITEST_BROWSER_FILES = head.js \ @@ -94,5 +86,3 @@ MOCHITEST_BROWSER_FILES = head.js \ bug645699.html \ redirect.sjs \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/mozapps/plugins/tests/Makefile.in b/toolkit/mozapps/plugins/tests/Makefile.in index 6d1e34c6415..67692078550 100644 --- a/toolkit/mozapps/plugins/tests/Makefile.in +++ b/toolkit/mozapps/plugins/tests/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -relativesrcdir = @relativesrcdir@ TESTROOT = $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) USE_STATIC_LIBS = 1 diff --git a/toolkit/mozapps/update/common/Makefile.in b/toolkit/mozapps/update/common/Makefile.in index 72384725107..c29c9b596dd 100644 --- a/toolkit/mozapps/update/common/Makefile.in +++ b/toolkit/mozapps/update/common/Makefile.in @@ -2,16 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifeq ($(OS_ARCH),WINNT) USE_STATIC_LIBS = 1 endif - -include $(topsrcdir)/config/rules.mk - diff --git a/toolkit/mozapps/update/test/Makefile.in b/toolkit/mozapps/update/test/Makefile.in index 45d48613935..970123e40fc 100644 --- a/toolkit/mozapps/update/test/Makefile.in +++ b/toolkit/mozapps/update/test/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - TESTROOT = $(call core_abspath,$(DEPTH))/_tests/xpcshell/$(relativesrcdir) DEFINES += \ diff --git a/toolkit/mozapps/update/test/chrome/Makefile.in b/toolkit/mozapps/update/test/chrome/Makefile.in index 6a6bd170e09..5c156d6b9ec 100644 --- a/toolkit/mozapps/update/test/chrome/Makefile.in +++ b/toolkit/mozapps/update/test/chrome/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_CHROME_FILES = \ ../unit/data/simple.mar \ ../unit/data/simple_no_pib.mar \ diff --git a/toolkit/mozapps/update/test_svc/Makefile.in b/toolkit/mozapps/update/test_svc/Makefile.in index 80b32f15d0e..f59ef7f2482 100644 --- a/toolkit/mozapps/update/test_svc/Makefile.in +++ b/toolkit/mozapps/update/test_svc/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - TESTROOT = $(call core_abspath,$(DEPTH))/_tests/xpcshell/$(relativesrcdir) DEFINES += \ diff --git a/toolkit/mozapps/update/updater/Makefile.in b/toolkit/mozapps/update/updater/Makefile.in index f5831b2425c..66ad73c91c2 100644 --- a/toolkit/mozapps/update/updater/Makefile.in +++ b/toolkit/mozapps/update/updater/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # Don't link the updater against libmozglue. See bug 687139 MOZ_GLUE_LDFLAGS = MOZ_GLUE_PROGRAM_LDFLAGS = diff --git a/toolkit/profile/Makefile.in b/toolkit/profile/Makefile.in index 5cc9d516472..17ff60d08d3 100644 --- a/toolkit/profile/Makefile.in +++ b/toolkit/profile/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES = \ -I$(srcdir)/../xre \ -I$(topsrcdir)/profile/dirserviceprovider/src \ diff --git a/toolkit/profile/test/Makefile.in b/toolkit/profile/test/Makefile.in index cfaa2896570..9f77d3ae800 100644 --- a/toolkit/profile/test/Makefile.in +++ b/toolkit/profile/test/Makefile.in @@ -3,17 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_CHROME_FILES = \ test_create_profile.xul \ $(NULL) - - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/system/androidproxy/Makefile.in b/toolkit/system/androidproxy/Makefile.in index ee5f5f18fb7..b18c26d61ee 100644 --- a/toolkit/system/androidproxy/Makefile.in +++ b/toolkit/system/androidproxy/Makefile.in @@ -2,12 +2,4 @@ # License, v. 2.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 diff --git a/toolkit/system/dbus/Makefile.in b/toolkit/system/dbus/Makefile.in index 96b07bdbdd2..f6914e0c0fc 100644 --- a/toolkit/system/dbus/Makefile.in +++ b/toolkit/system/dbus/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - IS_COMPONENT = 1 FORCE_SHARED_LIB = 1 diff --git a/toolkit/system/gnome/Makefile.in b/toolkit/system/gnome/Makefile.in index 70ab32ecfaf..272a9fcd7f9 100644 --- a/toolkit/system/gnome/Makefile.in +++ b/toolkit/system/gnome/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_SHARED_LIB = 1 IS_COMPONENT = 1 EXTRA_DSO_LDOPTS += \ diff --git a/toolkit/system/osxproxy/Makefile.in b/toolkit/system/osxproxy/Makefile.in index ee5f5f18fb7..b18c26d61ee 100644 --- a/toolkit/system/osxproxy/Makefile.in +++ b/toolkit/system/osxproxy/Makefile.in @@ -2,12 +2,4 @@ # License, v. 2.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 diff --git a/toolkit/system/unixproxy/Makefile.in b/toolkit/system/unixproxy/Makefile.in index 9a4052750b4..def5e71005d 100644 --- a/toolkit/system/unixproxy/Makefile.in +++ b/toolkit/system/unixproxy/Makefile.in @@ -2,16 +2,7 @@ # License, v. 2.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 ifdef MOZ_ENABLE_LIBPROXY CXXFLAGS += $(MOZ_LIBPROXY_CFLAGS) endif # MOZ_ENABLE_LIBPROXY - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/system/windowsproxy/Makefile.in b/toolkit/system/windowsproxy/Makefile.in index ee5f5f18fb7..b18c26d61ee 100644 --- a/toolkit/system/windowsproxy/Makefile.in +++ b/toolkit/system/windowsproxy/Makefile.in @@ -2,12 +2,4 @@ # License, v. 2.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 diff --git a/toolkit/themes/osx/mochitests/Makefile.in b/toolkit/themes/osx/mochitests/Makefile.in index 63823e781b8..6de76a8a49a 100644 --- a/toolkit/themes/osx/mochitests/Makefile.in +++ b/toolkit/themes/osx/mochitests/Makefile.in @@ -3,15 +3,5 @@ # License, v. 2.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_bug510426.xul \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in index 5779d430b36..ed032b8bdde 100644 --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in @@ -5,13 +5,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - USE_RCS_MK=1 include $(topsrcdir)/config/makefiles/makeutils.mk diff --git a/toolkit/xre/test/Makefile.in b/toolkit/xre/test/Makefile.in index 2dc0e9ccb7a..6d3be40b8a3 100644 --- a/toolkit/xre/test/Makefile.in +++ b/toolkit/xre/test/Makefile.in @@ -2,17 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_fpuhandler.html \ $(NULL) - - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/xre/test/win/Makefile.in b/toolkit/xre/test/win/Makefile.in index 6339f1ddfd7..22a409962cf 100644 --- a/toolkit/xre/test/win/Makefile.in +++ b/toolkit/xre/test/win/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - OS_LIBS += $(call EXPAND_LIBNAME,comctl32 ws2_32 shell32) LOCAL_INCLUDES += \ diff --git a/tools/jprof/Makefile.in b/tools/jprof/Makefile.in index ea6cb8e2e68..f94a0355f45 100644 --- a/tools/jprof/Makefile.in +++ b/tools/jprof/Makefile.in @@ -4,13 +4,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - OS_LIBS = \ -ldl \ -lbfd \ diff --git a/tools/jprof/stub/Makefile.in b/tools/jprof/stub/Makefile.in index 8d4826f7ef3..f90aac903e9 100644 --- a/tools/jprof/stub/Makefile.in +++ b/tools/jprof/stub/Makefile.in @@ -4,13 +4,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 FORCE_SHARED_LIB = 1 diff --git a/tools/profiler/Makefile.in b/tools/profiler/Makefile.in index 1724fcc89ef..bd36e7cd09f 100644 --- a/tools/profiler/Makefile.in +++ b/tools/profiler/Makefile.in @@ -4,14 +4,7 @@ # License, v. 2.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 - ifdef MOZ_ENABLE_PROFILER_SPS LOCAL_INCLUDES += \ -I$(topsrcdir)/mozglue/linker \ @@ -34,5 +27,3 @@ CMMSRCS += \ endif endif - -include $(topsrcdir)/config/rules.mk diff --git a/tools/trace-malloc/Makefile.in b/tools/trace-malloc/Makefile.in index b0afa473260..646b31c3d86 100644 --- a/tools/trace-malloc/Makefile.in +++ b/tools/trace-malloc/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXTRACSRCS = tmreader.c EXTRACPPSRCS = adreader.cpp @@ -75,4 +68,3 @@ libs:: rules.txt libs:: spacetrace.css $(INSTALL) $< $(DIST)/bin/res - diff --git a/tools/trace-malloc/lib/Makefile.in b/tools/trace-malloc/lib/Makefile.in index e53aa0b639f..954139a3e17 100644 --- a/tools/trace-malloc/lib/Makefile.in +++ b/tools/trace-malloc/lib/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 DEFFILE = $(win_srcdir)/tm.def @@ -24,6 +17,3 @@ DEFINES += -DMOZ_NO_MOZALLOC ifdef WRAP_SYSTEM_INCLUDES DEFINES += -DWRAP_SYSTEM_INCLUDES endif - -include $(topsrcdir)/config/rules.mk - diff --git a/tools/update-packaging/Makefile.in b/tools/update-packaging/Makefile.in index b23bb5e9b12..f58a60ca0cf 100644 --- a/tools/update-packaging/Makefile.in +++ b/tools/update-packaging/Makefile.in @@ -4,13 +4,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - STANDALONE_MAKEFILE := 1 # input location for the build, usually $(DIST) diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in index 7cc2de29ea5..0b6a2b83498 100644 --- a/uriloader/exthandler/Makefile.in +++ b/uriloader/exthandler/Makefile.in @@ -3,12 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifeq ($(MOZ_WIDGET_TOOLKIT),os2) OSDIR = os2 else diff --git a/uriloader/exthandler/tests/Makefile.in b/uriloader/exthandler/tests/Makefile.in index d635e31d621..ae93666a765 100644 --- a/uriloader/exthandler/tests/Makefile.in +++ b/uriloader/exthandler/tests/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - FAIL_ON_WARNINGS = 1 include $(topsrcdir)/config/config.mk diff --git a/uriloader/exthandler/tests/mochitest/Makefile.in b/uriloader/exthandler/tests/mochitest/Makefile.in index 9bea6f6297b..a1c152574b4 100644 --- a/uriloader/exthandler/tests/mochitest/Makefile.in +++ b/uriloader/exthandler/tests/mochitest/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_FILES = \ test_handlerApps.xhtml \ test_unsafeBidiChars.xhtml \ @@ -18,5 +10,3 @@ MOCHITEST_FILES = \ unsafeBidiFileName.sjs \ test_badMimeType.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/uriloader/prefetch/Makefile.in b/uriloader/prefetch/Makefile.in index 289490db49c..0fcef969ed5 100644 --- a/uriloader/prefetch/Makefile.in +++ b/uriloader/prefetch/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES = \ -I$(topsrcdir)/content/base/src \ -I$(topsrcdir)/content/events/src \ diff --git a/view/src/Makefile.in b/view/src/Makefile.in index 1498bab29b7..285d563bea1 100644 --- a/view/src/Makefile.in +++ b/view/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/webapprt/Makefile.in b/webapprt/Makefile.in index 93cf40de104..07fec1621d3 100644 --- a/webapprt/Makefile.in +++ b/webapprt/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # Include config.mk explicitly so we can override FINAL_TARGET. include $(topsrcdir)/config/config.mk diff --git a/webapprt/gtk2/Makefile.in b/webapprt/gtk2/Makefile.in index b74ed3e54a6..c684406a1ee 100644 --- a/webapprt/gtk2/Makefile.in +++ b/webapprt/gtk2/Makefile.in @@ -2,12 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -include $(DEPTH)/config/autoconf.mk - LOCAL_INCLUDES += \ -I$(topsrcdir)/toolkit/xre \ -I$(topsrcdir)/xpcom/base \ diff --git a/webapprt/locales/Makefile.in b/webapprt/locales/Makefile.in index 1975558f3ed..82f614ecea2 100644 --- a/webapprt/locales/Makefile.in +++ b/webapprt/locales/Makefile.in @@ -2,14 +2,4 @@ # License, v. 2.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 diff --git a/webapprt/mac/Makefile.in b/webapprt/mac/Makefile.in index 9f67ef7664f..12dac3750b7 100644 --- a/webapprt/mac/Makefile.in +++ b/webapprt/mac/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # This switches $(INSTALL) to copy mode, like $(SYSINSTALL), so things that # shouldn't get 755 perms need $(IFLAGS1) for either way of calling nsinstall. NSDISTMODE = copy diff --git a/webapprt/test/chrome/Makefile.in b/webapprt/test/chrome/Makefile.in index f12d205effe..a8d84d9b48d 100644 --- a/webapprt/test/chrome/Makefile.in +++ b/webapprt/test/chrome/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_WEBAPPRT_CHROME_FILES = \ head.js \ browser_sample.js \ @@ -37,5 +29,3 @@ MOCHITEST_WEBAPPRT_CHROME_FILES = \ geolocation-prompt-perm.html \ geolocation-prompt-noperm.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/webapprt/test/content/Makefile.in b/webapprt/test/content/Makefile.in index 2ea38598bfd..8dea9fddd3f 100644 --- a/webapprt/test/content/Makefile.in +++ b/webapprt/test/content/Makefile.in @@ -2,19 +2,9 @@ # License, v. 2.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 = \ test.webapp \ test.webapp^headers^ \ webapprt_sample.html \ webapprt_indexeddb.html \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/webapprt/win/Makefile.in b/webapprt/win/Makefile.in index c218d5ff1af..d86b5f110b4 100644 --- a/webapprt/win/Makefile.in +++ b/webapprt/win/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # Statically link against the CRT USE_STATIC_LIBS = 1 # Don't create a dependency on mozglue, which is impossible (difficult?) diff --git a/widget/android/Makefile.in b/widget/android/Makefile.in index 985f4e9f375..273504f8a1b 100644 --- a/widget/android/Makefile.in +++ b/widget/android/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a diff --git a/widget/cocoa/Makefile.in b/widget/cocoa/Makefile.in index 1a09dc51c93..70b71a1bb2c 100644 --- a/widget/cocoa/Makefile.in +++ b/widget/cocoa/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 CMMSRCS = \ nsBidiKeyboard.mm \ diff --git a/widget/gonk/Makefile.in b/widget/gonk/Makefile.in index a838823ee2b..eac18d69fca 100644 --- a/widget/gonk/Makefile.in +++ b/widget/gonk/Makefile.in @@ -12,16 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ VPATH = \ $(srcdir) \ $(srcdir)/libui \ $(NULL) -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a diff --git a/widget/gonk/libdisplay/Makefile.in b/widget/gonk/libdisplay/Makefile.in index 10bba6484ac..570f9340ac2 100644 --- a/widget/gonk/libdisplay/Makefile.in +++ b/widget/gonk/libdisplay/Makefile.in @@ -12,15 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ VPATH = \ $(srcdir) \ $(NULL) -include $(DEPTH)/config/autoconf.mk - FORCE_STATIC_LIB= 1 STL_FLAGS= diff --git a/widget/gonk/nativewindow/Makefile.in b/widget/gonk/nativewindow/Makefile.in index 0f9cd248cac..c30944d90ee 100644 --- a/widget/gonk/nativewindow/Makefile.in +++ b/widget/gonk/nativewindow/Makefile.in @@ -11,13 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - STL_FLAGS= include $(topsrcdir)/config/rules.mk diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in index 04b711a9445..1187627ca81 100644 --- a/widget/gtk2/Makefile.in +++ b/widget/gtk2/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 NATIVE_THEME_SUPPORT = 1 diff --git a/widget/gtkxtbin/Makefile.in b/widget/gtkxtbin/Makefile.in index c84d0971d73..d9143cd128c 100644 --- a/widget/gtkxtbin/Makefile.in +++ b/widget/gtkxtbin/Makefile.in @@ -4,13 +4,6 @@ # 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 ifdef MOZ_ENABLE_GTK2 CSRCS = \ @@ -29,4 +22,3 @@ DEFINES += -D_IMPL_GTKXTBIN_API INCLUDES += \ -I$(srcdir) \ $(NULL) - diff --git a/widget/os2/Makefile.in b/widget/os2/Makefile.in index d641a02cea6..0b4704b3b18 100644 --- a/widget/os2/Makefile.in +++ b/widget/os2/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 RESFILE = widget.res SHARED_LIBRARY_LIBS = \ @@ -40,5 +33,3 @@ export-preqs = \ export:: $(export-preqs) test -f ./res/aliasb.ptr || cp $(srcdir)/res/*.* ./res - - diff --git a/widget/qt/Makefile.in b/widget/qt/Makefile.in index d3500c13280..4160cbd3b8f 100644 --- a/widget/qt/Makefile.in +++ b/widget/qt/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a diff --git a/widget/qt/faststartupqt/Makefile.in b/widget/qt/faststartupqt/Makefile.in index 14b721cf48e..d643c6db486 100644 --- a/widget/qt/faststartupqt/Makefile.in +++ b/widget/qt/faststartupqt/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - DIST_INSTALL = 1 FORCE_STATIC_LIB = 1 STL_FLAGS= @@ -40,6 +33,3 @@ LOCAL_INCLUDES += \ $(NULL) DEFINES += -DLIBRARY_FILENAME="$(SHARED_LIBRARY)" -DMOZ_NO_MOZALLOC -DXPCOM_GLUE - -include $(topsrcdir)/config/rules.mk - diff --git a/widget/shared/Makefile.in b/widget/shared/Makefile.in index 29ef2d582c9..6468a43b2c7 100644 --- a/widget/shared/Makefile.in +++ b/widget/shared/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/widget/shared/x11/Makefile.in b/widget/shared/x11/Makefile.in index f0ed88151eb..5fc38aec4a6 100644 --- a/widget/shared/x11/Makefile.in +++ b/widget/shared/x11/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk CXXFLAGS += $(TK_CFLAGS) diff --git a/widget/tests/Makefile.in b/widget/tests/Makefile.in index 815643f032d..73d877dbdae 100644 --- a/widget/tests/Makefile.in +++ b/widget/tests/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ -include $(DEPTH)/config/autoconf.mk - ifeq ($(MOZ_WIDGET_TOOLKIT),windows) ifdef NS_ENABLE_TSF @@ -102,5 +95,3 @@ MOCHITEST_FILES += plugin_scroll_invalidation.html \ test_plugin_scroll_invalidation.html \ $(NULL) endif - -include $(topsrcdir)/config/rules.mk diff --git a/widget/windows/Makefile.in b/widget/windows/Makefile.in index 49a76fbb6f0..b1429538f6b 100644 --- a/widget/windows/Makefile.in +++ b/widget/windows/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 RESFILE = widget.res DEFINES += -DMOZ_UNICODE diff --git a/widget/windows/winrt/Makefile.in b/widget/windows/winrt/Makefile.in index ba8a581b009..69398b74c98 100644 --- a/widget/windows/winrt/Makefile.in +++ b/widget/windows/winrt/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 DEFINES += -DMOZ_UNICODE diff --git a/widget/xpwidgets/Makefile.in b/widget/xpwidgets/Makefile.in index 095d1426259..f4c2db81f4d 100644 --- a/widget/xpwidgets/Makefile.in +++ b/widget/xpwidgets/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - SHARED_LIBRARY_LIBS = ../shared/$(LIB_PREFIX)widget_shared.$(LIB_SUFFIX) ifdef MOZ_X11 SHARED_LIBRARY_LIBS += ../shared/x11/$(LIB_PREFIX)widget_shared_x11.$(LIB_SUFFIX) diff --git a/widget/xremoteclient/Makefile.in b/widget/xremoteclient/Makefile.in index 1187f760f36..88dc128e5ca 100644 --- a/widget/xremoteclient/Makefile.in +++ b/widget/xremoteclient/Makefile.in @@ -7,13 +7,6 @@ # the application binaries. The fact that it's under mozilla/widget is a fluke # of tree history. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - FORCE_STATIC_LIB = 1 DEFINES += -DXPCOM_GLUE @@ -37,5 +30,3 @@ PROGOBJS = $(PROGCPPSRCS:.cpp=.$(OBJ_SUFFIX)) LIBS = \ $(NSPR_LIBS) \ $(XLDFLAGS) $(XLIBS) - -include $(topsrcdir)/config/rules.mk diff --git a/xpcom/Makefile.in b/xpcom/Makefile.in index e7f6c35a192..b8515521fab 100644 --- a/xpcom/Makefile.in +++ b/xpcom/Makefile.in @@ -2,14 +2,7 @@ # License, v. 2.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@ - INSTALL_TARGETS += xpcom xpcom_FILES := xpcom-config.h xpcom_DEST = $(DIST)/include xpcom_TARGET := export - -include $(topsrcdir)/config/rules.mk diff --git a/xpcom/analysis/Makefile.in b/xpcom/analysis/Makefile.in index 96d99f9afb9..9ab1af624cb 100644 --- a/xpcom/analysis/Makefile.in +++ b/xpcom/analysis/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - MOZILLA_INTERNAL_API = 1 include $(topsrcdir)/config/rules.mk diff --git a/xpcom/base/Makefile.in b/xpcom/base/Makefile.in index 5e34139d291..fa3c709be76 100644 --- a/xpcom/base/Makefile.in +++ b/xpcom/base/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - MOZILLA_INTERNAL_API =1 ifeq ($(OS_ARCH),WINNT) diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in index 651f2404207..f50e0902be4 100644 --- a/xpcom/build/Makefile.in +++ b/xpcom/build/Makefile.in @@ -4,12 +4,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk include $(srcdir)/../glue/objs.mk EXTRA_DEPS += $(srcdir)/../glue/objs.mk diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in index e23d2477737..9b48ca2adc5 100644 --- a/xpcom/components/Makefile.in +++ b/xpcom/components/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - MOZILLA_INTERNAL_API = 1 LOCAL_INCLUDES = \ diff --git a/xpcom/ds/Makefile.in b/xpcom/ds/Makefile.in index 7408bb7dc79..992f4970bc1 100644 --- a/xpcom/ds/Makefile.in +++ b/xpcom/ds/Makefile.in @@ -3,16 +3,8 @@ # License, v. 2.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 - MOZILLA_INTERNAL_API = 1 include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += -I$(srcdir)/../io - diff --git a/xpcom/glue/Makefile.in b/xpcom/glue/Makefile.in index 550adeb7067..015980a630a 100644 --- a/xpcom/glue/Makefile.in +++ b/xpcom/glue/Makefile.in @@ -3,12 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk include $(srcdir)/objs.mk EXTRA_DEPS += $(srcdir)/objs.mk diff --git a/xpcom/glue/nomozalloc/Makefile.in b/xpcom/glue/nomozalloc/Makefile.in index e2caa73a566..e149c28c1ba 100644 --- a/xpcom/glue/nomozalloc/Makefile.in +++ b/xpcom/glue/nomozalloc/Makefile.in @@ -3,12 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk include $(srcdir)/../objs.mk EXTRA_DEPS += $(srcdir)/../objs.mk diff --git a/xpcom/glue/standalone/Makefile.in b/xpcom/glue/standalone/Makefile.in index d3cacfd1309..514f028b7f7 100644 --- a/xpcom/glue/standalone/Makefile.in +++ b/xpcom/glue/standalone/Makefile.in @@ -3,12 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk include $(srcdir)/../objs.mk EXTRA_DEPS += $(srcdir)/../objs.mk @@ -49,4 +43,3 @@ DEFINES += -DXPCOM_GLUE ifdef TARGET_XPCOM_ABI DEFINES += -DTARGET_XPCOM_ABI=\"$(TARGET_XPCOM_ABI)\" endif - diff --git a/xpcom/glue/standalone/staticruntime/Makefile.in b/xpcom/glue/standalone/staticruntime/Makefile.in index 3c1df788b9f..75ed9667be5 100644 --- a/xpcom/glue/standalone/staticruntime/Makefile.in +++ b/xpcom/glue/standalone/staticruntime/Makefile.in @@ -2,12 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk include $(srcdir)/../../objs.mk EXTRA_DEPS += $(srcdir)/../../objs.mk @@ -52,4 +46,3 @@ DEFINES += -DXPCOM_GLUE ifdef TARGET_XPCOM_ABI DEFINES += -DTARGET_XPCOM_ABI=\"$(TARGET_XPCOM_ABI)\" endif - diff --git a/xpcom/glue/staticruntime/Makefile.in b/xpcom/glue/staticruntime/Makefile.in index 911f7ab92b9..80bab0cb3d3 100644 --- a/xpcom/glue/staticruntime/Makefile.in +++ b/xpcom/glue/staticruntime/Makefile.in @@ -3,12 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk include $(srcdir)/../objs.mk EXTRA_DEPS += $(srcdir)/../objs.mk @@ -48,4 +42,3 @@ export:: $(XPCOM_GLUE_SRC_CPPSRCS) $(XPCOM_GLUENS_SRC_CPPSRCS) $(topsrcdir)/xpco ifdef TARGET_XPCOM_ABI DEFINES += -DTARGET_XPCOM_ABI=\"$(TARGET_XPCOM_ABI)\" endif - diff --git a/xpcom/glue/tests/gtest/Makefile.in b/xpcom/glue/tests/gtest/Makefile.in index ea55dfe0b13..3379ad33696 100644 --- a/xpcom/glue/tests/gtest/Makefile.in +++ b/xpcom/glue/tests/gtest/Makefile.in @@ -3,14 +3,5 @@ # License, v. 2.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 LOCAL_INCLUDES = -I$(srcdir)/../.. - -include $(topsrcdir)/config/rules.mk diff --git a/xpcom/idl-parser/Makefile.in b/xpcom/idl-parser/Makefile.in index 7c48ead0f8b..a7802139b5e 100644 --- a/xpcom/idl-parser/Makefile.in +++ b/xpcom/idl-parser/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - PARSER_SRCS = \ header.py \ typelib.py \ diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in index 0f3faf73d15..d3630ef15bb 100644 --- a/xpcom/io/Makefile.in +++ b/xpcom/io/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - MOZILLA_INTERNAL_API = 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk @@ -20,4 +13,3 @@ endif endif LOCAL_INCLUDES += -I.. - diff --git a/xpcom/reflect/xptcall/src/Makefile.in b/xpcom/reflect/xptcall/src/Makefile.in index bdef57704cf..c2a1da78b5f 100644 --- a/xpcom/reflect/xptcall/src/Makefile.in +++ b/xpcom/reflect/xptcall/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - MOZILLA_INTERNAL_API = 1 # we don't want the shared lib, but we want to force the creation of a static lib. diff --git a/xpcom/reflect/xptcall/src/md/os2/Makefile.in b/xpcom/reflect/xptcall/src/md/os2/Makefile.in index 7552f11e5a7..7ed8c1dfb9b 100644 --- a/xpcom/reflect/xptcall/src/md/os2/Makefile.in +++ b/xpcom/reflect/xptcall/src/md/os2/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = ../.. MOZILLA_INTERNAL_API = 1 diff --git a/xpcom/reflect/xptcall/src/md/unix/Makefile.in b/xpcom/reflect/xptcall/src/md/unix/Makefile.in index 430748165a3..8f25236e110 100644 --- a/xpcom/reflect/xptcall/src/md/unix/Makefile.in +++ b/xpcom/reflect/xptcall/src/md/unix/Makefile.in @@ -3,14 +3,8 @@ # License, v. 2.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@ NO_PROFILE_GUIDED_OPTIMIZE = 1 -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = ../.. MOZILLA_INTERNAL_API = 1 diff --git a/xpcom/reflect/xptcall/src/md/win32/Makefile.in b/xpcom/reflect/xptcall/src/md/win32/Makefile.in index b4049f1b81e..a355fe36eef 100644 --- a/xpcom/reflect/xptcall/src/md/win32/Makefile.in +++ b/xpcom/reflect/xptcall/src/md/win32/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = ../.. MOZILLA_INTERNAL_API = 1 diff --git a/xpcom/reflect/xptcall/tests/Makefile.in b/xpcom/reflect/xptcall/tests/Makefile.in index 959acbabf2d..1860e72f6f6 100644 --- a/xpcom/reflect/xptcall/tests/Makefile.in +++ b/xpcom/reflect/xptcall/tests/Makefile.in @@ -3,16 +3,7 @@ # License, v. 2.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 = \ $(XPCOM_GLUE_LDOPTS) \ $(NSPR_LIBS) \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/xpcom/reflect/xptinfo/public/Makefile.in b/xpcom/reflect/xptinfo/public/Makefile.in index 9b02060ae96..c14c389e2be 100644 --- a/xpcom/reflect/xptinfo/public/Makefile.in +++ b/xpcom/reflect/xptinfo/public/Makefile.in @@ -3,15 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - - include $(topsrcdir)/config/rules.mk CFLAGS += -DEXPORT_XPCI_API - diff --git a/xpcom/reflect/xptinfo/src/Makefile.in b/xpcom/reflect/xptinfo/src/Makefile.in index 11aaffa7c0d..e8221baf221 100644 --- a/xpcom/reflect/xptinfo/src/Makefile.in +++ b/xpcom/reflect/xptinfo/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - MOZILLA_INTERNAL_API = 1 # we don't want the shared lib, but we want to force the creation of a static lib. diff --git a/xpcom/reflect/xptinfo/tests/Makefile.in b/xpcom/reflect/xptinfo/tests/Makefile.in index 959acbabf2d..1860e72f6f6 100644 --- a/xpcom/reflect/xptinfo/tests/Makefile.in +++ b/xpcom/reflect/xptinfo/tests/Makefile.in @@ -3,16 +3,7 @@ # License, v. 2.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 = \ $(XPCOM_GLUE_LDOPTS) \ $(NSPR_LIBS) \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/xpcom/sample/Makefile.in b/xpcom/sample/Makefile.in index 7a64ee1639c..efa358e1d3a 100644 --- a/xpcom/sample/Makefile.in +++ b/xpcom/sample/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # On OS/2, SHORT_LIBNAME is used to generate a library with an 8.3 filename, # e.g. dist/bin/components/xpcomsmp.dll SHORT_LIBNAME = xpcomsmp diff --git a/xpcom/sample/program/Makefile.in b/xpcom/sample/program/Makefile.in index 395a73547f5..cf243e6f0d2 100644 --- a/xpcom/sample/program/Makefile.in +++ b/xpcom/sample/program/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # LIBS specifies linker flags when building an executable program from # this Makefile. We link against the "standalone glue" which does not require # that the application be linked against the XPCOM dynamic library or the NSPR @@ -28,5 +21,3 @@ endif # Whatever code is going to be linked with the *standalone* glue must be # built with the XPCOM_GLUE define set. DEFINES += -DXPCOM_GLUE - -include $(topsrcdir)/config/rules.mk diff --git a/xpcom/string/src/Makefile.in b/xpcom/string/src/Makefile.in index 74695176e0e..565397948ba 100644 --- a/xpcom/string/src/Makefile.in +++ b/xpcom/string/src/Makefile.in @@ -4,13 +4,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - MOZILLA_INTERNAL_API = 1 # we don't want the shared lib, but we want to force the creation of a diff --git a/xpcom/tests/Makefile.in b/xpcom/tests/Makefile.in index d1e23c724b5..78802096764 100644 --- a/xpcom/tests/Makefile.in +++ b/xpcom/tests/Makefile.in @@ -2,14 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - FAIL_ON_WARNINGS = 1 VPATH += $(topsrcdir)/build diff --git a/xpcom/tests/bug656331_component/Makefile.in b/xpcom/tests/bug656331_component/Makefile.in index f475a794498..b43d665c091 100644 --- a/xpcom/tests/bug656331_component/Makefile.in +++ b/xpcom/tests/bug656331_component/Makefile.in @@ -5,13 +5,6 @@ # Blatantly copied from xpcom/tests/component. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - IS_COMPONENT = 1 FORCE_SHARED_LIB = 1 diff --git a/xpcom/tests/component/Makefile.in b/xpcom/tests/component/Makefile.in index e2f9b65b199..3a3a468f039 100644 --- a/xpcom/tests/component/Makefile.in +++ b/xpcom/tests/component/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - IS_COMPONENT = 1 FORCE_SHARED_LIB = 1 diff --git a/xpcom/tests/component_no_aslr/Makefile.in b/xpcom/tests/component_no_aslr/Makefile.in index 62f10a40b47..b946ce208be 100644 --- a/xpcom/tests/component_no_aslr/Makefile.in +++ b/xpcom/tests/component_no_aslr/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - IS_COMPONENT = 1 FORCE_SHARED_LIB = 1 diff --git a/xpcom/tests/external/Makefile.in b/xpcom/tests/external/Makefile.in index 9932618a6a5..5002019438c 100644 --- a/xpcom/tests/external/Makefile.in +++ b/xpcom/tests/external/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk LIBS += \ diff --git a/xpcom/tests/static-checker/Makefile.in b/xpcom/tests/static-checker/Makefile.in index cfacd6e7013..35d2422bb2a 100644 --- a/xpcom/tests/static-checker/Makefile.in +++ b/xpcom/tests/static-checker/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - OUTPARAMS_WARNING_TESTCASES = \ e1.cpp \ e4.cpp \ diff --git a/xpcom/tests/windows/Makefile.in b/xpcom/tests/windows/Makefile.in index ebac9f2c467..e03fbaedaad 100644 --- a/xpcom/tests/windows/Makefile.in +++ b/xpcom/tests/windows/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk OS_LIBS += $(call EXPAND_LIBNAME,rpcrt4 uuid) diff --git a/xpcom/threads/Makefile.in b/xpcom/threads/Makefile.in index e41bcf67fbb..cfb6a17d9f9 100644 --- a/xpcom/threads/Makefile.in +++ b/xpcom/threads/Makefile.in @@ -3,17 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - MOZILLA_INTERNAL_API = 1 LOCAL_INCLUDES = -I$(srcdir)/../components LOCAL_INCLUDES = -I$(srcdir)/../build - - -include $(topsrcdir)/config/rules.mk - diff --git a/xpcom/typelib/xpt/src/Makefile.in b/xpcom/typelib/xpt/src/Makefile.in index 9a6bf832281..bcf39d7dea9 100644 --- a/xpcom/typelib/xpt/src/Makefile.in +++ b/xpcom/typelib/xpt/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - DIST_INSTALL = 1 USE_STATIC_LIBS = 1 diff --git a/xpcom/typelib/xpt/tests/Makefile.in b/xpcom/typelib/xpt/tests/Makefile.in index 9874693d44d..4623aa5c8aa 100644 --- a/xpcom/typelib/xpt/tests/Makefile.in +++ b/xpcom/typelib/xpt/tests/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - LIBS = \ $(DIST)/lib/$(LIB_PREFIX)xpt.$(LIB_SUFFIX) \ $(NULL) diff --git a/xpcom/typelib/xpt/tools/Makefile.in b/xpcom/typelib/xpt/tools/Makefile.in index 2427d783959..2a99f7df436 100644 --- a/xpcom/typelib/xpt/tools/Makefile.in +++ b/xpcom/typelib/xpt/tools/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - INTERNAL_TOOLS = 1 SDK_BINARY = \ diff --git a/xpcom/windbgdlg/Makefile.in b/xpcom/windbgdlg/Makefile.in index 4066a8610a2..254509ee779 100644 --- a/xpcom/windbgdlg/Makefile.in +++ b/xpcom/windbgdlg/Makefile.in @@ -3,13 +3,4 @@ # License, v. 2.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 - MOZ_WINCONSOLE = 0 -include $(topsrcdir)/config/rules.mk - diff --git a/xpfe/appshell/src/Makefile.in b/xpfe/appshell/src/Makefile.in index 19fa4d68cab..5ca9cde3020 100644 --- a/xpfe/appshell/src/Makefile.in +++ b/xpfe/appshell/src/Makefile.in @@ -3,15 +3,5 @@ # License, v. 2.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 LOCAL_INCLUDES += -I$(topsrcdir)/dom/base - -include $(topsrcdir)/config/rules.mk - diff --git a/xpfe/appshell/src/test/Makefile.in b/xpfe/appshell/src/test/Makefile.in index d05d2d87a26..a994a4564b6 100644 --- a/xpfe/appshell/src/test/Makefile.in +++ b/xpfe/appshell/src/test/Makefile.in @@ -2,16 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH := @DEPTH@ -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -relativesrcdir := @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - MOCHITEST_CHROME_FILES := \ test_hiddenPrivateWindow.xul \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/xpfe/components/build/Makefile.in b/xpfe/components/build/Makefile.in index c11be5e52d4..6750adb3c25 100644 --- a/xpfe/components/build/Makefile.in +++ b/xpfe/components/build/Makefile.in @@ -3,15 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - EXPORT_LIBRARY = 1 SHARED_LIBRARY_LIBS += ../directory/$(LIB_PREFIX)directory_s.$(LIB_SUFFIX) LOCAL_INCLUDES += -I$(srcdir)/../directory - -include $(topsrcdir)/config/rules.mk diff --git a/xpfe/components/windowds/Makefile.in b/xpfe/components/windowds/Makefile.in index 6cb0ce06bfe..398c4043a54 100644 --- a/xpfe/components/windowds/Makefile.in +++ b/xpfe/components/windowds/Makefile.in @@ -3,14 +3,4 @@ # License, v. 2.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 diff --git a/xulrunner/app/Makefile.in b/xulrunner/app/Makefile.in index 44acc2d50fd..f32c74c8430 100644 --- a/xulrunner/app/Makefile.in +++ b/xulrunner/app/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - PREF_JS_EXPORTS = $(srcdir)/xulrunner.js GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/,xulrunner.js) diff --git a/xulrunner/app/profile/Makefile.in b/xulrunner/app/profile/Makefile.in index df4a64c1e39..adc738d3495 100644 --- a/xulrunner/app/profile/Makefile.in +++ b/xulrunner/app/profile/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk FILES := \ diff --git a/xulrunner/app/profile/chrome/Makefile.in b/xulrunner/app/profile/chrome/Makefile.in index 2b98c93898e..bda2018d793 100644 --- a/xulrunner/app/profile/chrome/Makefile.in +++ b/xulrunner/app/profile/chrome/Makefile.in @@ -3,12 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk FILES := \ @@ -25,4 +19,3 @@ libs:: install:: $(SYSINSTALL) $(IFLAGS1) $(FILES) $(DESTDIR)$(mozappdir)/defaults/profile/chrome $(NSINSTALL) -t $(IFLAGS1) $(FILES) $(DESTDIR)$(mozappdir)/defaults/profile/US/chrome - diff --git a/xulrunner/examples/simple/Makefile.in b/xulrunner/examples/simple/Makefile.in index 3e6086323fb..bc19e8b7a34 100644 --- a/xulrunner/examples/simple/Makefile.in +++ b/xulrunner/examples/simple/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - XPI_NAME = simple PREF_JS_EXPORTS = $(srcdir)/simple-prefs.js diff --git a/xulrunner/examples/simple/components/public/Makefile.in b/xulrunner/examples/simple/components/public/Makefile.in index 6562abbce05..92cb56b028e 100644 --- a/xulrunner/examples/simple/components/public/Makefile.in +++ b/xulrunner/examples/simple/components/public/Makefile.in @@ -3,13 +3,4 @@ # License, v. 2.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 - XPI_NAME = simple - -include $(topsrcdir)/config/rules.mk diff --git a/xulrunner/examples/simple/components/src/Makefile.in b/xulrunner/examples/simple/components/src/Makefile.in index 6fcebb0efa1..12fa0b722bb 100644 --- a/xulrunner/examples/simple/components/src/Makefile.in +++ b/xulrunner/examples/simple/components/src/Makefile.in @@ -3,13 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - XPI_NAME = simple SHORT_LIBNAME = simpltst IS_COMPONENT = 1 @@ -18,5 +11,3 @@ EXTRA_DSO_LDOPTS = \ $(XPCOM_GLUE_LDOPTS) \ $(NSPR_LIBS) \ $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/xulrunner/installer/Makefile.in b/xulrunner/installer/Makefile.in index 81b3ef11172..645846516c8 100644 --- a/xulrunner/installer/Makefile.in +++ b/xulrunner/installer/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - STANDALONE_MAKEFILE := 1 NO_PKG_FILES = \ diff --git a/xulrunner/installer/windows/Makefile.in b/xulrunner/installer/windows/Makefile.in index cc538559c4a..4ababec2efa 100644 --- a/xulrunner/installer/windows/Makefile.in +++ b/xulrunner/installer/windows/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - CONFIG_DIR=$(call core_abspath,$(srcdir)) OBJ_DIR=$(call core_abspath,$(DEPTH)) SRC_DIR=$(call core_abspath,$(topsrcdir)) diff --git a/xulrunner/setup/Makefile.in b/xulrunner/setup/Makefile.in index 3466fec6806..e36fc237f80 100644 --- a/xulrunner/setup/Makefile.in +++ b/xulrunner/setup/Makefile.in @@ -2,13 +2,4 @@ # License, v. 2.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 = -DBIN_SUFFIX=$(BIN_SUFFIX) - -include $(topsrcdir)/config/rules.mk diff --git a/xulrunner/stub/Makefile.in b/xulrunner/stub/Makefile.in index 512d81f001f..356c27c06c1 100644 --- a/xulrunner/stub/Makefile.in +++ b/xulrunner/stub/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - # Statically link against the RTL on windows USE_STATIC_LIBS = 1 # Don't create a dependency on mozglue diff --git a/xulrunner/tools/redit/Makefile.in b/xulrunner/tools/redit/Makefile.in index e4829273248..f831e13b38a 100644 --- a/xulrunner/tools/redit/Makefile.in +++ b/xulrunner/tools/redit/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. */ -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - ifeq ($(OS_ARCH),WINNT) SDK_BINARY = \ @@ -30,5 +23,3 @@ WIN32_EXE_LDFLAGS = -municode endif endif - -include $(topsrcdir)/config/rules.mk