Bug 852534 - Remove GRE_MODULE from Makefile.in; r=gps
authorMike Shal <mshal@mozilla.com>
Thu, 21 Mar 2013 08:41:00 -0700
changeset 125794 c0dc803fc4b56a7c6c94692d78a3cdfc7bc5b11e
parent 125793 94757fd7a4cad79a6231631536e04d1c21df0de2
child 125795 6e34c80ad3389de8fe0e747f20eb44bfe4725a44
push idunknown
push userunknown
push dateunknown
reviewersgps
bugs852534
milestone22.0a1
Bug 852534 - Remove GRE_MODULE from Makefile.in; r=gps
accessible/build/Makefile.in
accessible/public/Makefile.in
accessible/public/ia2/Makefile.in
accessible/public/msaa/Makefile.in
build/mobile/sutagent/android/Makefile.in
caps/idl/Makefile.in
content/base/public/Makefile.in
content/xul/document/public/Makefile.in
docshell/base/Makefile.in
docshell/build/Makefile.in
docshell/shistory/public/Makefile.in
dom/alarm/Makefile.in
dom/contacts/Makefile.in
dom/interfaces/apps/Makefile.in
dom/interfaces/base/Makefile.in
dom/interfaces/canvas/Makefile.in
dom/interfaces/contacts/Makefile.in
dom/interfaces/core/Makefile.in
dom/interfaces/css/Makefile.in
dom/interfaces/events/Makefile.in
dom/interfaces/geolocation/Makefile.in
dom/interfaces/html/Makefile.in
dom/interfaces/json/Makefile.in
dom/interfaces/notification/Makefile.in
dom/interfaces/offline/Makefile.in
dom/interfaces/permission/Makefile.in
dom/interfaces/range/Makefile.in
dom/interfaces/settings/Makefile.in
dom/interfaces/sidebar/Makefile.in
dom/interfaces/storage/Makefile.in
dom/interfaces/stylesheets/Makefile.in
dom/interfaces/traversal/Makefile.in
dom/interfaces/xbl/Makefile.in
dom/interfaces/xul/Makefile.in
dom/permission/Makefile.in
dom/plugins/base/Makefile.in
dom/src/jsurl/Makefile.in
editor/idl/Makefile.in
editor/txtsvc/public/Makefile.in
embedding/browser/build/Makefile.in
embedding/browser/webBrowser/Makefile.in
embedding/components/build/Makefile.in
embedding/components/webbrowserpersist/public/Makefile.in
embedding/components/windowwatcher/public/Makefile.in
extensions/cookie/Makefile.in
gfx/qcms/Makefile.in
gfx/src/Makefile.in
image/build/Makefile.in
image/public/Makefile.in
image/src/Makefile.in
intl/build/Makefile.in
intl/chardet/src/Makefile.in
intl/locale/idl/Makefile.in
intl/strres/public/Makefile.in
intl/uconv/idl/Makefile.in
intl/uconv/src/Makefile.in
intl/unicharutil/idl/Makefile.in
js/ductwork/debugger/Makefile.in
js/src/Makefile.in
js/xpconnect/idl/Makefile.in
layout/base/Makefile.in
layout/build/Makefile.in
layout/printing/Makefile.in
layout/tools/layout-debug/src/Makefile.in
layout/xul/base/public/Makefile.in
modules/libjar/Makefile.in
modules/libpref/public/Makefile.in
modules/libpref/src/Makefile.in
netwerk/base/public/Makefile.in
netwerk/build/Makefile.in
netwerk/cache/Makefile.in
netwerk/cookie/Makefile.in
netwerk/dns/Makefile.in
netwerk/protocol/about/Makefile.in
netwerk/protocol/file/Makefile.in
netwerk/protocol/ftp/Makefile.in
netwerk/protocol/http/Makefile.in
netwerk/protocol/res/Makefile.in
netwerk/protocol/viewsource/Makefile.in
netwerk/protocol/websocket/Makefile.in
netwerk/protocol/wyciwyg/Makefile.in
netwerk/sctp/datachannel/Makefile.in
netwerk/sctp/src/Makefile.in
netwerk/srtp/src/Makefile.in
netwerk/streamconv/public/Makefile.in
netwerk/wifi/Makefile.in
nsprpub/pkg/solaris/SUNWprd/Makefile.in
parser/htmlparser/public/Makefile.in
parser/htmlparser/src/Makefile.in
rdf/base/idl/Makefile.in
rdf/build/Makefile.in
security/manager/boot/public/Makefile.in
security/manager/boot/src/Makefile.in
security/manager/pki/public/Makefile.in
security/manager/pki/src/Makefile.in
security/manager/ssl/public/Makefile.in
security/manager/ssl/src/Makefile.in
startupcache/Makefile.in
storage/public/Makefile.in
storage/src/Makefile.in
toolkit/components/ctypes/Makefile.in
toolkit/components/perf/Makefile.in
toolkit/components/reflect/Makefile.in
toolkit/components/telemetry/Makefile.in
toolkit/components/typeaheadfind/Makefile.in
toolkit/devtools/debugger/Makefile.in
toolkit/identity/Makefile.in
toolkit/library/winvccorlib/Makefile.in
toolkit/system/androidproxy/Makefile.in
toolkit/system/dbus/Makefile.in
toolkit/system/osxproxy/Makefile.in
toolkit/system/unixproxy/Makefile.in
toolkit/system/windowsproxy/Makefile.in
uriloader/base/Makefile.in
view/src/Makefile.in
widget/Makefile.in
widget/android/Makefile.in
widget/cocoa/Makefile.in
widget/gonk/Makefile.in
widget/gtk2/Makefile.in
widget/os2/Makefile.in
widget/qt/Makefile.in
xpcom/Makefile.in
xpcom/base/Makefile.in
xpcom/build/Makefile.in
xpcom/components/Makefile.in
xpcom/ds/Makefile.in
xpcom/io/Makefile.in
xpcom/reflect/xptinfo/public/Makefile.in
xpcom/stub/Makefile.in
xpcom/threads/Makefile.in
xpfe/appshell/public/Makefile.in
xpfe/appshell/src/Makefile.in
--- a/accessible/build/Makefile.in
+++ b/accessible/build/Makefile.in
@@ -10,17 +10,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= accessibility
 EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= access
 IS_COMPONENT	= 1
 MODULE_NAME	= nsAccessibilityModule
-GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 
 CPPSRCS		= nsAccessibilityFactory.cpp
 
 LOCAL_INCLUDES	= -I$(srcdir)/../src
 
 SHARED_LIBRARY_LIBS = \
   ../src/base/$(LIB_PREFIX)accessibility_base_s.$(LIB_SUFFIX) \
--- a/accessible/public/Makefile.in
+++ b/accessible/public/Makefile.in
@@ -5,16 +5,15 @@
 
 DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 EXPORTS		= \
       nsIAccessibilityService.h \
       $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
--- a/accessible/public/ia2/Makefile.in
+++ b/accessible/public/ia2/Makefile.in
@@ -3,17 +3,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 LIBRARY_NAME  = IA2Marshal
-GRE_MODULE    = 1
 DEFFILE       = $(win_srcdir)/IA2Marshal.def
 
 IA2DIR        = $(topsrcdir)/other-licenses/ia2
 
 include $(DEPTH)/config/autoconf.mk
 
 DEFINES       += -DREGISTER_PROXY_DLL
 
--- a/accessible/public/msaa/Makefile.in
+++ b/accessible/public/msaa/Makefile.in
@@ -3,17 +3,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 LIBRARY_NAME	= AccessibleMarshal
-GRE_MODULE   = 1
 DEFFILE = $(win_srcdir)/AccessibleMarshal.def
 
 include $(DEPTH)/config/autoconf.mk
 
 DEFINES += -DREGISTER_PROXY_DLL
 
 GARBAGE += $(MIDL_GENERATED_FILES) done_gen dlldata.c
 
old mode 100755
new mode 100644
--- a/caps/idl/Makefile.in
+++ b/caps/idl/Makefile.in
@@ -5,12 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/content/base/public/Makefile.in
+++ b/content/base/public/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 EXPORTS		= \
 mozFlushType.h \
 nsIContent.h \
 nsIAttribute.h \
 nsIContentIterator.h \
 nsContentPolicyUtils.h \
 nsContentUtils.h \
--- a/content/xul/document/public/Makefile.in
+++ b/content/xul/document/public/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 ifdef MOZ_XUL
 EXPORTS		= \
 		nsIXULDocument.h \
 		$(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/docshell/base/Makefile.in
+++ b/docshell/base/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = basedocshell_s
-GRE_MODULE     = 1
 LIBXUL_LIBRARY = 1
 
 ifdef MOZ_TOOLKIT_SEARCH
 DEFINES += -DMOZ_TOOLKIT_SEARCH
 endif
 
 EXPORTS = \
   nsDocShellLoadTypes.h \
--- a/docshell/build/Makefile.in
+++ b/docshell/build/Makefile.in
@@ -10,17 +10,16 @@ VPATH		= @srcdir@
 
 IS_COMPONENT = 1
 MODULE_NAME	= docshell_provider
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= docshell
 EXPORT_LIBRARY = 1
-GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 
 
 EXPORTS = \
 		  nsDocShellCID.h \
 		  $(NULL)
 
 CPPSRCS		= \
--- a/docshell/shistory/public/Makefile.in
+++ b/docshell/shistory/public/Makefile.in
@@ -5,12 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/alarm/Makefile.in
+++ b/dom/alarm/Makefile.in
@@ -7,17 +7,16 @@ topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME        = domalarm_s
 LIBXUL_LIBRARY      = 1
 FORCE_STATIC_LIB    = 1
-GRE_MODULE          = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
 EXPORTS_NAMESPACES = mozilla/dom/alarm
 
 EXTRA_COMPONENTS =       \
   AlarmsManager.js       \
--- a/dom/contacts/Makefile.in
+++ b/dom/contacts/Makefile.in
@@ -11,17 +11,16 @@ VPATH            = \
 
 include $(DEPTH)/config/autoconf.mk
 
 VPATH += $(srcdir)/fallback
 
 LIBRARY_NAME   = jsdomcontacts_s
 LIBXUL_LIBRARY = 1
 
-GRE_MODULE     = 1
 
 EXTRA_COMPONENTS =        \
   ContactManager.js       \
   ContactManager.manifest \
   $(NULL)
 
 EXTRA_JS_MODULES =   \
   ContactService.jsm \
--- a/dom/interfaces/apps/Makefile.in
+++ b/dom/interfaces/apps/Makefile.in
@@ -5,12 +5,11 @@
 
 DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE     = 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/interfaces/base/Makefile.in
+++ b/dom/interfaces/base/Makefile.in
@@ -5,12 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/interfaces/canvas/Makefile.in
+++ b/dom/interfaces/canvas/Makefile.in
@@ -5,11 +5,10 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
--- a/dom/interfaces/contacts/Makefile.in
+++ b/dom/interfaces/contacts/Makefile.in
@@ -4,12 +4,11 @@
 
 DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE     = 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/interfaces/core/Makefile.in
+++ b/dom/interfaces/core/Makefile.in
@@ -5,12 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/interfaces/css/Makefile.in
+++ b/dom/interfaces/css/Makefile.in
@@ -5,12 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/interfaces/events/Makefile.in
+++ b/dom/interfaces/events/Makefile.in
@@ -5,12 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/interfaces/geolocation/Makefile.in
+++ b/dom/interfaces/geolocation/Makefile.in
@@ -5,12 +5,11 @@
 
 DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE     = 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/interfaces/html/Makefile.in
+++ b/dom/interfaces/html/Makefile.in
@@ -5,12 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/interfaces/json/Makefile.in
+++ b/dom/interfaces/json/Makefile.in
@@ -5,12 +5,11 @@
 
 DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE     = 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/interfaces/notification/Makefile.in
+++ b/dom/interfaces/notification/Makefile.in
@@ -5,12 +5,11 @@
 
 DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE     = 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/interfaces/offline/Makefile.in
+++ b/dom/interfaces/offline/Makefile.in
@@ -5,12 +5,11 @@
 
 DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE     = 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/interfaces/permission/Makefile.in
+++ b/dom/interfaces/permission/Makefile.in
@@ -4,12 +4,11 @@
 
 DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE     = 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/interfaces/range/Makefile.in
+++ b/dom/interfaces/range/Makefile.in
@@ -5,12 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/interfaces/settings/Makefile.in
+++ b/dom/interfaces/settings/Makefile.in
@@ -4,12 +4,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE     = 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/interfaces/sidebar/Makefile.in
+++ b/dom/interfaces/sidebar/Makefile.in
@@ -5,11 +5,10 @@
 
 DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE      = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/dom/interfaces/storage/Makefile.in
+++ b/dom/interfaces/storage/Makefile.in
@@ -5,16 +5,15 @@
 
 DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE     = 1
 
 EXPORTS =                                      \
        nsPIDOMStorage.h                        \
        $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/interfaces/stylesheets/Makefile.in
+++ b/dom/interfaces/stylesheets/Makefile.in
@@ -5,12 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/interfaces/traversal/Makefile.in
+++ b/dom/interfaces/traversal/Makefile.in
@@ -5,12 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/interfaces/xbl/Makefile.in
+++ b/dom/interfaces/xbl/Makefile.in
@@ -5,12 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/interfaces/xul/Makefile.in
+++ b/dom/interfaces/xul/Makefile.in
@@ -5,12 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/permission/Makefile.in
+++ b/dom/permission/Makefile.in
@@ -6,17 +6,16 @@ DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = jsdompermissionsettings_s
 
-GRE_MODULE     = 1
 
 EXTRA_COMPONENTS =        \
   PermissionSettings.js       \
   PermissionSettings.manifest \
   PermissionPromptService.js \
   PermissionPromptService.manifest \
   $(NULL)
 
--- a/dom/plugins/base/Makefile.in
+++ b/dom/plugins/base/Makefile.in
@@ -9,17 +9,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkplugin
 EXPORT_LIBRARY = 1
 IS_COMPONENT    = 1
 MODULE_NAME	= nsPluginModule
-GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 
 EXPORTS_NAMESPACES = mozilla
 
 EXPORTS = \
   npapi.h \
   npfunctions.h \
   nptypes.h \
--- a/dom/src/jsurl/Makefile.in
+++ b/dom/src/jsurl/Makefile.in
@@ -9,17 +9,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= jsurl_s
 FORCE_STATIC_LIB = 1
 MODULE_NAME	= javascript__protocol
-GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 
 CPPSRCS		= nsJSProtocolHandler.cpp
 
 EXPORTS		= $(srcdir)/nsJSProtocolHandler.h
 
 LOCAL_INCLUDES += \
 		-I$(srcdir) \
--- a/editor/idl/Makefile.in
+++ b/editor/idl/Makefile.in
@@ -5,12 +5,11 @@
 
 DEPTH           := @DEPTH@
 topsrcdir       := @top_srcdir@
 srcdir          := @srcdir@
 VPATH           := @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE      := 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/editor/txtsvc/public/Makefile.in
+++ b/editor/txtsvc/public/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 EXPORTS		= \
 		nsISpellChecker.h \
 		nsITextService.h \
 		nsITextServicesDocument.h \
 		nsTextServicesCID.h \
 		$(NULL)
 
--- a/embedding/browser/build/Makefile.in
+++ b/embedding/browser/build/Makefile.in
@@ -9,17 +9,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= webbrwsr
 IS_COMPONENT	= 1
 MODULE_NAME	= Browser_Embedding_Module
 EXPORT_LIBRARY	= 1
-GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 
 
 CPPSRCS		= \
 		nsWebBrowserModule.cpp		\
 		$(NULL)
 
 SHARED_LIBRARY_LIBS= \
--- a/embedding/browser/webBrowser/Makefile.in
+++ b/embedding/browser/webBrowser/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= nsWebBrowser_s
-GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 
 
 
 EXPORTS         = \
                 nsCTooltipTextProvider.h \
                 $(NULL)
 
--- a/embedding/components/build/Makefile.in
+++ b/embedding/components/build/Makefile.in
@@ -9,17 +9,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= embedcomponents
 EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= embedcmp
 IS_COMPONENT	= 1
 MODULE_NAME	= embedcomponents
-GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 
 CPPSRCS		= nsEmbeddingModule.cpp
 
 SHARED_LIBRARY_LIBS = \
 	../windowwatcher/src/$(LIB_PREFIX)windowwatcher_s.$(LIB_SUFFIX) \
 	../appstartup/src/$(LIB_PREFIX)appstartupnotifier_s.$(LIB_SUFFIX) \
 	../find/src/$(LIB_PREFIX)find_s.$(LIB_SUFFIX) \
--- a/embedding/components/webbrowserpersist/public/Makefile.in
+++ b/embedding/components/webbrowserpersist/public/Makefile.in
@@ -5,12 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/embedding/components/windowwatcher/public/Makefile.in
+++ b/embedding/components/windowwatcher/public/Makefile.in
@@ -6,15 +6,14 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 EXPORTS		= nsPromptUtils.h \
                   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
--- a/extensions/cookie/Makefile.in
+++ b/extensions/cookie/Makefile.in
@@ -9,17 +9,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= cookie
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsCookieModule
-GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 
 
 CPPSRCS		= \
 		nsCookieModule.cpp \
 		nsPermission.cpp \
 		nsPermissionManager.cpp \
 		nsPopupWindowManager.cpp \
--- a/gfx/qcms/Makefile.in
+++ b/gfx/qcms/Makefile.in
@@ -6,17 +6,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = mozqcms
 LIBXUL_LIBRARY = 1
-GRE_MODULE      = 1
 
 EXPORTS      = qcms.h qcmstypes.h
 
 CSRCS = \
   chain.c \
   iccread.c \
   matrix.c \
   transform.c \
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -8,17 +8,16 @@ topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME    = nsGfxModule
 LIBRARY_NAME   = gkgfx
 EXPORT_LIBRARY = 1
-GRE_MODULE     = 1
 LIBXUL_LIBRARY = 1
 IS_COMPONENT   = 1
 ifndef _MSC_VER
 FAIL_ON_WARNINGS = 1
 endif # !_MSC_VER
 
 EXPORTS	= \
 	gfxCore.h \
--- a/image/build/Makefile.in
+++ b/image/build/Makefile.in
@@ -9,17 +9,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= imglib2
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsImageLib2Module
-GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 CPPSRCS = \
 		nsImageModule.cpp \
 		$(NULL)
 
 LOCAL_INCLUDES	= \
--- a/image/public/Makefile.in
+++ b/image/public/Makefile.in
@@ -5,14 +5,13 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 EXPORTS		= ImageLogging.h
 
 include $(topsrcdir)/config/rules.mk
 
--- a/image/src/Makefile.in
+++ b/image/src/Makefile.in
@@ -8,17 +8,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= imglib2_s
 FORCE_STATIC_LIB = 1
 MODULE_NAME	= nsImageLib2Module
-GRE_MODULE	= 1
 LIBXUL_LIBRARY  = 1
 FAIL_ON_WARNINGS = 1
 
 
 EXPORTS		=  imgLoader.h \
 		   imgRequest.h \
 		   imgRequestProxy.h \
 		   $(NULL)
--- a/intl/build/Makefile.in
+++ b/intl/build/Makefile.in
@@ -8,17 +8,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= i18n
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsI18nModule
-GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 
 
 CPPSRCS		= \
 			nsI18nModule.cpp \
 			$(NULL)
 
 # see also intl/locale/src/Makefile.in
--- a/intl/chardet/src/Makefile.in
+++ b/intl/chardet/src/Makefile.in
@@ -9,17 +9,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= chardet
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 MODULE_NAME = nsChardetModule
-GRE_MODULE = 1
 LIBXUL_LIBRARY  = 1
 
 
 CPPSRCS		= \
 		nsCyrillicDetector.cpp \
 		nsChardetModule.cpp \
 		$(NULL)
 
--- a/intl/locale/idl/Makefile.in
+++ b/intl/locale/idl/Makefile.in
@@ -5,12 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/intl/strres/public/Makefile.in
+++ b/intl/strres/public/Makefile.in
@@ -5,12 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/intl/uconv/idl/Makefile.in
+++ b/intl/uconv/idl/Makefile.in
@@ -5,11 +5,10 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
--- a/intl/uconv/src/Makefile.in
+++ b/intl/uconv/src/Makefile.in
@@ -9,17 +9,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= uconv
 EXPORT_LIBRARY  = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsUConvModule
-GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 # To avoid conflict with OS/2 system uconv.dll
 SHORT_LIBNAME  = mozuconv
 
 CPPSRCS		= \
 		nsUConvModule.cpp \
 		nsConverterInputStream.cpp \
 		nsConverterOutputStream.cpp \
--- a/intl/unicharutil/idl/Makefile.in
+++ b/intl/unicharutil/idl/Makefile.in
@@ -5,12 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/js/ductwork/debugger/Makefile.in
+++ b/js/ductwork/debugger/Makefile.in
@@ -6,17 +6,16 @@ DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = jsdebugger
-GRE_MODULE = 1
 
 LIBRARY_NAME = jsdebugger
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 
 CPPSRCS = \
   JSDebugger.cpp \
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -8,17 +8,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 
 run_for_side_effects := $(shell echo "MAKE: $(MAKE)")
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	    = mozjs
 STATIC_LIBRARY_NAME = js_static
-GRE_MODULE	    = 1
 
 LIBS		= $(NSPR_LIBS)
 
 # JavaScript must be built shared, even for static builds, as it is used by
 # other modules which are always built shared. Failure to do so results in
 # the js code getting copied into xpinstall and jsd as well as mozilla-bin,
 # and then the static data cells used for locking no longer work.
 #
--- a/js/xpconnect/idl/Makefile.in
+++ b/js/xpconnect/idl/Makefile.in
@@ -5,12 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/layout/base/Makefile.in
+++ b/layout/base/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 LIBRARY_NAME	= gkbase_s
 LIBXUL_LIBRARY	= 1
 ifndef _MSC_VER
 FAIL_ON_WARNINGS = 1
 endif # !_MSC_VER
 
 
 
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -14,17 +14,16 @@ include $(DEPTH)/config/autoconf.mk
 ifeq ($(OS_ARCH),SunOS)
 SHELL := ksh
 endif
 
 LIBRARY_NAME	= gklayout
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsLayoutModule
-GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 ifndef _MSC_VER
 FAIL_ON_WARNINGS = 1
 endif # !_MSC_VER
 
 
 CPPSRCS		= \
 		nsLayoutModule.cpp \
--- a/layout/printing/Makefile.in
+++ b/layout/printing/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 LIBRARY_NAME	= gkprinting_s
 LIBXUL_LIBRARY	= 1
 ifndef _MSC_VER
 FAIL_ON_WARNINGS = 1
 endif # !_MSC_VER
 
 CPPSRCS		= \
 		nsPrintEngine.cpp \
--- a/layout/tools/layout-debug/src/Makefile.in
+++ b/layout/tools/layout-debug/src/Makefile.in
@@ -10,17 +10,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkdebug
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsLayoutDebugModule
 LIBXUL_LIBRARY	= 1
-GRE_MODULE	= 1
 FAIL_ON_WARNINGS = 1
 
 
 EXPORTS		= \
 		nsLayoutDebugCIID.h \
 		$(NULL)
 
 CPPSRCS		= \
--- a/layout/xul/base/public/Makefile.in
+++ b/layout/xul/base/public/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 EXPORTS		= \
 		nsPIBoxObject.h \
 		nsIScrollbarMediator.h \
 		nsXULPopupManager.h \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/modules/libjar/Makefile.in
+++ b/modules/libjar/Makefile.in
@@ -10,17 +10,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(srcdir)/objs.mk
 
 LIBRARY_NAME	= jar$(VERSION_NUMBER)
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsJarModule
-GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 
 CPPSRCS		= $(MODULES_LIBJAR_LCPPSRCS)
 
 EXPORTS		= $(MODULES_LIBJAR_LEXPORTS)
 
--- a/modules/libpref/public/Makefile.in
+++ b/modules/libpref/public/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 EXPORTS_NAMESPACES = mozilla
 
 EXPORTS_mozilla = \
               Preferences.h \
               $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/modules/libpref/src/Makefile.in
+++ b/modules/libpref/src/Makefile.in
@@ -9,17 +9,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= pref
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsPrefModule
-GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 
 CPPSRCS		= \
 			  nsPrefBranch.cpp	\
 			  nsPrefsFactory.cpp	\
 			  prefapi.cpp \
 			  prefread.cpp \
 			  Preferences.cpp	\
--- a/netwerk/base/public/Makefile.in
+++ b/netwerk/base/public/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 EXPORTS		= \
 		netCore.h \
 		nsNetUtil.h \
 		nsNetStrings.h \
 		nsChannelProperties.h \
 		nsURIHashKey.h \
 		nsReadLine.h \
--- a/netwerk/build/Makefile.in
+++ b/netwerk/build/Makefile.in
@@ -9,17 +9,16 @@ srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = necko
 EXPORT_LIBRARY = 1
 IS_COMPONENT   = 1
 MODULE_NAME    = necko
-GRE_MODULE     = 1
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
 CPPSRCS = nsNetModule.cpp
 EXPORTS = nsNetCID.h
 
 SHARED_LIBRARY_LIBS = \
   ../base/src/$(LIB_PREFIX)neckobase_s.$(LIB_SUFFIX) \
--- a/netwerk/cache/Makefile.in
+++ b/netwerk/cache/Makefile.in
@@ -7,17 +7,16 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = nkcache_s
 LIBXUL_LIBRARY = 1
-GRE_MODULE     = 1
 FAIL_ON_WARNINGS := 1
 
 FORCE_STATIC_LIB = 1
 
 EXPORTS = \
   nsCacheService.h \
   nsApplicationCacheService.h \
   $(NULL)
--- a/netwerk/cookie/Makefile.in
+++ b/netwerk/cookie/Makefile.in
@@ -7,17 +7,16 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 # export required interfaces, even if --disable-cookies has been given
-GRE_MODULE   = 1
 FAIL_ON_WARNINGS := 1
 
 ifdef NECKO_COOKIES
 LIBRARY_NAME     = neckocookie_s
 LIBXUL_LIBRARY   = 1
 FORCE_STATIC_LIB = 1
 CPPSRCS = \
   nsCookie.cpp \
--- a/netwerk/dns/Makefile.in
+++ b/netwerk/dns/Makefile.in
@@ -7,17 +7,16 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = neckodns_s
 LIBXUL_LIBRARY = 1
-GRE_MODULE     = 1
 FAIL_ON_WARNINGS := 1
 
 CPPSRCS = \
   DNS.cpp \
   nsIDNService.cpp \
   nsHostResolver.cpp \
   nsDNSService2.cpp \
   nsEffectiveTLDService.cpp \
--- a/netwerk/protocol/about/Makefile.in
+++ b/netwerk/protocol/about/Makefile.in
@@ -8,17 +8,16 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = nkabout_s
 LIBXUL_LIBRARY = 1
-GRE_MODULE     = 1
 
 FORCE_STATIC_LIB = 1
 
 EXPORTS = nsAboutProtocolUtils.h
 
 CPPSRCS = \
   nsAboutProtocolHandler.cpp \
   nsAboutBlank.cpp \
--- a/netwerk/protocol/file/Makefile.in
+++ b/netwerk/protocol/file/Makefile.in
@@ -8,17 +8,16 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 FAIL_ON_WARNINGS = 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = nkfile_s
 LIBXUL_LIBRARY = 1
-GRE_MODULE     = 1
 
 FORCE_STATIC_LIB = 1
 
 CPPSRCS = \
   nsFileProtocolHandler.cpp \
   nsFileChannel.cpp \
   $(NULL)
 
--- a/netwerk/protocol/ftp/Makefile.in
+++ b/netwerk/protocol/ftp/Makefile.in
@@ -8,17 +8,16 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 FAIL_ON_WARNINGS = 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = nkftp_s
 LIBXUL_LIBRARY = 1
-GRE_MODULE     = 1
 
 FORCE_STATIC_LIB = 1
 
 EXPORTS = ftpCore.h
 
 EXPORTS_NAMESPACES = mozilla/net
 
 EXPORTS_mozilla/net += \
--- a/netwerk/protocol/http/Makefile.in
+++ b/netwerk/protocol/http/Makefile.in
@@ -7,17 +7,16 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = nkhttp_s
 LIBXUL_LIBRARY = 1
-GRE_MODULE     = 1
 FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
 EXPORTS_NAMESPACES = mozilla/net
 
 EXPORTS_mozilla/net = \
   HttpBaseChannel.h \
   $(NULL)
--- a/netwerk/protocol/res/Makefile.in
+++ b/netwerk/protocol/res/Makefile.in
@@ -7,17 +7,16 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = nkres_s
 LIBXUL_LIBRARY = 1
-GRE_MODULE     = 1
 FAIL_ON_WARNINGS = 1
 
 FORCE_STATIC_LIB = 1
 
 CPPSRCS = \
   nsResProtocolHandler.cpp \
   $(NULL)
 
--- a/netwerk/protocol/viewsource/Makefile.in
+++ b/netwerk/protocol/viewsource/Makefile.in
@@ -8,17 +8,16 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 FAIL_ON_WARNINGS = 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = nkviewsource_s
 LIBXUL_LIBRARY = 1
-GRE_MODULE     = 1
 
 FORCE_STATIC_LIB = 1
 
 CPPSRCS = \
   nsViewSourceHandler.cpp \
   nsViewSourceChannel.cpp \
   $(NULL)
 
--- a/netwerk/protocol/websocket/Makefile.in
+++ b/netwerk/protocol/websocket/Makefile.in
@@ -6,17 +6,16 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = nkwebsocket_s
 LIBXUL_LIBRARY = 1
-GRE_MODULE     = 1
 FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS = 1
 
 EXPORTS_NAMESPACES = mozilla/net
 
 CPPSRCS = \
   WebSocketChannel.cpp \
   WebSocketChannelParent.cpp \
--- a/netwerk/protocol/wyciwyg/Makefile.in
+++ b/netwerk/protocol/wyciwyg/Makefile.in
@@ -6,17 +6,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= nkwyciwyg_s
 LIBXUL_LIBRARY	= 1
-GRE_MODULE	= 1
 FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS = 1
 
 EXPORTS_NAMESPACES = mozilla/net
 
 EXPORTS_mozilla/net += \
   WyciwygChannelParent.h \
   WyciwygChannelChild.h  \
--- a/netwerk/sctp/datachannel/Makefile.in
+++ b/netwerk/sctp/datachannel/Makefile.in
@@ -7,17 +7,16 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = nkdatachan_s
 LIBXUL_LIBRARY = 1
-GRE_MODULE     = 1
 FORCE_STATIC_LIB = 1
 
 EXPORTS_NAMESPACES = mozilla/net
 
 CPPSRCS = \
   DataChannel.cpp \
   $(NULL)
 
--- a/netwerk/sctp/src/Makefile.in
+++ b/netwerk/sctp/src/Makefile.in
@@ -11,17 +11,16 @@ VPATH     = \
   @srcdir@/netinet \
   @srcdir@/netinet6 \
   $(NULL)
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = nksctp_s
 LIBXUL_LIBRARY = 1
-GRE_MODULE     = 1
 FORCE_STATIC_LIB = 1
 
 EXPORTS_NAMESPACES = mozilla/net
 
 ifeq ($(OS_TARGET),Android)
 CPPSRCS = \
   ifaddrs_android.cpp \
   $(NULL)
--- a/netwerk/srtp/src/Makefile.in
+++ b/netwerk/srtp/src/Makefile.in
@@ -17,17 +17,16 @@ VPATH = \
   @srcdir@/crypto/replay \
   @srcdir@/crypto/rng \
   $(NULL)
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = nksrtp_s
 LIBXUL_LIBRARY = 1
-GRE_MODULE = 1
 FORCE_STATIC_LIB = 1
 
 EXPORTS_NAMESPACES = mozilla/net
 
 CSRCS := \
   ekt.c \
   srtp.c \
   aes.c \
--- a/netwerk/streamconv/public/Makefile.in
+++ b/netwerk/streamconv/public/Makefile.in
@@ -6,14 +6,13 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
 
--- a/netwerk/wifi/Makefile.in
+++ b/netwerk/wifi/Makefile.in
@@ -6,17 +6,16 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = neckowifi_s
 LIBXUL_LIBRARY = 1
-GRE_MODULE     = 1
 
 FORCE_STATIC_LIB = 1
 
 ifneq ($(OS_ARCH),Darwin)
 # osx_corewlan.mm has warnings I don't understand.
 FAIL_ON_WARNINGS := 1
 endif
 
old mode 100755
new mode 100644
--- a/parser/htmlparser/public/Makefile.in
+++ b/parser/htmlparser/public/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH       = @DEPTH@
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 EXPORTS = \
 		nsIContentSink.h            \
 		nsITokenizer.h              \
 		nsIHTMLContentSink.h        \
 		nsIFragmentContentSink.h    \
 		nsIParserNode.h             \
 		nsIParser.h                 \
--- a/parser/htmlparser/src/Makefile.in
+++ b/parser/htmlparser/src/Makefile.in
@@ -9,17 +9,16 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = htmlpars
 EXPORT_LIBRARY = 1
 IS_COMPONENT   = 1
 MODULE_NAME	   = nsParserModule
 SHORT_LIBNAME  = gkparser
-GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 
 
 SHARED_LIBRARY_LIBS = \
 		$(DEPTH)/parser/xml/src/$(LIB_PREFIX)saxp.$(LIB_SUFFIX) \
 		$(NULL)
 
 CPPSRCS = \
--- a/rdf/base/idl/Makefile.in
+++ b/rdf/base/idl/Makefile.in
@@ -5,12 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/rdf/build/Makefile.in
+++ b/rdf/build/Makefile.in
@@ -9,17 +9,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= rdf
 EXPORT_LIBRARY  = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsRDFModule
-GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 
 CPPSRCS		= \
 		nsRDFModule.cpp \
 		$(NULL)
 
 # XXX Note dependencies on implementation headers for factory functions
 
--- a/security/manager/boot/public/Makefile.in
+++ b/security/manager/boot/public/Makefile.in
@@ -4,11 +4,10 @@
 
 DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
--- a/security/manager/boot/src/Makefile.in
+++ b/security/manager/boot/src/Makefile.in
@@ -8,17 +8,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= pipboot
 IS_COMPONENT	= 1
 MODULE_NAME	= BOOT
 EXPORT_LIBRARY	= 1
-GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
 CPPSRCS = \
 	nsEntropyCollector.cpp \
 	nsSecureBrowserUIImpl.cpp \
 	nsBOOTModule.cpp \
 	nsSecurityWarningDialogs.cpp \
--- a/security/manager/pki/public/Makefile.in
+++ b/security/manager/pki/public/Makefile.in
@@ -5,11 +5,10 @@
 
 DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
--- a/security/manager/pki/src/Makefile.in
+++ b/security/manager/pki/src/Makefile.in
@@ -10,17 +10,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= pippki
 IS_COMPONENT	= 1
 MODULE_NAME	= PKI
 EXPORT_LIBRARY	= 1
-GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
 CPPSRCS = \
 	nsNSSDialogs.cpp \
 	nsPKIModule.cpp \
 	nsPKIParamBlock.cpp \
         nsASN1Tree.cpp \
--- a/security/manager/ssl/public/Makefile.in
+++ b/security/manager/ssl/public/Makefile.in
@@ -5,11 +5,10 @@
 
 DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
--- a/security/manager/ssl/src/Makefile.in
+++ b/security/manager/ssl/src/Makefile.in
@@ -10,17 +10,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= pipnss
 IS_COMPONENT	= 1
 MODULE_NAME	= NSS
 EXPORT_LIBRARY	= 1
-GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 
 CPPSRCS = 				\
 	CryptoTask.cpp \
 	JARSignatureVerification.cpp \
 	nsCERTValInParamWrapper.cpp     \
 	nsNSSCleaner.cpp                \
 	nsCertOverrideService.cpp   \
--- a/startupcache/Makefile.in
+++ b/startupcache/Makefile.in
@@ -11,17 +11,16 @@ VPATH = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = StartupCacheModule
 LIBRARY_NAME = startupcache
 SHORT_LIBNAME = scache
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY = 1
 IS_COMPONENT = 1
-GRE_MODULE = 1
 
 CPPSRCS = StartupCache.cpp \
   StartupCacheUtils.cpp \
   StartupCacheModule.cpp \
   $(NULL)
 
 EXPORTS_NAMESPACES = mozilla/scache
 EXPORTS_mozilla/scache = StartupCache.h \
--- a/storage/public/Makefile.in
+++ b/storage/public/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE   = 1
 
 # NOTE When adding something to this list, you probably need to add it to the
 #      storage.h file too.
 EXPORTS_NAMESPACES = mozilla mozilla/storage
 
 EXPORTS = \
 	mozStorageHelper.h \
 	$(NULL)
--- a/storage/src/Makefile.in
+++ b/storage/src/Makefile.in
@@ -8,17 +8,16 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = storage_s
 MODULE_NAME      = mozStorageModule
 FORCE_STATIC_LIB = 1
-GRE_MODULE       = 1
 LIBXUL_LIBRARY = 1
 
 # TODO: we do this in crashreporter and xpcom/base too, should be centralized
 ifeq ($(OS_ARCH),Linux)
 DEFINES += -DXP_LINUX
 endif
 
 # Don't use the jemalloc allocator on Android, because we can't guarantee
--- a/toolkit/components/ctypes/Makefile.in
+++ b/toolkit/components/ctypes/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = jsctypes
-GRE_MODULE = 1
 
 EXTRA_JS_MODULES = \
     ctypes.jsm \
     $(NULL)
 
 LIBRARY_NAME = jsctypes
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
--- a/toolkit/components/perf/Makefile.in
+++ b/toolkit/components/perf/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = jsperf
-GRE_MODULE = 1
 
 EXTRA_JS_MODULES = \
     PerfMeasurement.jsm \
     $(NULL)
 
 LIBRARY_NAME = jsperf
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
--- a/toolkit/components/reflect/Makefile.in
+++ b/toolkit/components/reflect/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = jsreflect
-GRE_MODULE = 1
 
 EXTRA_JS_MODULES = \
     reflect.jsm \
     $(NULL)
 
 LIBRARY_NAME = jsreflect
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
--- a/toolkit/components/telemetry/Makefile.in
+++ b/toolkit/components/telemetry/Makefile.in
@@ -8,17 +8,16 @@ topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 USE_RCS_MK := 1
 include $(topsrcdir)/config/makefiles/rcs.mk
 
 MODULE_NAME = telemetry
-GRE_MODULE = 1
 
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 ifndef _MSC_VER
 # Note: Bug 851306 tracks the MSVC-only build warnings in this directory.
 FAIL_ON_WARNINGS = 1
 endif # !_MSC_VER
--- a/toolkit/components/typeaheadfind/Makefile.in
+++ b/toolkit/components/typeaheadfind/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = fastfind_s
-GRE_MODULE = 1
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 CPPSRCS = \
   nsTypeAheadFind.cpp \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/devtools/debugger/Makefile.in
+++ b/toolkit/devtools/debugger/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = jsinspector
-GRE_MODULE = 1
 
 LIBRARY_NAME = jsinspector
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 
 CPPSRCS = \
     nsJSInspector.cpp \
--- a/toolkit/identity/Makefile.in
+++ b/toolkit/identity/Makefile.in
@@ -11,17 +11,16 @@ include $(DEPTH)/config/autoconf.mk
 
 FAIL_ON_WARNINGS := 1
 
 MODULE_NAME = identity
 LIBRARY_NAME = identity
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 IS_COMPONENT = 1
-GRE_MODULE = 1
 EXPORT_LIBRARY = 1
 
 CPPSRCS = \
   IdentityCryptoService.cpp \
   $(NULL)
 
 EXTRA_JS_MODULES = \
 	IdentityUtils.jsm \
--- a/toolkit/library/winvccorlib/Makefile.in
+++ b/toolkit/library/winvccorlib/Makefile.in
@@ -3,17 +3,16 @@
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DEPTH     = @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 LIBRARY_NAME	= dummyvccorlib
-GRE_MODULE   = 1
 
 include $(DEPTH)/config/autoconf.mk
 
 FORCE_SHARED_LIB=1
 
 CPPSRCS	= \
 	dummyvccorlib.cpp \
 	$(NULL)
--- a/toolkit/system/androidproxy/Makefile.in
+++ b/toolkit/system/androidproxy/Makefile.in
@@ -9,17 +9,16 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = androidproxy
 
 EXPORT_LIBRARY  = 1
 IS_COMPONENT    = 1
 MODULE_NAME     = nsAndroidProxyModule
-GRE_MODULE      = 1
 LIBXUL_LIBRARY  = 1
 
 
 CPPSRCS = \
         nsAndroidSystemProxySettings.cpp \
         $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/system/dbus/Makefile.in
+++ b/toolkit/system/dbus/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = dbusservice
-GRE_MODULE = 1
 #EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 FORCE_SHARED_LIB = 1
 
 
 EXTRA_DSO_LDOPTS = \
 	$(XPCOM_GLUE_LDOPTS) \
 	$(NSPR_LIBS) \
--- a/toolkit/system/osxproxy/Makefile.in
+++ b/toolkit/system/osxproxy/Makefile.in
@@ -9,16 +9,15 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = osxproxy
 
 EXPORT_LIBRARY  = 1
 IS_COMPONENT    = 1
 MODULE_NAME     = nsOSXProxyModule
-GRE_MODULE      = 1
 LIBXUL_LIBRARY  = 1
 
 CMMSRCS = \
         nsOSXSystemProxySettings.mm \
         $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/system/unixproxy/Makefile.in
+++ b/toolkit/system/unixproxy/Makefile.in
@@ -9,17 +9,16 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = unixproxy
 
 EXPORT_LIBRARY  = 1
 IS_COMPONENT    = 1
 MODULE_NAME     = nsUnixProxyModule
-GRE_MODULE      = 1
 LIBXUL_LIBRARY  = 1
 
 ifdef MOZ_ENABLE_LIBPROXY
 
 CPPSRCS = \
        nsLibProxySettings.cpp \
         $(NULL)
 
--- a/toolkit/system/windowsproxy/Makefile.in
+++ b/toolkit/system/windowsproxy/Makefile.in
@@ -9,17 +9,16 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = windowsproxy
 
 EXPORT_LIBRARY  = 1
 IS_COMPONENT    = 1
 MODULE_NAME     = nsWindowsProxyModule
-GRE_MODULE      = 1
 LIBXUL_LIBRARY  = 1
 
 
 CPPSRCS = \
         nsWindowsSystemProxySettings.cpp \
         $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/uriloader/base/Makefile.in
+++ b/uriloader/base/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= uriloaderbase_s
-GRE_MODULE	= 1
 LIBXUL_LIBRARY  = 1
 FAIL_ON_WARNINGS = 1
 
 
 CPPSRCS = 							\
 				nsURILoader.cpp 		\
 				nsDocLoader.cpp			\
 				$(NULL)
--- a/view/src/Makefile.in
+++ b/view/src/Makefile.in
@@ -8,17 +8,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkview_s
 FORCE_STATIC_LIB = 1
 MODULE_NAME	= nsViewModule
-GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS := 1
 
 DEFINES += -D_IMPL_NS_LAYOUT
 
 CPPSRCS		= \
 		nsView.cpp \
 		nsViewManager.cpp \
--- a/widget/Makefile.in
+++ b/widget/Makefile.in
@@ -3,17 +3,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@
 
-GRE_MODULE	= 1
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORTS_NAMESPACES = IPC mozilla
 
 EXPORTS_IPC = \
 		nsGUIEventIPC.h \
 		$(NULL)
--- a/widget/android/Makefile.in
+++ b/widget/android/Makefile.in
@@ -8,17 +8,16 @@ srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = widget_android
 EXPORT_LIBRARY  = 1
 IS_COMPONENT    = 1
 MODULE_NAME     = nsWidgetAndroidModule
-GRE_MODULE      = 1
 LIBXUL_LIBRARY  = 1
 FAIL_ON_WARNINGS := 1
 
 ifdef MOZ_ONLY_TOUCH_EVENTS
 DEFINES += -DMOZ_ONLY_TOUCH_EVENTS
 endif
 ifdef MOZ_WEBSMS_BACKEND
 DEFINES += -DMOZ_WEBSMS_BACKEND
--- a/widget/cocoa/Makefile.in
+++ b/widget/cocoa/Makefile.in
@@ -9,17 +9,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= widget_mac
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsWidgetMacModule
-GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 
 
 
 EXPORTS = \
 		mozView.h \
 		nsChangeObserver.h \
 		nsCocoaUtils.h \
--- a/widget/gonk/Makefile.in
+++ b/widget/gonk/Makefile.in
@@ -22,17 +22,16 @@ VPATH           = \
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORTS         = OrientationObserver.h
 LIBRARY_NAME    = widget_gonk
 EXPORT_LIBRARY  = 1
 IS_COMPONENT    = 1
 MODULE_NAME     = nsWidgetGonkModule
-GRE_MODULE      = 1
 LIBXUL_LIBRARY  = 1
 
 
 CPPSRCS	= \
 	Framebuffer.cpp \
 	HWComposer.cpp \
 	HwcComposer2D.cpp \
 	nsAppShell.cpp \
--- a/widget/gtk2/Makefile.in
+++ b/widget/gtk2/Makefile.in
@@ -9,17 +9,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= widget_gtk2
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsWidgetGtk2Module
-GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 
 NATIVE_THEME_SUPPORT = 1
 
 
 
 CSRCS		= \
 		mozcontainer.c \
--- a/widget/os2/Makefile.in
+++ b/widget/os2/Makefile.in
@@ -10,17 +10,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= wdgtos2
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 RESFILE		= widget.res
 MODULE_NAME	= nsWidgetOS2Module
-GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 
 
 CPPSRCS		= \
 		nsAppShell.cpp \
 		nsBidiKeyboard.cpp \
 		nsClipboard.cpp \
 		nsFilePicker.cpp \
--- a/widget/qt/Makefile.in
+++ b/widget/qt/Makefile.in
@@ -9,17 +9,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= widget_qt
 EXPORT_LIBRARY = 1
 IS_COMPONENT    = 1
 MODULE_NAME	= nsWidgetQtModule
-GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 
 
 MOCSRCS = \
 		moc_moziqwidget.cpp \
 		moc_mozqwidget.cpp \
 		moc_nsAppShell.cpp \
 		$(NULL)
--- a/xpcom/Makefile.in
+++ b/xpcom/Makefile.in
@@ -5,15 +5,14 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 # xpcom-config.h is generated by configure
 SDK_HEADERS	= xpcom-config.h
 
 include $(topsrcdir)/config/rules.mk
 
--- a/xpcom/base/Makefile.in
+++ b/xpcom/base/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= xpcombase_s
-GRE_MODULE	= 1
 MOZILLA_INTERNAL_API =1
 LIBXUL_LIBRARY = 1
 
 # TODO: we do this in crashreporter and storage/src too, should be centralized
 ifeq ($(OS_ARCH),Linux)
 DEFINES += -DXP_LINUX
 endif
 
--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@@ -14,17 +14,16 @@ include $(srcdir)/../glue/objs.mk
 
 EXTRA_DEPS += $(srcdir)/../glue/objs.mk
 
 LIBRARY_NAME	= xpcom_core
 SHORT_LIBNAME	= xpcomcor
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
-GRE_MODULE	= 1
 MOZILLA_INTERNAL_API = 1
 
 ifeq ($(OS_ARCH),Linux)
 DEFINES += -DXP_LINUX
 endif
 
 ifeq (Darwin, $(OS_ARCH))
 CSRCS = mach_override.c
--- a/xpcom/components/Makefile.in
+++ b/xpcom/components/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= xpcomcomponents_s
-GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 MOZILLA_INTERNAL_API = 1
 
 EXPORTS_NAMESPACES = mozilla
 
 EXPORTS	= \
   nsCategoryManagerUtils.h \
   $(NULL)
--- a/xpcom/ds/Makefile.in
+++ b/xpcom/ds/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= xpcomds_s
-GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 MOZILLA_INTERNAL_API = 1
 
 
 CPPSRCS		= \
 		nsArray.cpp \
 		nsAtomTable.cpp \
 		nsAtomService.cpp \
--- a/xpcom/io/Makefile.in
+++ b/xpcom/io/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= xpcomio_s
-GRE_MODULE	= 1
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY  = 1
 
 # work around bug 408258
 ifdef GNU_CC 
 ifneq ($(OS_ARCH), Darwin)
 MODULE_OPTIMIZE_FLAGS = $(MOZ_OPTIMIZE_FLAGS) -fno-strict-aliasing
 endif
--- a/xpcom/reflect/xptinfo/public/Makefile.in
+++ b/xpcom/reflect/xptinfo/public/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 EXPORTS		= \
 		xptinfo.h \
 		$(NULL)
 
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
--- a/xpcom/stub/Makefile.in
+++ b/xpcom/stub/Makefile.in
@@ -13,17 +13,16 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME	= xpcom
 
 # The XPCOM glue uses realpath() on libxpcom.so to resolve any symlinks. We
 # want it to find dist/bin and not xpcom/stub so we copy instead of symlinking.
 NSDISTMODE = copy
 
 # Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list
 #EXPORT_LIBRARY = 1
-GRE_MODULE	= 1
 MOZILLA_INTERNAL_API = 1
 
 
 LOCAL_INCLUDES	= -I$(srcdir)/../build
 
 CPPSRCS		= nsXPComStub.cpp
 
 # If we have an import library, then copy that to the SDK.  Otherwise,
--- a/xpcom/threads/Makefile.in
+++ b/xpcom/threads/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= xpcomthreads_s
-GRE_MODULE	= 1
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 
 EXPORTS_NAMESPACES = mozilla
 
 CPPSRCS		= \
 		nsEventQueue.cpp \
 		nsEnvironment.cpp \
--- a/xpfe/appshell/public/Makefile.in
+++ b/xpfe/appshell/public/Makefile.in
@@ -5,16 +5,15 @@
 
 DEPTH		=@DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MODULE	= 1
 
 EXPORTS		= \
 		nsAppShellCID.h \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
--- a/xpfe/appshell/src/Makefile.in
+++ b/xpfe/appshell/src/Makefile.in
@@ -10,17 +10,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 IS_COMPONENT=1
 MODULE_NAME	= appshell
 LIBRARY_NAME	= nsappshell
 EXPORT_LIBRARY  = 1
 SHORT_LIBNAME	= appshell
-GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 
 
 CPPSRCS		= \
 		nsChromeTreeOwner.cpp \
 		nsContentTreeOwner.cpp \
 		nsXULWindow.cpp \
 		nsAppShellService.cpp \