From b97d1767fce7d2660e6c3f3ccf6b895129cc94c4 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Mon, 15 Jul 2013 18:48:40 +0900 Subject: [PATCH] Bug 892904 - Remove useless includes of config.mk. r=gps --- accessible/src/windows/ia2/Makefile.in | 1 - accessible/src/windows/sdn/Makefile.in | 1 - accessible/src/windows/uia/Makefile.in | 1 - browser/Makefile.in | 2 -- browser/devtools/Makefile.in | 2 -- browser/metro/Makefile.in | 1 - browser/metro/modules/Makefile.in | 1 - config/tests/makefiles/autodeps/Makefile.in | 1 - content/xbl/src/Makefile.in | 2 -- dom/activities/src/Makefile.in | 2 -- dom/audiochannel/tests/Makefile.in | 1 - dom/encoding/Makefile.in | 1 - dom/payment/Makefile.in | 1 - dom/promise/Makefile.in | 1 - dom/system/windows/Makefile.in | 2 -- dom/wappush/src/Makefile.in | 1 - embedding/tests/winEmbed/Makefile.in | 2 -- gfx/cairo/libpixman/src/Makefile.in | 2 -- layout/mathml/Makefile.in | 2 -- layout/svg/Makefile.in | 2 -- layout/xul/base/src/Makefile.in | 2 -- memory/replace/dmd/Makefile.in | 1 - rdf/tests/rdfpoll/Makefile.in | 2 -- toolkit/components/downloads/Makefile.in | 3 --- toolkit/components/mediasniffer/Makefile.in | 2 -- toolkit/components/protobuf/Makefile.in | 1 - toolkit/components/telemetry/Makefile.in | 1 - toolkit/devtools/Makefile.in | 2 -- widget/shared/x11/Makefile.in | 1 - 29 files changed, 44 deletions(-) diff --git a/accessible/src/windows/ia2/Makefile.in b/accessible/src/windows/ia2/Makefile.in index 68a7528c813a..5827bd89c687 100644 --- a/accessible/src/windows/ia2/Makefile.in +++ b/accessible/src/windows/ia2/Makefile.in @@ -17,7 +17,6 @@ LIBXUL_LIBRARY = 1 # 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 += \ diff --git a/accessible/src/windows/sdn/Makefile.in b/accessible/src/windows/sdn/Makefile.in index e29ceb897647..cbc3681e8f37 100644 --- a/accessible/src/windows/sdn/Makefile.in +++ b/accessible/src/windows/sdn/Makefile.in @@ -16,7 +16,6 @@ LIBXUL_LIBRARY = 1 # 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 += \ diff --git a/accessible/src/windows/uia/Makefile.in b/accessible/src/windows/uia/Makefile.in index 9422f8cb6a65..6fa292fc9298 100644 --- a/accessible/src/windows/uia/Makefile.in +++ b/accessible/src/windows/uia/Makefile.in @@ -16,7 +16,6 @@ LIBXUL_LIBRARY = 1 # 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 += \ diff --git a/browser/Makefile.in b/browser/Makefile.in index 0eab0c7a0846..14b5e7f0fffa 100644 --- a/browser/Makefile.in +++ b/browser/Makefile.in @@ -7,8 +7,6 @@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(topsrcdir)/config/config.mk - include $(topsrcdir)/config/rules.mk ifdef MAKENSISU diff --git a/browser/devtools/Makefile.in b/browser/devtools/Makefile.in index 5f0adb705338..e57d3d86521e 100644 --- a/browser/devtools/Makefile.in +++ b/browser/devtools/Makefile.in @@ -7,8 +7,6 @@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(topsrcdir)/config/config.mk - include $(topsrcdir)/config/rules.mk libs:: diff --git a/browser/metro/Makefile.in b/browser/metro/Makefile.in index 0b7f7733dcb3..e0c60e11909f 100644 --- a/browser/metro/Makefile.in +++ b/browser/metro/Makefile.in @@ -8,7 +8,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk diff --git a/browser/metro/modules/Makefile.in b/browser/metro/modules/Makefile.in index 391fada4489f..86b4152637a5 100644 --- a/browser/metro/modules/Makefile.in +++ b/browser/metro/modules/Makefile.in @@ -8,5 +8,4 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk diff --git a/config/tests/makefiles/autodeps/Makefile.in b/config/tests/makefiles/autodeps/Makefile.in index f0c717274db8..4367d9146460 100644 --- a/config/tests/makefiles/autodeps/Makefile.in +++ b/config/tests/makefiles/autodeps/Makefile.in @@ -18,7 +18,6 @@ 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 diff --git a/content/xbl/src/Makefile.in b/content/xbl/src/Makefile.in index a636edfd6101..55d7f07e5bee 100644 --- a/content/xbl/src/Makefile.in +++ b/content/xbl/src/Makefile.in @@ -15,8 +15,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -include $(topsrcdir)/config/config.mk - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/dom/activities/src/Makefile.in b/dom/activities/src/Makefile.in index c648cc0abdd8..385b8720be18 100644 --- a/dom/activities/src/Makefile.in +++ b/dom/activities/src/Makefile.in @@ -15,6 +15,4 @@ FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk - -include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/audiochannel/tests/Makefile.in b/dom/audiochannel/tests/Makefile.in index 1459827e2c7d..3ae3d5557f02 100644 --- a/dom/audiochannel/tests/Makefile.in +++ b/dom/audiochannel/tests/Makefile.in @@ -16,6 +16,5 @@ CPP_UNIT_TESTS = \ TestAudioChannelService.cpp \ $(NULL) -include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/encoding/Makefile.in b/dom/encoding/Makefile.in index 8d624d68d205..742e607c5595 100644 --- a/dom/encoding/Makefile.in +++ b/dom/encoding/Makefile.in @@ -18,7 +18,6 @@ LOCAL_INCLUDES = \ $(NULL) include $(topsrcdir)/dom/dom-config.mk -include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk EncodingUtils.$(OBJ_SUFFIX): labelsencodings.properties.h diff --git a/dom/payment/Makefile.in b/dom/payment/Makefile.in index acee76ed33f9..cfdbeecb935c 100644 --- a/dom/payment/Makefile.in +++ b/dom/payment/Makefile.in @@ -16,5 +16,4 @@ EXTRA_COMPONENTS = \ Payment.manifest \ $(NULL) -include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/promise/Makefile.in b/dom/promise/Makefile.in index fdab90659e19..c5c17c6d1b6c 100644 --- a/dom/promise/Makefile.in +++ b/dom/promise/Makefile.in @@ -13,5 +13,4 @@ LIBRARY_NAME = dompromise_s LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS := 1 -include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/system/windows/Makefile.in b/dom/system/windows/Makefile.in index 71bf74013e61..e0e706bc0486 100644 --- a/dom/system/windows/Makefile.in +++ b/dom/system/windows/Makefile.in @@ -18,6 +18,4 @@ 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 diff --git a/dom/wappush/src/Makefile.in b/dom/wappush/src/Makefile.in index 940de1475ffe..a2a21a2dc3c3 100644 --- a/dom/wappush/src/Makefile.in +++ b/dom/wappush/src/Makefile.in @@ -16,5 +16,4 @@ EXTRA_COMPONENTS = \ $(NULL) endif -include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk diff --git a/embedding/tests/winEmbed/Makefile.in b/embedding/tests/winEmbed/Makefile.in index 17cc1c4f6070..e3caa35df4f7 100644 --- a/embedding/tests/winEmbed/Makefile.in +++ b/embedding/tests/winEmbed/Makefile.in @@ -50,8 +50,6 @@ STL_FLAGS= OS_LIBS += $(call EXPAND_LIBNAME,ole32 comdlg32 shell32 version) -include $(topsrcdir)/config/config.mk - include $(topsrcdir)/config/rules.mk # diff --git a/gfx/cairo/libpixman/src/Makefile.in b/gfx/cairo/libpixman/src/Makefile.in index 97256f8abe56..54780cc3b46b 100644 --- a/gfx/cairo/libpixman/src/Makefile.in +++ b/gfx/cairo/libpixman/src/Makefile.in @@ -150,8 +150,6 @@ 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 diff --git a/layout/mathml/Makefile.in b/layout/mathml/Makefile.in index 0dff8229a53c..b8df1ba3bafd 100644 --- a/layout/mathml/Makefile.in +++ b/layout/mathml/Makefile.in @@ -26,8 +26,6 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../xul/base/src \ $(NULL) -include $(topsrcdir)/config/config.mk - include $(topsrcdir)/config/rules.mk font_properties = \ diff --git a/layout/svg/Makefile.in b/layout/svg/Makefile.in index 51613e3f1e46..f9d7236773f6 100644 --- a/layout/svg/Makefile.in +++ b/layout/svg/Makefile.in @@ -15,8 +15,6 @@ LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -include $(topsrcdir)/config/config.mk - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/layout/xul/base/src/Makefile.in b/layout/xul/base/src/Makefile.in index 7a5b161be309..b896a92d752c 100644 --- a/layout/xul/base/src/Makefile.in +++ b/layout/xul/base/src/Makefile.in @@ -14,8 +14,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -include $(topsrcdir)/config/config.mk - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/memory/replace/dmd/Makefile.in b/memory/replace/dmd/Makefile.in index 79e7ad19e149..47610b252972 100644 --- a/memory/replace/dmd/Makefile.in +++ b/memory/replace/dmd/Makefile.in @@ -31,5 +31,4 @@ ifeq ($(OS_ARCH),WINNT) OS_LIBS += $(call EXPAND_LIBNAME,dbghelp) endif -include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk diff --git a/rdf/tests/rdfpoll/Makefile.in b/rdf/tests/rdfpoll/Makefile.in index 02a8f2e2f7f4..4095c9f9eaf2 100644 --- a/rdf/tests/rdfpoll/Makefile.in +++ b/rdf/tests/rdfpoll/Makefile.in @@ -17,7 +17,5 @@ LIBS = \ $(NSPR_LIBS) \ $(NULL) -include $(topsrcdir)/config/config.mk - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in index c04ff6967f91..334c066fbf02 100644 --- a/toolkit/components/downloads/Makefile.in +++ b/toolkit/components/downloads/Makefile.in @@ -14,9 +14,6 @@ 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) diff --git a/toolkit/components/mediasniffer/Makefile.in b/toolkit/components/mediasniffer/Makefile.in index 5bffee78b8be..e189124a986a 100644 --- a/toolkit/components/mediasniffer/Makefile.in +++ b/toolkit/components/mediasniffer/Makefile.in @@ -13,6 +13,4 @@ LIBRARY_NAME = mediasniffer LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 - -include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/protobuf/Makefile.in b/toolkit/components/protobuf/Makefile.in index fcd901e135d8..618a4c38a99f 100644 --- a/toolkit/components/protobuf/Makefile.in +++ b/toolkit/components/protobuf/Makefile.in @@ -24,7 +24,6 @@ LOCAL_INCLUDES = \ -I$(srcdir) \ $(NULL) -include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk CXXFLAGS += $(TK_CFLAGS) diff --git a/toolkit/components/telemetry/Makefile.in b/toolkit/components/telemetry/Makefile.in index aca3f0371603..7a33bb56cf6f 100644 --- a/toolkit/components/telemetry/Makefile.in +++ b/toolkit/components/telemetry/Makefile.in @@ -37,7 +37,6 @@ 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 diff --git a/toolkit/devtools/Makefile.in b/toolkit/devtools/Makefile.in index 1d8bdd490643..bba704930848 100644 --- a/toolkit/devtools/Makefile.in +++ b/toolkit/devtools/Makefile.in @@ -7,8 +7,6 @@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(topsrcdir)/config/config.mk - include $(topsrcdir)/config/rules.mk libs:: diff --git a/widget/shared/x11/Makefile.in b/widget/shared/x11/Makefile.in index 3d3c00117b42..819b6fc06f30 100644 --- a/widget/shared/x11/Makefile.in +++ b/widget/shared/x11/Makefile.in @@ -18,7 +18,6 @@ CSRCS = \ keysym2ucs.c \ $(NULL) -include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk CXXFLAGS += $(TK_CFLAGS)