Bug 896177 - Remove useless config.mk includes; r=gps

2013-07-17 16:06:53 -04:00 · 2013-07-17 16:06:53 -04:00 · 61565e4086
--- a/accessible/src/windows/msaa/Makefile.in
+++ b/accessible/src/windows/msaa/Makefile.in
@ -13,7 +13,6 @@ LIBRARY_NAME = accessibility_toolkit_msaa_s
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY = 1

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/chrome/src/Makefile.in
+++ b/chrome/src/Makefile.in
@ -14,7 +14,6 @@ LIBRARY_NAME    = chrome_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY  = 1

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@ -23,7 +23,6 @@ endif

 GQI_SRCS = contentbase.gqi

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@ -15,7 +15,6 @@ MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY  = 1
 FAIL_ON_WARNINGS = 1

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/content/mathml/content/src/Makefile.in
+++ b/content/mathml/content/src/Makefile.in
@ -14,8 +14,6 @@ LIBRARY_NAME	= gkcontentmathml_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1

-include $(topsrcdir)/config/config.mk
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/content/media/Makefile.in
+++ b/content/media/Makefile.in
@ -14,7 +14,6 @@ MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS := 1

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/content/media/webspeech/recognition/Makefile.in
+++ b/content/media/webspeech/recognition/Makefile.in
@ -19,6 +19,5 @@ LIBXUL_LIBRARY := 1

 LOCAL_INCLUDES += $(VPATH:%=-I%)

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/content/media/webspeech/synth/Makefile.in
+++ b/content/media/webspeech/synth/Makefile.in
@ -22,6 +22,5 @@ LIBXUL_LIBRARY  = 1

 LOCAL_INCLUDES += $(VPATH:%=-I%)

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/content/svg/content/src/Makefile.in
+++ b/content/svg/content/src/Makefile.in
@ -14,8 +14,6 @@ LIBRARY_NAME	= gkcontentsvg_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS	= 1

-include $(topsrcdir)/config/config.mk
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/docshell/base/Makefile.in
+++ b/docshell/base/Makefile.in
@ -19,7 +19,6 @@ ifdef MOZ_TOOLKIT_SEARCH
 DEFINES += -DMOZ_TOOLKIT_SEARCH
 endif

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/dom/alarm/Makefile.in
+++ b/dom/alarm/Makefile.in
@ -16,7 +16,6 @@ FAIL_ON_WARNINGS := 1
 include $(topsrcdir)/dom/dom-config.mk


-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/dom/audiochannel/Makefile.in
+++ b/dom/audiochannel/Makefile.in
@ -24,7 +24,6 @@ LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS := 1

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/dom/base/Makefile.in
+++ b/dom/base/Makefile.in
@ -29,7 +29,6 @@ ifdef MOZ_B2G_FM
 DEFINES += -DMOZ_B2G_FM
 endif

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/dom/battery/Makefile.in
+++ b/dom/battery/Makefile.in
@ -19,7 +19,6 @@ LOCAL_INCLUDES = \
  -I$(topsrcdir)/content/events/src \
  $(NULL)

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/dom/bluetooth/Makefile.in
+++ b/dom/bluetooth/Makefile.in
@ -51,6 +51,5 @@ LOCAL_INCLUDES += $(VPATH:%=-I%)

 endif # MOZ_B2G_BT

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/browser-element/Makefile.in
+++ b/dom/browser-element/Makefile.in
@ -16,7 +16,6 @@ FAIL_ON_WARNINGS := 1
 include $(topsrcdir)/dom/dom-config.mk


-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/dom/devicestorage/Makefile.in
+++ b/dom/devicestorage/Makefile.in
@ -22,6 +22,5 @@ LOCAL_INCLUDES = \
 		-I$(topsrcdir)/content/events/src \
 		$(NULL)

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/devicestorage/ipc/Makefile.in
+++ b/dom/devicestorage/ipc/Makefile.in
@ -16,6 +16,5 @@ MOCHITEST_FILES := \
  $(NULL)


-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/icc/src/Makefile.in
+++ b/dom/icc/src/Makefile.in
@ -19,6 +19,5 @@ LOCAL_INCLUDES = \
  -I$(topsrcdir)/content/events/src \
  $(NULL)

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/indexedDB/Makefile.in
+++ b/dom/indexedDB/Makefile.in
@ -25,7 +25,6 @@ LOCAL_INCLUDES = \
  $(NULL)


-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/dom/indexedDB/ipc/Makefile.in
+++ b/dom/indexedDB/ipc/Makefile.in
@ -29,7 +29,6 @@ MOCHITEST_FILES = test_ipc.html
 # We're copying tests from another directory so this check is wrong for us.
 #NO_XPCSHELL_MANIFEST_CHECK = 1

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/dom/ipc/Makefile.in
+++ b/dom/ipc/Makefile.in
@ -14,7 +14,6 @@ LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS := 1

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/dom/media/Makefile.in
+++ b/dom/media/Makefile.in
@ -24,6 +24,5 @@ LOCAL_INCLUDES += \
  $(NULL)
 endif

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/mobilemessage/src/Makefile.in
+++ b/dom/mobilemessage/src/Makefile.in
@ -43,6 +43,5 @@ LOCAL_INCLUDES += \
  $(NULL)
 endif

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/network/src/Makefile.in
+++ b/dom/network/src/Makefile.in
@ -29,6 +29,5 @@ LOCAL_INCLUDES += \
  $(NULL)
 endif

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/plugins/base/Makefile.in
+++ b/dom/plugins/base/Makefile.in
@ -40,7 +40,6 @@ LOCAL_INCLUDES += \
  $(NULL)

 include $(topsrcdir)/dom/dom-config.mk
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/dom/plugins/ipc/Makefile.in
+++ b/dom/plugins/ipc/Makefile.in
@ -33,7 +33,6 @@ LOCAL_INCLUDES += \
  $(NULL)
 endif

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/dom/power/Makefile.in
+++ b/dom/power/Makefile.in
@ -15,6 +15,5 @@ FAIL_ON_WARNINGS := 1

 include $(topsrcdir)/dom/dom-config.mk

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/quota/Makefile.in
+++ b/dom/quota/Makefile.in
@ -20,6 +20,5 @@ LOCAL_INCLUDES = \
  -I$(topsrcdir)/caps/include \
  $(NULL)

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/src/geolocation/Makefile.in
+++ b/dom/src/geolocation/Makefile.in
@ -44,6 +44,5 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 LOCAL_INCLUDES  += -I$(topsrcdir)/dom/system/mac
 endif

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/src/notification/Makefile.in
+++ b/dom/src/notification/Makefile.in
@ -21,6 +21,5 @@ LOCAL_INCLUDES = \
  -I$(topsrcdir)/content/events/src \
  $(NULL)

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/src/storage/Makefile.in
+++ b/dom/src/storage/Makefile.in
@ -23,6 +23,5 @@ ifdef ENABLE_TESTS
 DEFINES += -DDOM_STORAGE_TESTS
 endif

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/time/Makefile.in
+++ b/dom/time/Makefile.in
@ -15,6 +15,5 @@ FAIL_ON_WARNINGS := 1

 include $(topsrcdir)/dom/dom-config.mk

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/extensions/cookie/Makefile.in
+++ b/extensions/cookie/Makefile.in
@ -15,7 +15,5 @@ MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY = 1

-
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/gfx/ipc/Makefile.in
+++ b/gfx/ipc/Makefile.in
@ -14,7 +14,6 @@ LIBRARY_NAME       = gfxipc_s
 LIBXUL_LIBRARY     = 1
 EXPORT_LIBRARY     = 1

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/hal/Makefile.in
+++ b/hal/Makefile.in
@ -34,7 +34,6 @@ ifdef MOZ_GAMEPAD
 LOCAL_INCLUDES = -I$(topsrcdir)/dom/base
 endif

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/image/decoders/icon/android/Makefile.in
+++ b/image/decoders/icon/android/Makefile.in
@ -13,6 +13,5 @@ LIBRARY_NAME	= imgiconandroid_s
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS := 1

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/ipc/dbus/Makefile.in
+++ b/ipc/dbus/Makefile.in
@ -17,7 +17,6 @@ ifdef MOZ_ENABLE_DBUS
 	LOCAL_INCLUDES += $(MOZ_DBUS_CFLAGS)
 endif

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/ipc/glue/Makefile.in
+++ b/ipc/glue/Makefile.in
@ -18,6 +18,5 @@ EXPORT_LIBRARY = 1
 DEFINES += -DMOZ_CHILD_PROCESS_NAME=\"$(MOZ_CHILD_PROCESS_NAME)\"
 DEFINES += -DMOZ_CHILD_PROCESS_BUNDLE=\"$(MOZ_CHILD_PROCESS_BUNDLE)\"

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/ipc/ipdl/Makefile.in
+++ b/ipc/ipdl/Makefile.in
@ -24,7 +24,6 @@ GARBAGE += $(CPPSRCS)
 LOCAL_INCLUDES += -I$(DEPTH)/ipc/ipdl/_ipdlheaders


-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/ipc/ipdl/test/cxx/Makefile.in
+++ b/ipc/ipdl/test/cxx/Makefile.in
@ -60,7 +60,6 @@ IPDLTESTHDRS = $(addprefix $(srcdir)/,$(addsuffix .h,$(IPDLTESTS)))
 TESTER_TEMPLATE := $(srcdir)/IPDLUnitTests.template.cpp
 GENTESTER := $(srcdir)/genIPDLUnitTests.py

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/ipc/netd/Makefile.in
+++ b/ipc/netd/Makefile.in
@ -13,6 +13,5 @@ LIBRARY_NAME = moznetd_s
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/ipc/nfc/Makefile.in
+++ b/ipc/nfc/Makefile.in
@ -13,6 +13,5 @@ LIBRARY_NAME = moznfc_s
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/ipc/ril/Makefile.in
+++ b/ipc/ril/Makefile.in
@ -13,6 +13,5 @@ LIBRARY_NAME = mozril_s
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/ipc/testshell/Makefile.in
+++ b/ipc/testshell/Makefile.in
@ -21,6 +21,5 @@ LOCAL_INCLUDES += \
  -I$(topsrcdir)/dom/base \
  $(NULL)

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/ipc/unixsocket/Makefile.in
+++ b/ipc/unixsocket/Makefile.in
@ -14,6 +14,5 @@ LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS = 1

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/js/ipc/Makefile.in
+++ b/js/ipc/Makefile.in
@ -21,7 +21,6 @@ LOCAL_INCLUDES += \
  -I$(topsrcdir)/js/xpconnect/src \
  $(NULL)

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@ -273,7 +273,6 @@ SHARED_LIBRARY_LIBS += \
  $(DEPTH)/dom/gamepad/$(LIB_PREFIX)domgamepad_s.$(LIB_SUFFIX)
 endif

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/layout/generic/Makefile.in
+++ b/layout/generic/Makefile.in
@ -20,7 +20,6 @@ RESOURCES_HTML = \
 		$(srcdir)/folder.png \
 		$(NULL)

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/layout/ipc/Makefile.in
+++ b/layout/ipc/Makefile.in
@ -14,7 +14,6 @@ LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS = 1

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/modules/libjar/Makefile.in
+++ b/modules/libjar/Makefile.in
@ -16,7 +16,5 @@ EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1

-
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/modules/libpref/src/Makefile.in
+++ b/modules/libpref/src/Makefile.in
@ -19,7 +19,6 @@ DEFINES += -DOS_ARCH=$(OS_ARCH) \
           -DMOZ_WIDGET_TOOLKIT=$(MOZ_WIDGET_TOOLKIT) \
           $(NULL)

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/netwerk/base/src/Makefile.in
+++ b/netwerk/base/src/Makefile.in
@ -28,7 +28,6 @@ ifdef MOZ_ENABLE_QTNETWORK
 endif
 endif

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/netwerk/build/Makefile.in
+++ b/netwerk/build/Makefile.in
@ -122,7 +122,6 @@ LOCAL_INCLUDES += -I$(srcdir)/../wifi

 endif

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/netwerk/cookie/Makefile.in
+++ b/netwerk/cookie/Makefile.in
@ -26,7 +26,6 @@ LOCAL_INCLUDES	= \
 endif


-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/netwerk/ipc/Makefile.in
+++ b/netwerk/ipc/Makefile.in
@ -19,6 +19,5 @@ LOCAL_INCLUDES +=                  \
  -I$(topsrcdir)/modules/libjar    \
  $(NULL)

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/netwerk/protocol/about/Makefile.in
+++ b/netwerk/protocol/about/Makefile.in
@ -18,7 +18,6 @@ LOCAL_INCLUDES = \
  -I$(srcdir)/../../base/src \
  $(NULL)

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/netwerk/protocol/device/Makefile.in
+++ b/netwerk/protocol/device/Makefile.in
@ -16,7 +16,6 @@ LIBXUL_LIBRARY = 1
 LOCAL_INCLUDES = -I$(srcdir)/../../base/src/ \
                 $(NULL)

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/netwerk/protocol/ftp/Makefile.in
+++ b/netwerk/protocol/ftp/Makefile.in
@ -20,7 +20,6 @@ LOCAL_INCLUDES = \
  -I$(topsrcdir)/xpcom/ds \
  $(NULL)

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/netwerk/protocol/http/Makefile.in
+++ b/netwerk/protocol/http/Makefile.in
@ -22,7 +22,6 @@ LOCAL_INCLUDES = \
  -I$(topsrcdir)/content/events/src \
  $(NULL)

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/netwerk/protocol/res/Makefile.in
+++ b/netwerk/protocol/res/Makefile.in
@ -19,7 +19,6 @@ LOCAL_INCLUDES = \
  -I$(topsrcdir)/netwerk/base/src \
  $(NULL)

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/netwerk/protocol/websocket/Makefile.in
+++ b/netwerk/protocol/websocket/Makefile.in
@ -21,7 +21,6 @@ LOCAL_INCLUDES = \
  -I$(topsrcdir)/xpcom/ds \
  $(NULL)

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/netwerk/protocol/wyciwyg/Makefile.in
+++ b/netwerk/protocol/wyciwyg/Makefile.in
@ -17,7 +17,6 @@ LOCAL_INCLUDES = \
  -I$(srcdir)/../../base/src \
  $(NULL)

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/netwerk/sctp/datachannel/Makefile.in
+++ b/netwerk/sctp/datachannel/Makefile.in
@ -39,7 +39,6 @@ DEFINES += -D__Userspace_os_$(OS_TARGET)=1
 endif


-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/netwerk/sctp/src/Makefile.in
+++ b/netwerk/sctp/src/Makefile.in
@ -95,7 +95,6 @@ endif
 endif
 endif

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/netwerk/srtp/src/Makefile.in
+++ b/netwerk/srtp/src/Makefile.in
@ -71,7 +71,6 @@ DEFINES += \
  $(NULL)
 endif

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/toolkit/components/alerts/Makefile.in
+++ b/toolkit/components/alerts/Makefile.in
@ -13,6 +13,5 @@ LIBRARY_NAME = alerts_s
 LIBXUL_LIBRARY = 1
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/toolkit/crashreporter/Makefile.in
+++ b/toolkit/crashreporter/Makefile.in
@ -37,7 +37,6 @@ endif
 LOCAL_INCLUDES += -I$(srcdir)/google-breakpad/src
 DEFINES += -DUNICODE -D_UNICODE

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/toolkit/crashreporter/injector/Makefile.in
+++ b/toolkit/crashreporter/injector/Makefile.in
@ -17,7 +17,6 @@ MOZ_GLUE_LDFLAGS =

 SHARED_LIBRARY_LIBS += ../breakpad-windows-standalone/$(LIB_PREFIX)google_breakpad_standalone_s.$(LIB_SUFFIX)

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@ -128,7 +128,6 @@ SHARED_LIBRARY_LIBS += \
 endif
 endif

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/uriloader/exthandler/Makefile.in
+++ b/uriloader/exthandler/Makefile.in
@ -76,7 +76,6 @@ LOCAL_INCLUDES   += $(MOZ_GIO_CFLAGS)
 endif
 endif

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/uriloader/prefetch/Makefile.in
+++ b/uriloader/prefetch/Makefile.in
@ -19,7 +19,6 @@ LOCAL_INCLUDES = \
 		-I$(topsrcdir)/content/events/src \
 		$(NULL)

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/widget/gtk2/Makefile.in
+++ b/widget/gtk2/Makefile.in
@ -44,7 +44,6 @@ endif
 DEFINES		+= -DNATIVE_THEME_SUPPORT
 endif

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/widget/qt/Makefile.in
+++ b/widget/qt/Makefile.in
@ -21,7 +21,6 @@ ifneq (qt,$(MOZ_WIDGET_TOOLKIT))
 INACTIVE_COMPONENT = 1
 endif

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/widget/shared/Makefile.in
+++ b/widget/shared/Makefile.in
@ -13,7 +13,6 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME	= widget_shared
 LIBXUL_LIBRARY  = 1

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/widget/windows/Makefile.in
+++ b/widget/windows/Makefile.in
@ -42,7 +42,6 @@ LOCAL_INCLUDES	= \
 		-I$(topsrcdir)/content/events/src \
 		$(NULL)

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/widget/xpwidgets/Makefile.in
+++ b/widget/xpwidgets/Makefile.in
@ -44,7 +44,6 @@ LOCAL_INCLUDES	+= \
 		-I$(srcdir) \
 		$(NULL)

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/xpcom/base/Makefile.in
+++ b/xpcom/base/Makefile.in
@ -27,7 +27,6 @@ endif

 endif #if OS_ARCH == WINNT

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@ -61,7 +61,6 @@ LOCAL_INCLUDES	= \

 GARBAGE         += $(XPCOM_GLUE_SRC_LCPPSRCS) $(XPCOM_GLUENS_SRC_LCPPSRCS)

-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk