--- a/accessible/src/windows/ia2/Makefile.in
+++ b/accessible/src/windows/ia2/Makefile.in
@@ -12,17 +12,16 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = accessibility_toolkit_ia2_s
EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1
# The midl generated code include Windows headers which defines min and max
# macros which conflicts with std::min/max. Suppress the macros:
OS_CXXFLAGS += -DNOMINMAX
-include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES += \
-I$(srcdir) \
-I$(srcdir)/../msaa \
-I$(srcdir)/../../base \
-I$(srcdir)/../../generic \
-I$(srcdir)/../../html \
--- a/accessible/src/windows/sdn/Makefile.in
+++ b/accessible/src/windows/sdn/Makefile.in
@@ -11,17 +11,16 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = accessibility_toolkit_sdn_s
EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1
# The midl generated code include Windows headers which defines min and max
# macros which conflicts with std::min/max. Suppress the macros:
OS_CXXFLAGS += -DNOMINMAX
-include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES += \
-I$(srcdir) \
-I$(srcdir)/../msaa \
-I$(srcdir)/../../base \
-I$(srcdir)/../../generic \
-I$(srcdir)/../../html \
--- a/accessible/src/windows/uia/Makefile.in
+++ b/accessible/src/windows/uia/Makefile.in
@@ -11,17 +11,16 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = accessibility_toolkit_uia_s
EXPORT_LIBRARY = ..
LIBXUL_LIBRARY = 1
# The midl generated code include Windows headers which defines min and max
# macros which conflicts with std::min/max. Suppress the macros:
OS_CXXFLAGS += -DNOMINMAX
-include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES += \
-I$(srcdir) \
-I$(srcdir)/../msaa \
-I$(srcdir)/../../base \
-I$(srcdir)/../../generic \
-I$(srcdir)/../../html \
--- a/browser/Makefile.in
+++ b/browser/Makefile.in
@@ -2,18 +2,16 @@
# License, v. 2.0. If a copy of the MPL was not distributed 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
-
include $(topsrcdir)/config/rules.mk
ifdef MAKENSISU
# For Windows build the uninstaller during the application build since the
# uninstaller is included with the application for mar file generation.
libs::
$(MAKE) -C installer/windows uninstaller
--- a/browser/devtools/Makefile.in
+++ b/browser/devtools/Makefile.in
@@ -2,14 +2,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@
-include $(topsrcdir)/config/config.mk
-
include $(topsrcdir)/config/rules.mk
libs::
$(NSINSTALL) $(srcdir)/main.js $(FINAL_TARGET)/modules/devtools
--- a/browser/metro/Makefile.in
+++ b/browser/metro/Makefile.in
@@ -3,17 +3,16 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
#########################################
# application.ini
ifdef MOZILLA_OFFICIAL
DEFINES += -DMOZILLA_OFFICIAL
--- a/browser/metro/modules/Makefile.in
+++ b/browser/metro/modules/Makefile.in
@@ -3,10 +3,9 @@
# file, You 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
include $(topsrcdir)/config/rules.mk
--- a/config/tests/makefiles/autodeps/Makefile.in
+++ b/config/tests/makefiles/autodeps/Makefile.in
@@ -13,17 +13,16 @@ PYTEST = $(PYTHON) -E
export PYTHONDONTWRITEBYTECODE=1
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
autotgt_tests = .deps/autotargets.mk.ts
tgts =\
.deps/.mkdir.done\
$(autotgt_tests)
$(NULL)
--- a/content/xbl/src/Makefile.in
+++ b/content/xbl/src/Makefile.in
@@ -10,18 +10,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = gkconxbl_s
MSVC_ENABLE_PGO := 1
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1
-include $(topsrcdir)/config/config.mk
-
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES = \
-I$(srcdir)/../../base/src \
-I$(srcdir)/../../html/document/src \
-I$(srcdir)/../../xml/document/src \
-I$(srcdir)/../../xul/content/src \
-I$(srcdir)/../../xul/document/src \
--- a/dom/activities/src/Makefile.in
+++ b/dom/activities/src/Makefile.in
@@ -10,11 +10,9 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = dom_activities_s
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS := 1
include $(topsrcdir)/dom/dom-config.mk
-
-include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
--- a/dom/audiochannel/tests/Makefile.in
+++ b/dom/audiochannel/tests/Makefile.in
@@ -11,11 +11,10 @@ relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
FAIL_ON_WARNINGS = 1
CPP_UNIT_TESTS = \
TestAudioChannelService.cpp \
$(NULL)
-include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
--- a/dom/encoding/Makefile.in
+++ b/dom/encoding/Makefile.in
@@ -13,17 +13,16 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = domencoding_s
LIBXUL_LIBRARY = 1
LOCAL_INCLUDES = \
-I$(topsrcdir)/intl/locale/src \
$(NULL)
include $(topsrcdir)/dom/dom-config.mk
-include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
EncodingUtils.$(OBJ_SUFFIX): labelsencodings.properties.h
PROPS2ARRAYS = $(topsrcdir)/intl/locale/src/props2arrays.py
labelsencodings.properties.h: $(PROPS2ARRAYS) labelsencodings.properties
$(PYTHON) $^ $@
--- a/dom/payment/Makefile.in
+++ b/dom/payment/Makefile.in
@@ -11,10 +11,9 @@ include $(DEPTH)/config/autoconf.mk
EXTRA_COMPONENTS = \
Payment.js \
PaymentFlowInfo.js \
PaymentRequestInfo.js \
Payment.manifest \
$(NULL)
-include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
--- a/dom/promise/Makefile.in
+++ b/dom/promise/Makefile.in
@@ -8,10 +8,9 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = dompromise_s
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS := 1
-include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
--- a/dom/system/windows/Makefile.in
+++ b/dom/system/windows/Makefile.in
@@ -13,11 +13,9 @@ LIBRARY_NAME = domsystemwindows_s
LIBXUL_LIBRARY = 1
EXPORT_LIBRARY = 1
FAIL_ON_WARNINGS := 1
# We fire the nsDOMDeviceAcceleration
LOCAL_INCLUDES += -I$(topsrcdir)/content/events/src
-include $(topsrcdir)/config/config.mk
-
include $(topsrcdir)/config/rules.mk
--- a/dom/wappush/src/Makefile.in
+++ b/dom/wappush/src/Makefile.in
@@ -11,10 +11,9 @@ VPATH = \
include $(DEPTH)/config/autoconf.mk
ifdef MOZ_B2G_RIL
EXTRA_COMPONENTS = \
$(NULL)
endif
-include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
--- a/embedding/tests/winEmbed/Makefile.in
+++ b/embedding/tests/winEmbed/Makefile.in
@@ -45,18 +45,16 @@ LIBS = \
LOCAL_INCLUDES = -I$(srcdir)
DEFINES += -DXPCOM_GLUE
STL_FLAGS=
OS_LIBS += $(call EXPAND_LIBNAME,ole32 comdlg32 shell32 version)
-include $(topsrcdir)/config/config.mk
-
include $(topsrcdir)/config/rules.mk
#
# Control the default heap size.
# This is the heap returned by GetProcessHeap().
# As we use the CRT heap, the default size is too large and wastes VM.
#
# The default heap size is 1MB on Win32.
--- a/gfx/cairo/libpixman/src/Makefile.in
+++ b/gfx/cairo/libpixman/src/Makefile.in
@@ -145,18 +145,16 @@ CSRCS += pixman-arm-neon.c
DISABLED_SSRCS += pixman-arm-neon-asm.S
DISABLED_SSRCS += pixman-arm-neon-asm-bilinear.S
DEFINES += -DUSE_ARM_NEON
ARM_NEON_CFLAGS = -mfpu=neon
endif
LOCAL_INCLUDES += -I$(srcdir) -I$(srcdir)/../../cairo/src
-include $(topsrcdir)/config/config.mk
-
include $(topsrcdir)/config/rules.mk
CFLAGS += -DPACKAGE="mozpixman" -D_USE_MATH_DEFINES
# Disable spammy "missing initializer" GCC warning
ifdef GNU_CC
CFLAGS += -Wno-missing-field-initializers
endif # GNU_CC
--- a/layout/mathml/Makefile.in
+++ b/layout/mathml/Makefile.in
@@ -21,18 +21,16 @@ LOCAL_INCLUDES = \
-I$(srcdir)/../base \
-I$(srcdir)/../generic \
-I$(srcdir)/../tables \
-I$(topsrcdir)/content/base/src \
-I$(topsrcdir)/content/mathml/content/src \
-I$(srcdir)/../xul/base/src \
$(NULL)
-include $(topsrcdir)/config/config.mk
-
include $(topsrcdir)/config/rules.mk
font_properties = \
mathfontMathJax_Main.properties \
mathfontUnicode.properties \
mathfontSTIXNonUnicode.properties \
mathfontSTIXSize1.properties \
mathfontSTIXSizeOneSym.properties \
--- a/layout/svg/Makefile.in
+++ b/layout/svg/Makefile.in
@@ -10,18 +10,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = gksvgbase_s
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1
-include $(topsrcdir)/config/config.mk
-
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES = \
-I$(srcdir)/../base \
-I$(srcdir)/../generic \
-I$(srcdir)/../style \
-I$(srcdir)/../xul/base/src \
-I$(srcdir)/../../content/svg/content/src \
--- a/layout/xul/base/src/Makefile.in
+++ b/layout/xul/base/src/Makefile.in
@@ -9,18 +9,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = gkxulbase_s
MSVC_ENABLE_PGO := 1
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1
-include $(topsrcdir)/config/config.mk
-
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES = \
-I$(srcdir) \
-I$(srcdir)/../../../base \
-I$(srcdir)/../../../../content/base/src \
-I$(srcdir)/../../../../content/events/src \
-I$(srcdir)/../../../generic \
--- a/memory/replace/dmd/Makefile.in
+++ b/memory/replace/dmd/Makefile.in
@@ -26,10 +26,9 @@ WRAP_LDFLAGS =
MOZ_GLUE_LDFLAGS=
STL_FLAGS =
ifeq ($(OS_ARCH),WINNT)
OS_LIBS += $(call EXPAND_LIBNAME,dbghelp)
endif
-include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
--- a/rdf/tests/rdfpoll/Makefile.in
+++ b/rdf/tests/rdfpoll/Makefile.in
@@ -12,12 +12,10 @@ include $(DEPTH)/config/autoconf.mk
LIBS = \
$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
$(LIBS_DIR) \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NULL)
-include $(topsrcdir)/config/config.mk
-
include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/downloads/Makefile.in
+++ b/toolkit/components/downloads/Makefile.in
@@ -9,14 +9,11 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = download_s
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1
-# definition of MOZ_SUITE is only added via config.mk
-include $(topsrcdir)/config/config.mk
-
include $(topsrcdir)/config/rules.mk
CXXFLAGS += $(TK_CFLAGS)
--- a/toolkit/components/mediasniffer/Makefile.in
+++ b/toolkit/components/mediasniffer/Makefile.in
@@ -8,11 +8,9 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = mediasniffer
LIBXUL_LIBRARY = 1
EXPORT_LIBRARY = 1
-
-include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/protobuf/Makefile.in
+++ b/toolkit/components/protobuf/Makefile.in
@@ -19,12 +19,11 @@ VPATH = \
LIBRARY_NAME = protobuf_s
FORCE_STATIC_LIB = 1
LOCAL_INCLUDES = \
-I$(srcdir) \
$(NULL)
-include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
CXXFLAGS += $(TK_CFLAGS)
--- a/toolkit/components/telemetry/Makefile.in
+++ b/toolkit/components/telemetry/Makefile.in
@@ -32,17 +32,16 @@ ifdef MOZILLA_OFFICIAL
DEFINES += -DMOZILLA_OFFICIAL
endif
MOZ_HISTOGRAMS_VERSION ?= $(call getSourceRepo)/rev/$(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null))
ifdef MOZ_HISTOGRAMS_VERSION
DEFINES += -DHISTOGRAMS_FILE_VERSION="$(MOZ_HISTOGRAMS_VERSION)"
endif
-include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
histograms_file := $(srcdir)/Histograms.json
histogram_enum_file := TelemetryHistogramEnums.h
histogram_data_file := TelemetryHistogramData.inc
enum_python_deps := \
--- a/toolkit/devtools/Makefile.in
+++ b/toolkit/devtools/Makefile.in
@@ -2,15 +2,13 @@
# License, v. 2.0. If a copy of the MPL was not distributed 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
-
include $(topsrcdir)/config/rules.mk
libs::
$(NSINSTALL) $(IFLAGS1) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools
$(NSINSTALL) $(IFLAGS1) $(srcdir)/*.js $(FINAL_TARGET)/modules/devtools
--- a/widget/shared/x11/Makefile.in
+++ b/widget/shared/x11/Makefile.in
@@ -13,12 +13,11 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = widget_shared_x11
LIBXUL_LIBRARY = 1
CSRCS = \
keysym2ucs.c \
$(NULL)
-include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
CXXFLAGS += $(TK_CFLAGS)