diff --git a/mozilla/accessible/build/Makefile.in b/mozilla/accessible/build/Makefile.in
index 24dbdbccd81..84ff115593f 100644
--- a/mozilla/accessible/build/Makefile.in
+++ b/mozilla/accessible/build/Makefile.in
@@ -34,6 +34,8 @@ SHORT_LIBNAME	= access
 endif
 IS_COMPONENT	= 1
 MODULE_NAME	= nsAccessibilityModule
+GRE_MODULE	= 1
+
 REQUIRES = \
     xpcom \
     string \
diff --git a/mozilla/accessible/public/Makefile.in b/mozilla/accessible/public/Makefile.in
index ab7f9808142..c4908070c54 100644
--- a/mozilla/accessible/public/Makefile.in
+++ b/mozilla/accessible/public/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE    = accessibility
 XPIDL_MODULE= accessibility
+GRE_MODULE	= 1
 
 XPIDLSRCS = \
       nsIAccessibilityService.idl \
diff --git a/mozilla/caps/idl/Makefile.in b/mozilla/caps/idl/Makefile.in
index 000707c79d4..b4ed527a7bb 100644
--- a/mozilla/caps/idl/Makefile.in
+++ b/mozilla/caps/idl/Makefile.in
@@ -27,6 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= caps
+GRE_MODULE	= 1
 
 XPIDLSRCS	= \
 		nsIScriptSecurityManager.idl \
diff --git a/mozilla/caps/src/Makefile.in b/mozilla/caps/src/Makefile.in
index 8b38f5e5bca..b3ae183fcb2 100644
--- a/mozilla/caps/src/Makefile.in
+++ b/mozilla/caps/src/Makefile.in
@@ -31,6 +31,7 @@ LIBRARY_NAME	= caps
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsSecurityManagerModule
+GRE_MODULE	= 1
 
 REQUIRES	= xpcom \
 		  string \
diff --git a/mozilla/config/Makefile.in b/mozilla/config/Makefile.in
index 5557465b3fe..cc43eab5ca2 100644
--- a/mozilla/config/Makefile.in
+++ b/mozilla/config/Makefile.in
@@ -110,6 +110,9 @@ libs::
 	$(MAKE) -C $(DEPTH)/nsprpub real_install prefix=$(_ABS_DIST)/sdk/nspr exec_prefix=$(_ABS_DIST)/sdk/nspr bindir=$(_ABS_DIST)/sdk/nspr/bin includedir=$(_ABS_DIST)/sdk/nspr/include libdir=$(_ABS_DIST)/sdk/nspr/lib datadir=$(_ABS_DIST)/sdk/nspr/share DESTDIR=
 	$(RM) -rf $(DIST)/sdk/nspr/bin $(DIST)/sdk/nspr/share
 	mv $(DIST)/sdk/nspr/lib $(DIST)/sdk/nspr/bin
+ifndef DISABLE_DIST_GRE
+	$(INSTALL) $(DIST)/sdk/nspr/bin/$(LIB_PREFIX)*$(DLL_SUFFIX) $(GRE_DIST)
+endif
 endif
 
 # we don't use an explicit dependency here because then we would
diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk
index 7e13fbd5fbd..49a8ee106b3 100644
--- a/mozilla/config/config.mk
+++ b/mozilla/config/config.mk
@@ -43,6 +43,8 @@ include $(topsrcdir)/config/insure.mk
 endif
 endif
 
+GRE_DIST	= $(DIST)/gre
+
 #
 # The VERSION_NUMBER is suffixed onto the end of the DLLs we ship.
 # Since the longest of these is 5 characters without the suffix,
diff --git a/mozilla/config/rules.mk b/mozilla/config/rules.mk
index a406ff0b9d5..39df08d5137 100644
--- a/mozilla/config/rules.mk
+++ b/mozilla/config/rules.mk
@@ -521,6 +521,14 @@ OUTOPTION = -o # eol
 endif # WINNT && !GNU_CC
 endif # VACPP
 
+ifdef GRE_MODULE
+ifndef DISABLE_DIST_GRE
+ifdef GRE_DIRS_ONLY
+_SKIP_OLD_GRE_INSTALL=1
+endif
+endif
+endif
+
 ################################################################################
 
 all:: 
@@ -593,9 +601,7 @@ libs:: $(SUBMAKEFILES) $(MAKE_DIRS) $(HOST_LIBRARY) $(LIBRARY) $(SHARED_LIBRARY)
 ifndef NO_DIST_INSTALL
 ifneq (,$(BUILD_STATIC_LIBS)$(FORCE_STATIC_LIB))
 ifdef LIBRARY
-ifdef IS_COMPONENT
-	$(INSTALL) $(IFLAGS1) $(LIBRARY) $(DIST)/lib/$(COMPONENTS_PATH)
-else
+ifndef IS_COMPONENT
 	$(INSTALL) $(IFLAGS1) $(LIBRARY) $(DIST)/lib
 endif
 endif # LIBRARY
@@ -605,32 +611,58 @@ ifdef MAPS
 endif
 ifdef SHARED_LIBRARY
 ifdef IS_COMPONENT
-ifeq ($(OS_ARCH),OS2)
-	$(INSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(DIST)/lib/$(COMPONENTS_PATH)
-else
+ifdef GRE_MODULE
+ifndef DISABLE_DIST_GRE
+	$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(GRE_DIST)/$(COMPONENTS_PATH)
+	$(ELF_DYNSTR_GC) $(GRE_DIST)/$(COMPONENTS_PATH)/$(SHARED_LIBRARY)
+ifdef BEOS_ADDON_WORKAROUND
+	( cd $(GRE_DIST)/$(COMPONENTS_PATH) && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
+endif
+endif
+endif # GRE_MODULE
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 	$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/lib/$(COMPONENTS_PATH)
 	$(ELF_DYNSTR_GC) $(DIST)/lib/$(COMPONENTS_PATH)/$(SHARED_LIBRARY)
 endif
+ifndef _SKIP_OLD_GRE_INSTALL
 	$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/bin/$(COMPONENTS_PATH)
 	$(ELF_DYNSTR_GC) $(DIST)/bin/$(COMPONENTS_PATH)/$(SHARED_LIBRARY)
 ifdef BEOS_ADDON_WORKAROUND
-	( cd $(DIST)/bin/components && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
+	( cd $(DIST)/bin/$(COMPONENTS_PATH) && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
 endif
+endif # ! _SKIP_OLD_GRE_INSTALL
 else # ! IS_COMPONENT
+ifdef GRE_MODULE
+ifndef DISABLE_DIST_GRE
+	$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(GRE_DIST)
+ifdef BEOS_ADDON_WORKAROUND
+	( cd $(GRE_DIST) && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
+endif
+endif
+endif # GRE_MODULE
 ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 	$(INSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(DIST)/lib
 else
 	$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/lib
 endif
+ifndef _SKIP_OLD_GRE_INSTALL
 	$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/bin
 ifdef BEOS_ADDON_WORKAROUND
 	( cd $(DIST)/bin && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
 endif
+endif # ! _SKIP_OLD_GRE_INSTALL
 endif # IS_COMPONENT
 endif # SHARED_LIBRARY
 ifdef PROGRAM
+ifdef GRE_MODULE
+ifndef DISABLE_DIST_GRE
+	$(INSTALL) $(IFLAGS2) $(PROGRAM) $(GRE_DIST)
+endif
+endif
+ifndef _SKIP_OLD_GRE_INSTALL
 	$(INSTALL) $(IFLAGS2) $(PROGRAM) $(DIST)/bin
 endif
+endif
 ifdef SIMPLE_PROGRAMS
 	$(INSTALL) $(IFLAGS2) $(SIMPLE_PROGRAMS) $(DIST)/bin
 endif
@@ -1258,8 +1290,15 @@ $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(
 
 libs:: $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt
 ifndef NO_DIST_INSTALL
+ifdef GRE_MODULE
+ifndef DISABLE_DIST_GRE
+	$(INSTALL) $(IFLAGS1) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(GRE_DIST)/$(COMPONENTS_PATH)
+endif
+endif
+ifndef _SKIP_OLD_GRE_INSTALL
 	$(INSTALL) $(IFLAGS1) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(DIST)/bin/$(COMPONENTS_PATH)
 endif
+endif
 
 install:: $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt
 ifndef NO_INSTALL
diff --git a/mozilla/content/base/public/Makefile.in b/mozilla/content/base/public/Makefile.in
index 5ce32b31c3c..4045fab2a14 100644
--- a/mozilla/content/base/public/Makefile.in
+++ b/mozilla/content/base/public/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= content
 XPIDL_MODULE	= content_base
+GRE_MODULE	= 1
 
 EXPORTS		= \
 nsIContent.h \
diff --git a/mozilla/content/build/Makefile.in b/mozilla/content/build/Makefile.in
index 4c7f637ec2c..392a212ee66 100644
--- a/mozilla/content/build/Makefile.in
+++ b/mozilla/content/build/Makefile.in
@@ -36,10 +36,13 @@ SHORT_LIBNAME	= gkcontnt
 endif
 IS_COMPONENT	= 1
 MODULE_NAME	= nsContentModule
+GRE_MODULE	= 1
+
 EXTRA_DSO_LIBS	= gkgfx
 ifdef MOZ_PERF_METRICS
 EXTRA_DSO_LIBS += mozutil_s
 endif
+
 REQUIRES	= xpcom \
 		  string \
 		  gfx \
diff --git a/mozilla/content/xul/document/public/Makefile.in b/mozilla/content/xul/document/public/Makefile.in
index 3766c32dd72..e8c06417625 100644
--- a/mozilla/content/xul/document/public/Makefile.in
+++ b/mozilla/content/xul/document/public/Makefile.in
@@ -27,6 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xuldoc
+GRE_MODULE	= 1
 
 XPIDLSRCS	= \
 		nsIController.idl \
diff --git a/mozilla/docshell/base/Makefile.in b/mozilla/docshell/base/Makefile.in
index d482ab294ff..d4a6993d5af 100644
--- a/mozilla/docshell/base/Makefile.in
+++ b/mozilla/docshell/base/Makefile.in
@@ -30,6 +30,8 @@ ifeq ($(OS_ARCH),WINNT)
 XPIDL_MODULE	= docshell_base
 endif
 LIBRARY_NAME	= basedocshell_s
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  caps \
diff --git a/mozilla/docshell/build/Makefile.in b/mozilla/docshell/build/Makefile.in
index 46dfb58516a..0ed9e871c0d 100644
--- a/mozilla/docshell/build/Makefile.in
+++ b/mozilla/docshell/build/Makefile.in
@@ -31,6 +31,8 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= docshell
 EXPORT_LIBRARY = 1
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  dom \
diff --git a/mozilla/dom/public/Makefile.in b/mozilla/dom/public/Makefile.in
index 10c15142d1b..af63a7bebe7 100644
--- a/mozilla/dom/public/Makefile.in
+++ b/mozilla/dom/public/Makefile.in
@@ -27,6 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= dom
+GRE_MODULE	= 1
 
 DIRS		= idl coreEvents base
 
diff --git a/mozilla/dom/public/idl/base/Makefile.in b/mozilla/dom/public/idl/base/Makefile.in
index b7f242b2c37..fd843376609 100644
--- a/mozilla/dom/public/idl/base/Makefile.in
+++ b/mozilla/dom/public/idl/base/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= dom
 XPIDL_MODULE	= dom_base
+GRE_MODULE	= 1
 
 SDK_XPIDLSRCS =                                 \
 	nsIDOMBarProp.idl			\
diff --git a/mozilla/dom/public/idl/core/Makefile.in b/mozilla/dom/public/idl/core/Makefile.in
index a084844500b..1fd678ce16b 100644
--- a/mozilla/dom/public/idl/core/Makefile.in
+++ b/mozilla/dom/public/idl/core/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= dom
 XPIDL_MODULE	= dom_core
+GRE_MODULE	= 1
 
 SDK_XPIDLSRCS =                                 \
 	nsIDOMAttr.idl				\
diff --git a/mozilla/dom/public/idl/css/Makefile.in b/mozilla/dom/public/idl/css/Makefile.in
index fda78c2a93b..8de8ee14fec 100644
--- a/mozilla/dom/public/idl/css/Makefile.in
+++ b/mozilla/dom/public/idl/css/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= dom
 XPIDL_MODULE	= dom_css
+GRE_MODULE	= 1
 
 XPIDLSRCS =					\
 	nsIDOMCSS2Properties.idl		\
diff --git a/mozilla/dom/public/idl/events/Makefile.in b/mozilla/dom/public/idl/events/Makefile.in
index 14ffc4daaf3..44026ce6489 100644
--- a/mozilla/dom/public/idl/events/Makefile.in
+++ b/mozilla/dom/public/idl/events/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= dom
 XPIDL_MODULE	= dom_events
+GRE_MODULE	= 1
 
 SDK_XPIDLSRCS =                                 \
 	nsIDOMDocumentEvent.idl			\
diff --git a/mozilla/dom/public/idl/html/Makefile.in b/mozilla/dom/public/idl/html/Makefile.in
index 56be03af779..1bb05a9021a 100644
--- a/mozilla/dom/public/idl/html/Makefile.in
+++ b/mozilla/dom/public/idl/html/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= dom
 XPIDL_MODULE	= dom_html
+GRE_MODULE	= 1
 
 XPIDLSRCS =					\
 	nsIDOMHTMLAnchorElement.idl		\
diff --git a/mozilla/dom/public/idl/range/Makefile.in b/mozilla/dom/public/idl/range/Makefile.in
index 555f77f34cd..b1d1cfe9842 100644
--- a/mozilla/dom/public/idl/range/Makefile.in
+++ b/mozilla/dom/public/idl/range/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= dom
 XPIDL_MODULE	= dom_range
+GRE_MODULE	= 1
 
 XPIDLSRCS =					\
 	nsIDOMDocumentRange.idl			\
diff --git a/mozilla/dom/public/idl/stylesheets/Makefile.in b/mozilla/dom/public/idl/stylesheets/Makefile.in
index f6c41574797..039b0221b9c 100644
--- a/mozilla/dom/public/idl/stylesheets/Makefile.in
+++ b/mozilla/dom/public/idl/stylesheets/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= dom
 XPIDL_MODULE	= dom_stylesheets
+GRE_MODULE	= 1
 
 XPIDLSRCS =                                     \
 	nsIDOMDocumentStyle.idl			\
diff --git a/mozilla/dom/public/idl/traversal/Makefile.in b/mozilla/dom/public/idl/traversal/Makefile.in
index ebe2921f8f6..a35fd6b2cbd 100644
--- a/mozilla/dom/public/idl/traversal/Makefile.in
+++ b/mozilla/dom/public/idl/traversal/Makefile.in
@@ -40,6 +40,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= dom
 XPIDL_MODULE	= dom_traversal
+GRE_MODULE	= 1
 
 XPIDLSRCS =					\
 	nsIDOMDocumentTraversal.idl		\
diff --git a/mozilla/dom/public/idl/views/Makefile.in b/mozilla/dom/public/idl/views/Makefile.in
index 5b859cb3cbc..da65f2fe0bd 100644
--- a/mozilla/dom/public/idl/views/Makefile.in
+++ b/mozilla/dom/public/idl/views/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= dom
 XPIDL_MODULE	= dom_views
+GRE_MODULE	= 1
 
 XPIDLSRCS =                                     \
 	nsIDOMDocumentView.idl			\
diff --git a/mozilla/dom/public/idl/xbl/Makefile.in b/mozilla/dom/public/idl/xbl/Makefile.in
index 477ec3cc1cd..60597c0ff2b 100644
--- a/mozilla/dom/public/idl/xbl/Makefile.in
+++ b/mozilla/dom/public/idl/xbl/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= dom
 XPIDL_MODULE	= dom_xbl
+GRE_MODULE	= 1
 
 XPIDLSRCS =                                     \
 	nsIDOMDocumentXBL.idl			\
diff --git a/mozilla/dom/public/idl/xul/Makefile.in b/mozilla/dom/public/idl/xul/Makefile.in
index c57f4a788b3..655599a76f2 100644
--- a/mozilla/dom/public/idl/xul/Makefile.in
+++ b/mozilla/dom/public/idl/xul/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= dom
 XPIDL_MODULE	= dom_xul
+GRE_MODULE	= 1
 
 XPIDLSRCS =					\
 	nsIDOMXULButtonElement.idl              \
diff --git a/mozilla/dom/src/jsurl/Makefile.in b/mozilla/dom/src/jsurl/Makefile.in
index d5c725aeb71..7a9330bbd31 100644
--- a/mozilla/dom/src/jsurl/Makefile.in
+++ b/mozilla/dom/src/jsurl/Makefile.in
@@ -31,6 +31,8 @@ LIBRARY_NAME	= jsurl
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= javascript__protocol
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  js \
diff --git a/mozilla/editor/idl/Makefile.in b/mozilla/editor/idl/Makefile.in
index 286cd22c88b..244d040ca91 100644
--- a/mozilla/editor/idl/Makefile.in
+++ b/mozilla/editor/idl/Makefile.in
@@ -27,6 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= editor
+GRE_MODULE	= 1
 
 XPIDLSRCS	= \
 		nsICiter.idl \
diff --git a/mozilla/editor/libeditor/build/Makefile.in b/mozilla/editor/libeditor/build/Makefile.in
index 4874c223183..b51ed2b928b 100644
--- a/mozilla/editor/libeditor/build/Makefile.in
+++ b/mozilla/editor/libeditor/build/Makefile.in
@@ -33,6 +33,7 @@ LIBRARY_NAME	= editor
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsEditorModule
+GRE_MODULE	= 1
 
 EXTRA_DSO_LIBS	= gkgfx
 
diff --git a/mozilla/editor/txtsvc/public/Makefile.in b/mozilla/editor/txtsvc/public/Makefile.in
index 11a4277af50..39acae90502 100644
--- a/mozilla/editor/txtsvc/public/Makefile.in
+++ b/mozilla/editor/txtsvc/public/Makefile.in
@@ -27,6 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= txtsvc
+GRE_MODULE	= 1
 
 EXPORTS		= \
 		nsISpellChecker.h \
diff --git a/mozilla/embedding/browser/activex/src/control/Makefile.in b/mozilla/embedding/browser/activex/src/control/Makefile.in
index e2cd1ccd89c..82589001215 100644
--- a/mozilla/embedding/browser/activex/src/control/Makefile.in
+++ b/mozilla/embedding/browser/activex/src/control/Makefile.in
@@ -29,7 +29,7 @@ RESFILE		= MozillaControl.res
 DEFFILE		= L_mozctl.def
 EXPORT_LIBRARY	= 1
 FORCE_SHARED_LIB= 1
-
+GRE_MODULE	= 1
 
 REQUIRES = \
     xpcom \
diff --git a/mozilla/embedding/browser/activex/src/control_kicker/Makefile.in b/mozilla/embedding/browser/activex/src/control_kicker/Makefile.in
index 81875658930..6c09d6c0f97 100644
--- a/mozilla/embedding/browser/activex/src/control_kicker/Makefile.in
+++ b/mozilla/embedding/browser/activex/src/control_kicker/Makefile.in
@@ -28,6 +28,7 @@ LIBRARY_NAME	= mozctlx
 DEFFILE		= $(srcdir)/mozctlx.def
 EXPORT_LIBRARY	= 1
 FORCE_SHARED_LIB= 1
+GRE_MODULE	= 1
 
 CPPSRCS = \
 	StdAfx.cpp \
diff --git a/mozilla/embedding/browser/activex/src/plugin/Makefile.in b/mozilla/embedding/browser/activex/src/plugin/Makefile.in
index 58edfdf9f22..450490c8a3b 100644
--- a/mozilla/embedding/browser/activex/src/plugin/Makefile.in
+++ b/mozilla/embedding/browser/activex/src/plugin/Makefile.in
@@ -33,6 +33,8 @@ MODULE          = npmozax
 LIBRARY_NAME    = npmozax
 RESFILE         = MozActiveX.res
 DEFFILE         = npmozax.def
+GRE_MODULE	= 1
+
 REQUIRES = \
     xpcom \
     java \
diff --git a/mozilla/embedding/browser/build/Makefile.in b/mozilla/embedding/browser/build/Makefile.in
index 0312af85957..153c72c9f71 100644
--- a/mozilla/embedding/browser/build/Makefile.in
+++ b/mozilla/embedding/browser/build/Makefile.in
@@ -32,6 +32,8 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= webbrwsr
 EXPORT_LIBRARY = 1
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  docshell \
diff --git a/mozilla/embedding/browser/webBrowser/Makefile.in b/mozilla/embedding/browser/webBrowser/Makefile.in
index 4d5b4eca5f2..ebfd2111f17 100644
--- a/mozilla/embedding/browser/webBrowser/Makefile.in
+++ b/mozilla/embedding/browser/webBrowser/Makefile.in
@@ -26,6 +26,8 @@ VPATH		= @srcdir@
 MODULE		= webbrwsr
 XPIDL_MODULE	= webBrowser_core
 LIBRARY_NAME	= nsWebBrowser_s
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  docshell \
diff --git a/mozilla/embedding/components/build/Makefile.in b/mozilla/embedding/components/build/Makefile.in
index 1d33b2fddfe..005f3f087c4 100644
--- a/mozilla/embedding/components/build/Makefile.in
+++ b/mozilla/embedding/components/build/Makefile.in
@@ -31,6 +31,8 @@ SHORT_LIBNAME	= embedcmp
 endif
 IS_COMPONENT	= 1
 MODULE_NAME	= embedcomponents
+GRE_MODULE	= 1
+
 ifdef MOZ_PERF_METRICS
 EXTRA_DSO_LIBS	= mozutil_s
 endif
diff --git a/mozilla/embedding/components/webbrowserpersist/public/Makefile.in b/mozilla/embedding/components/webbrowserpersist/public/Makefile.in
index 19b5575900f..931b60beb95 100644
--- a/mozilla/embedding/components/webbrowserpersist/public/Makefile.in
+++ b/mozilla/embedding/components/webbrowserpersist/public/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= webbrowserpersist
 XPIDL_MODULE	= webbrowserpersist
+GRE_MODULE	= 1
 
 XPIDLSRCS	= nsIWebBrowserPersist.idl \
                   nsCWebBrowserPersist.idl \
diff --git a/mozilla/embedding/components/windowwatcher/public/Makefile.in b/mozilla/embedding/components/windowwatcher/public/Makefile.in
index 5fd89e34b3d..e30eb4b2027 100644
--- a/mozilla/embedding/components/windowwatcher/public/Makefile.in
+++ b/mozilla/embedding/components/windowwatcher/public/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= windowwatcher
 XPIDL_MODULE	= windowwatcher
+GRE_MODULE	= 1
 
 SDK_XPIDLSRCS   = nsIWindowWatcher.idl \
 		  $(NULL)
diff --git a/mozilla/extensions/cookie/Makefile.in b/mozilla/extensions/cookie/Makefile.in
index dca960f8344..211e983c89f 100644
--- a/mozilla/extensions/cookie/Makefile.in
+++ b/mozilla/extensions/cookie/Makefile.in
@@ -31,6 +31,8 @@ LIBRARY_NAME	= cookie
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsCookieModule
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  necko \
diff --git a/mozilla/extensions/typeaheadfind/public/Makefile.in b/mozilla/extensions/typeaheadfind/public/Makefile.in
index 96b1a87853a..a9ab4f0fc7c 100644
--- a/mozilla/extensions/typeaheadfind/public/Makefile.in
+++ b/mozilla/extensions/typeaheadfind/public/Makefile.in
@@ -33,6 +33,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE=typeaheadfind
 XPIDL_MODULE=typeaheadfind
+GRE_MODULE	= 1
 
 XPIDLSRCS= ./nsITypeAheadFind.idl \
   $(NULL)
diff --git a/mozilla/extensions/typeaheadfind/src/Makefile.in b/mozilla/extensions/typeaheadfind/src/Makefile.in
index 2a2895dcb94..ef34ac6120b 100644
--- a/mozilla/extensions/typeaheadfind/src/Makefile.in
+++ b/mozilla/extensions/typeaheadfind/src/Makefile.in
@@ -36,6 +36,7 @@ LIBRARY_NAME = typeaheadfind
 ifneq ($(OS_ARCH),WINNT)
 SHORT_LIBNAME = typahead
 endif
+GRE_MODULE	= 1
 
 REQUIRES        = appcomps \
 		  embedcomponents \
diff --git a/mozilla/extensions/wallet/public/Makefile.in b/mozilla/extensions/wallet/public/Makefile.in
index 66b8e18ffcb..17e49e68442 100644
--- a/mozilla/extensions/wallet/public/Makefile.in
+++ b/mozilla/extensions/wallet/public/Makefile.in
@@ -27,6 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= wallet
+GRE_MODULE	= 1
 
 SDK_XPIDLSRCS   = \
     nsIPassword.idl    \
diff --git a/mozilla/extensions/wallet/src/Makefile.in b/mozilla/extensions/wallet/src/Makefile.in
index 6efd72ba3d1..c0a40b53a66 100644
--- a/mozilla/extensions/wallet/src/Makefile.in
+++ b/mozilla/extensions/wallet/src/Makefile.in
@@ -31,6 +31,8 @@ LIBRARY_NAME	= wallet
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsWalletModule
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  necko \
diff --git a/mozilla/extensions/xmlextras/base/public/Makefile.in b/mozilla/extensions/xmlextras/base/public/Makefile.in
index 2641e967c95..f800a16b224 100644
--- a/mozilla/extensions/xmlextras/base/public/Makefile.in
+++ b/mozilla/extensions/xmlextras/base/public/Makefile.in
@@ -27,6 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xmlextras
+GRE_MODULE	= 1
 
 XPIDLSRCS	= \
 		nsIDOMSerializer.idl  \
diff --git a/mozilla/extensions/xmlextras/build/src/Makefile.in b/mozilla/extensions/xmlextras/build/src/Makefile.in
index d8bfe2e5a99..7fa3e04a062 100644
--- a/mozilla/extensions/xmlextras/build/src/Makefile.in
+++ b/mozilla/extensions/xmlextras/build/src/Makefile.in
@@ -34,6 +34,8 @@ SHORT_LIBNAME	= xmlextra
 endif
 IS_COMPONENT	= 1
 MODULE_NAME	= nsXMLExtrasModule
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  dom \
diff --git a/mozilla/gfx/idl/Makefile.in b/mozilla/gfx/idl/Makefile.in
index 8d751234f1c..280d327da56 100644
--- a/mozilla/gfx/idl/Makefile.in
+++ b/mozilla/gfx/idl/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= gfx
 XPIDL_MODULE	= gfx
+GRE_MODULE	= 1
 
 XPIDLSRCS	= \
 		nsIFontEnumerator.idl \
diff --git a/mozilla/gfx/src/Makefile.in b/mozilla/gfx/src/Makefile.in
index 3f5066cec72..49054df6ac9 100644
--- a/mozilla/gfx/src/Makefile.in
+++ b/mozilla/gfx/src/Makefile.in
@@ -31,6 +31,7 @@ EXPORTS         = nsFontList.h \
                   nsRegion.h
 LIBRARY_NAME    = gkgfx
 EXPORT_LIBRARY = 1
+GRE_MODULE	= 1
 REQUIRES	= xpcom \
 		  windowwatcher \
 		  dom \
diff --git a/mozilla/gfx/src/beos/Makefile.in b/mozilla/gfx/src/beos/Makefile.in
index 540b787ed8f..d0aefaaa5e2 100644
--- a/mozilla/gfx/src/beos/Makefile.in
+++ b/mozilla/gfx/src/beos/Makefile.in
@@ -31,6 +31,7 @@ LIBRARY_NAME	= gfx_beos
 EXPORT_LIBRARY = 1
 IS_COMPONENT   = 1 
 MODULE_NAME	= nsGfxBeOSModule
+GRE_MODULE	= 1
 
 CPPSRCS		= \
 		nsDeviceContextBeOS.cpp \
diff --git a/mozilla/gfx/src/gtk/Makefile.in b/mozilla/gfx/src/gtk/Makefile.in
index 8ab0d97269b..31780813977 100644
--- a/mozilla/gfx/src/gtk/Makefile.in
+++ b/mozilla/gfx/src/gtk/Makefile.in
@@ -32,6 +32,8 @@ LIBRARY_NAME	= gfx_gtk
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsGfxGTKModule
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  widget \
diff --git a/mozilla/gfx/src/mac/Makefile.in b/mozilla/gfx/src/mac/Makefile.in
index 2034750c415..8c267e7f053 100644
--- a/mozilla/gfx/src/mac/Makefile.in
+++ b/mozilla/gfx/src/mac/Makefile.in
@@ -28,6 +28,7 @@ EXPORT_LIBRARY  = 1
 MODULE          = gfx
 IS_COMPONENT    = 1
 MODULE_NAME     = nsGfxMacModule
+GRE_MODULE	= 1
 
 REQUIRES    = xpcom \
         string \
diff --git a/mozilla/gfx/src/os2/Makefile.in b/mozilla/gfx/src/os2/Makefile.in
index 7a4c1ea4e5b..3417de1a078 100644
--- a/mozilla/gfx/src/os2/Makefile.in
+++ b/mozilla/gfx/src/os2/Makefile.in
@@ -32,6 +32,8 @@ LIBRARY_NAME	= gfx_os2
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsGfxOS2Module
+GRE_MODULE	= 1
+
 REQUIRES = xpcom \
 		  string \
 		  widget \
diff --git a/mozilla/gfx/src/photon/Makefile.in b/mozilla/gfx/src/photon/Makefile.in
index 9874b7ac112..fd0330269a6 100644
--- a/mozilla/gfx/src/photon/Makefile.in
+++ b/mozilla/gfx/src/photon/Makefile.in
@@ -31,6 +31,8 @@ LIBRARY_NAME	= gfx_photon
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsGfxPhModule
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  widget \
diff --git a/mozilla/gfx/src/qt/Makefile.in b/mozilla/gfx/src/qt/Makefile.in
index 22d47c36c4b..ed17b484462 100644
--- a/mozilla/gfx/src/qt/Makefile.in
+++ b/mozilla/gfx/src/qt/Makefile.in
@@ -30,6 +30,8 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= gfx
 LIBRARY_NAME	= gfx_qt
 EXPORT_LIBRARY = 1
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  widget \
diff --git a/mozilla/gfx/src/windows/Makefile.in b/mozilla/gfx/src/windows/Makefile.in
index 6412bb9d940..1d5829583fe 100644
--- a/mozilla/gfx/src/windows/Makefile.in
+++ b/mozilla/gfx/src/windows/Makefile.in
@@ -31,6 +31,8 @@ LIBRARY_NAME	= gkgfxwin
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsGfxModule
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  gfx \
diff --git a/mozilla/gfx/src/xlib/Makefile.in b/mozilla/gfx/src/xlib/Makefile.in
index ca29a8c26f6..f933fe3d18d 100644
--- a/mozilla/gfx/src/xlib/Makefile.in
+++ b/mozilla/gfx/src/xlib/Makefile.in
@@ -33,6 +33,7 @@ LIBRARY_NAME	= gfx_xlib
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsGfxXlibModule
+GRE_MODULE	= 1
 
 REQUIRES	= xpcom \
 		  string \
diff --git a/mozilla/htmlparser/public/Makefile.in b/mozilla/htmlparser/public/Makefile.in
index e1a99e406f7..46c07e4c348 100644
--- a/mozilla/htmlparser/public/Makefile.in
+++ b/mozilla/htmlparser/public/Makefile.in
@@ -27,6 +27,7 @@ VPATH       = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE      = htmlparser
+GRE_MODULE	= 1
 
 XPIDLSRCS = \
 	nsIExpatSink.idl \
diff --git a/mozilla/htmlparser/src/Makefile.in b/mozilla/htmlparser/src/Makefile.in
index 9183b7d5151..bbd2ab2f20c 100644
--- a/mozilla/htmlparser/src/Makefile.in
+++ b/mozilla/htmlparser/src/Makefile.in
@@ -32,6 +32,8 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT   = 1
 MODULE_NAME	   = nsParserModule
 SHORT_LIBNAME  = gkparser
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  necko \
diff --git a/mozilla/intl/build/Makefile.in b/mozilla/intl/build/Makefile.in
index a36c3b64610..76f4f215c1f 100644
--- a/mozilla/intl/build/Makefile.in
+++ b/mozilla/intl/build/Makefile.in
@@ -28,6 +28,8 @@ LIBRARY_NAME	= i18n
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsI18nModule
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  unicharutil \
diff --git a/mozilla/intl/locale/idl/Makefile.in b/mozilla/intl/locale/idl/Makefile.in
index 9c123b19990..794afcc8f72 100644
--- a/mozilla/intl/locale/idl/Makefile.in
+++ b/mozilla/intl/locale/idl/Makefile.in
@@ -27,6 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= locale
+GRE_MODULE	= 1
 
 XPIDLSRCS	= \
 		nsILanguageAtom.idl \
diff --git a/mozilla/intl/strres/public/Makefile.in b/mozilla/intl/strres/public/Makefile.in
index 9c0991336b7..0863ca8a82d 100644
--- a/mozilla/intl/strres/public/Makefile.in
+++ b/mozilla/intl/strres/public/Makefile.in
@@ -27,6 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= intl
+GRE_MODULE	= 1
 
 XPIDLSRCS	= \
 			nsIStringBundle.idl \
diff --git a/mozilla/intl/uconv/idl/Makefile.in b/mozilla/intl/uconv/idl/Makefile.in
index 21a45672ec3..ba118d38942 100644
--- a/mozilla/intl/uconv/idl/Makefile.in
+++ b/mozilla/intl/uconv/idl/Makefile.in
@@ -27,12 +27,13 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= uconv
+GRE_MODULE	= 1
 
 XPIDLSRCS	= \
 	nsITextToSubURI.idl \
 	nsICurrentCharsetListener.idl \
 	nsICharsetConverterManager2.idl \
- 	nsIScriptableUConv.idl \
+	nsIScriptableUConv.idl \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/intl/uconv/src/Makefile.in b/mozilla/intl/uconv/src/Makefile.in
index 763b91bc4a9..ad9858a04a5 100644
--- a/mozilla/intl/uconv/src/Makefile.in
+++ b/mozilla/intl/uconv/src/Makefile.in
@@ -31,6 +31,7 @@ LIBRARY_NAME	= uconv
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsUConvModule
+GRE_MODULE	= 1
 
 ifneq ($(OS_ARCH),WINNT)
 # To avoid conflict with OS/2 system uconv.dll
diff --git a/mozilla/intl/uconv/ucvmath/Makefile.in b/mozilla/intl/uconv/ucvmath/Makefile.in
index deab02a8f80..8ada8eba466 100644
--- a/mozilla/intl/uconv/ucvmath/Makefile.in
+++ b/mozilla/intl/uconv/ucvmath/Makefile.in
@@ -31,6 +31,8 @@ LIBRARY_NAME	= ucvmath
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsUCvMathModule
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  uconv \
diff --git a/mozilla/intl/unicharutil/idl/Makefile.in b/mozilla/intl/unicharutil/idl/Makefile.in
index 364a2b93bc7..30212b040c8 100644
--- a/mozilla/intl/unicharutil/idl/Makefile.in
+++ b/mozilla/intl/unicharutil/idl/Makefile.in
@@ -27,6 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= unicharutil
+GRE_MODULE	= 1
 
 XPIDLSRCS	= \
 		nsIEntityConverter.idl \
diff --git a/mozilla/jpeg/Makefile.in b/mozilla/jpeg/Makefile.in
index 5acd8313215..4d2d0bec54f 100644
--- a/mozilla/jpeg/Makefile.in
+++ b/mozilla/jpeg/Makefile.in
@@ -33,6 +33,8 @@ ifeq ($(OS_ARCH),WINNT)
 LIBRARY_NAME	= jpeg$(MOZ_BITS)$(VERSION_NUMBER)
 endif
 
+GRE_MODULE	= 1
+
 CSRCS		= \
 		jdapimin.c \
 		jdapistd.c \
diff --git a/mozilla/js/src/Makefile.in b/mozilla/js/src/Makefile.in
index 719a1706262..df30c3806da 100644
--- a/mozilla/js/src/Makefile.in
+++ b/mozilla/js/src/Makefile.in
@@ -42,6 +42,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= js
 LIBRARY_NAME	= mozjs
 LIB_IS_C_ONLY	= 1
+GRE_MODULE	= 1
 
 ifeq ($(OS_ARCH),WINNT)
 LIBRARY_NAME	= js$(MOZ_BITS)$(VERSION_NUMBER)
diff --git a/mozilla/js/src/liveconnect/Makefile.in b/mozilla/js/src/liveconnect/Makefile.in
index 1738fb9b188..18069bf9738 100644
--- a/mozilla/js/src/liveconnect/Makefile.in
+++ b/mozilla/js/src/liveconnect/Makefile.in
@@ -46,6 +46,7 @@ LIBRARY_NAME	= jsj$(MOZ_BITS)$(VERSION_NUMBER)
 MAPFILE		= $(LIBRARY_NAME).map
 endif
 JNI_GEN_DIR	= _jni
+GRE_MODULE	= 1
 
 REQUIRES	= js \
 		  xpcom \
diff --git a/mozilla/js/src/xpconnect/src/Makefile.in b/mozilla/js/src/xpconnect/src/Makefile.in
index 39052549e50..eac65cda419 100644
--- a/mozilla/js/src/xpconnect/src/Makefile.in
+++ b/mozilla/js/src/xpconnect/src/Makefile.in
@@ -45,6 +45,7 @@ EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= xpconect
 IS_COMPONENT	= 1
 MODULE_NAME	= xpconnect
+GRE_MODULE	= 1
 ifeq ($(OS_ARCH),WINNT)
 LIBRARY_NAME	= xpc$(MOZ_BITS)$(VERSION_NUMBER)
 SHORT_LIBNAME	= xpc$(MOZ_BITS)$(VERSION_NUMBER)
diff --git a/mozilla/layout/base/public/Makefile.in b/mozilla/layout/base/public/Makefile.in
index 792178ae314..884fec34375 100644
--- a/mozilla/layout/base/public/Makefile.in
+++ b/mozilla/layout/base/public/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= layout
 XPIDL_MODULE	= layout_base
+GRE_MODULE	= 1
 
 EXPORTS		= \
 nsCompatibility.h \
diff --git a/mozilla/layout/build/Makefile.in b/mozilla/layout/build/Makefile.in
index e0e31e25b00..65fd8efa393 100644
--- a/mozilla/layout/build/Makefile.in
+++ b/mozilla/layout/build/Makefile.in
@@ -34,6 +34,8 @@ SHORT_LIBNAME	= gkhtml
 endif
 IS_COMPONENT	= 1
 MODULE_NAME	= nsLayoutModule
+GRE_MODULE	= 1
+
 EXTRA_DSO_LIBS	= gkgfx
 ifdef MOZ_PERF_METRICS
 EXTRA_DSO_LIBS	+= mozutil_s
diff --git a/mozilla/layout/xul/base/public/Makefile.in b/mozilla/layout/xul/base/public/Makefile.in
index 544032ba79c..9069771c66f 100644
--- a/mozilla/layout/xul/base/public/Makefile.in
+++ b/mozilla/layout/xul/base/public/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= layout
 XPIDL_MODULE	= layout_xul
+GRE_MODULE	= 1
 
 EXPORTS		= \
 		nsPIBoxObject.h \
diff --git a/mozilla/modules/libjar/Makefile.in b/mozilla/modules/libjar/Makefile.in
index d45a745ca72..01eb63585be 100644
--- a/mozilla/modules/libjar/Makefile.in
+++ b/mozilla/modules/libjar/Makefile.in
@@ -44,6 +44,8 @@ LIBRARY_NAME	= jar$(VERSION_NUMBER)
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsJarModule
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  caps \
diff --git a/mozilla/modules/libpr0n/build/Makefile.in b/mozilla/modules/libpr0n/build/Makefile.in
index 408d4d64951..de846eecaac 100644
--- a/mozilla/modules/libpr0n/build/Makefile.in
+++ b/mozilla/modules/libpr0n/build/Makefile.in
@@ -31,6 +31,7 @@ LIBRARY_NAME	= imglib2
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsImageLib2Module
+GRE_MODULE	= 1
 
 REQUIRES	= xpcom \
 		  string \
diff --git a/mozilla/modules/libpr0n/decoders/icon/Makefile.in b/mozilla/modules/libpr0n/decoders/icon/Makefile.in
index 35d5e007fae..29004fc8132 100644
--- a/mozilla/modules/libpr0n/decoders/icon/Makefile.in
+++ b/mozilla/modules/libpr0n/decoders/icon/Makefile.in
@@ -31,6 +31,7 @@ LIBRARY_NAME	= imgicon
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsIconDecoderModule
+GRE_MODULE	= 1
 
 ifeq ($(OS_ARCH),WINNT)
 EXTRA_DSO_LIBS	= gkgfx
diff --git a/mozilla/modules/libpr0n/decoders/mng/Makefile.in b/mozilla/modules/libpr0n/decoders/mng/Makefile.in
index f42508d5f94..5fe2d03ef5a 100644
--- a/mozilla/modules/libpr0n/decoders/mng/Makefile.in
+++ b/mozilla/modules/libpr0n/decoders/mng/Makefile.in
@@ -29,6 +29,7 @@ LIBRARY_NAME	= imgmng
 EXPORT_LIBRARY  = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMNGDecoderModule
+GRE_MODULE	= 1
 
 EXTRA_DSO_LIBS	= gkgfx
 
diff --git a/mozilla/modules/libpr0n/public/Makefile.in b/mozilla/modules/libpr0n/public/Makefile.in
index 5429129b227..e1d1b52be73 100644
--- a/mozilla/modules/libpr0n/public/Makefile.in
+++ b/mozilla/modules/libpr0n/public/Makefile.in
@@ -27,6 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= imglib2
+GRE_MODULE	= 1
 
 EXPORTS		= ImageErrors.h ImageLogging.h
 
diff --git a/mozilla/modules/libpr0n/src/Makefile.in b/mozilla/modules/libpr0n/src/Makefile.in
index 24a83fc29f2..e913b057b7a 100644
--- a/mozilla/modules/libpr0n/src/Makefile.in
+++ b/mozilla/modules/libpr0n/src/Makefile.in
@@ -31,6 +31,7 @@ LIBRARY_NAME	= imglib2_s
 EXPORT_LIBRARY = 1
 FORCE_STATIC_LIB = 1
 MODULE_NAME	= nsImageLib2Module
+GRE_MODULE	= 1
 
 REQUIRES	= xpcom \
 		  string \
diff --git a/mozilla/modules/libpref/public/Makefile.in b/mozilla/modules/libpref/public/Makefile.in
index d90574a6155..e01865367fe 100644
--- a/mozilla/modules/libpref/public/Makefile.in
+++ b/mozilla/modules/libpref/public/Makefile.in
@@ -27,6 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= pref
+GRE_MODULE	= 1
 
 SDK_XPIDLSRCS   = \
               nsIPrefService.idl \
diff --git a/mozilla/modules/libpref/src/Makefile.in b/mozilla/modules/libpref/src/Makefile.in
index fd0e66cacd5..12877df979c 100644
--- a/mozilla/modules/libpref/src/Makefile.in
+++ b/mozilla/modules/libpref/src/Makefile.in
@@ -34,6 +34,7 @@ MODULE_NAME	= nsPrefModule
 ifeq ($(OS_ARCH),WINNT)
 LIBRARY_NAME	= xppref$(MOZ_BITS)
 endif
+GRE_MODULE	= 1
 
 REQUIRES	= xpcom \
 		  string \
diff --git a/mozilla/modules/oji/public/Makefile.in b/mozilla/modules/oji/public/Makefile.in
index b0ead965b6b..60981cb654d 100644
--- a/mozilla/modules/oji/public/Makefile.in
+++ b/mozilla/modules/oji/public/Makefile.in
@@ -27,6 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= oji
+GRE_MODULE	= 1
 
 XPIDLSRCS	= \
 		nsIJVMManager.idl \
diff --git a/mozilla/modules/oji/src/Makefile.in b/mozilla/modules/oji/src/Makefile.in
index 08110a51445..08570f27f4d 100644
--- a/mozilla/modules/oji/src/Makefile.in
+++ b/mozilla/modules/oji/src/Makefile.in
@@ -29,6 +29,8 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= oji
 IS_COMPONENT	= 1
 MODULE_NAME	= nsCJVMManagerModule
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  liveconnect \
diff --git a/mozilla/modules/plugin/base/public/Makefile.in b/mozilla/modules/plugin/base/public/Makefile.in
index ce3310752d7..324a69c7d11 100644
--- a/mozilla/modules/plugin/base/public/Makefile.in
+++ b/mozilla/modules/plugin/base/public/Makefile.in
@@ -27,6 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= plugin
+GRE_MODULE	= 1
 
 EXPORTS		= \
 		nsplugin.h \
diff --git a/mozilla/modules/plugin/base/src/Makefile.in b/mozilla/modules/plugin/base/src/Makefile.in
index 2065b94e14e..e0837a8e7d3 100644
--- a/mozilla/modules/plugin/base/src/Makefile.in
+++ b/mozilla/modules/plugin/base/src/Makefile.in
@@ -32,6 +32,8 @@ LIBRARY_NAME	= gkplugin
 EXPORT_LIBRARY = 1
 IS_COMPONENT    = 1
 MODULE_NAME	= nsPluginModule
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  xpconnect \
 		  string \
diff --git a/mozilla/modules/plugin/samples/default/unix/Makefile.in b/mozilla/modules/plugin/samples/default/unix/Makefile.in
index 808c3e82931..403122ebd40 100644
--- a/mozilla/modules/plugin/samples/default/unix/Makefile.in
+++ b/mozilla/modules/plugin/samples/default/unix/Makefile.in
@@ -28,6 +28,8 @@ include $(DEPTH)/config/autoconf.mk
 
 #MODULE		= plugin
 LIBRARY_NAME	= nullplugin
+GRE_MODULE	= 1
+
 REQUIRES	= java \
 		  plugin \
 		  $(NULL)
diff --git a/mozilla/modules/plugin/samples/default/windows/Makefile.in b/mozilla/modules/plugin/samples/default/windows/Makefile.in
index 4c8d7eaf7c4..00a514a180b 100644
--- a/mozilla/modules/plugin/samples/default/windows/Makefile.in
+++ b/mozilla/modules/plugin/samples/default/windows/Makefile.in
@@ -30,6 +30,8 @@ MODULE		= plugin
 LIBRARY_NAME	= npnul32
 RESFILE		= npnul32.res
 DEFFILE		= $(srcdir)/npnul32.def
+GRE_MODULE	= 1
+
 REQUIRES	= java \
 		  xpcom \
 		  pref \
diff --git a/mozilla/modules/zlib/src/Makefile.in b/mozilla/modules/zlib/src/Makefile.in
index 7dc57c25899..65900dfd606 100644
--- a/mozilla/modules/zlib/src/Makefile.in
+++ b/mozilla/modules/zlib/src/Makefile.in
@@ -29,6 +29,7 @@ include $(srcdir)/objs.mk
 
 MODULE		= zlib
 LIBRARY_NAME	= mozz
+GRE_MODULE	= 1
 
 ifeq ($(OS_ARCH),WINNT)
 MAPFILE	= $(LIBRARY_NAME).map
diff --git a/mozilla/netwerk/base/public/Makefile.in b/mozilla/netwerk/base/public/Makefile.in
index 7e86353d981..fe1514782d8 100644
--- a/mozilla/netwerk/base/public/Makefile.in
+++ b/mozilla/netwerk/base/public/Makefile.in
@@ -27,6 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= necko
+GRE_MODULE	= 1
 
 SDK_XPIDLSRCS   = \
 		nsIChannel.idl \
diff --git a/mozilla/netwerk/build/Makefile.in b/mozilla/netwerk/build/Makefile.in
index 5748f867c60..2909ab6a496 100644
--- a/mozilla/netwerk/build/Makefile.in
+++ b/mozilla/netwerk/build/Makefile.in
@@ -31,6 +31,8 @@ LIBRARY_NAME	= necko
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= necko_core_and_primary_protocols
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  nkcache \
diff --git a/mozilla/netwerk/build2/Makefile.in b/mozilla/netwerk/build2/Makefile.in
index 40b7a62b1a9..9084d9bdf64 100644
--- a/mozilla/netwerk/build2/Makefile.in
+++ b/mozilla/netwerk/build2/Makefile.in
@@ -31,6 +31,8 @@ LIBRARY_NAME	= necko2
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= necko_secondary_protocols
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  necko \
diff --git a/mozilla/netwerk/cache/public/Makefile.in b/mozilla/netwerk/cache/public/Makefile.in
index 4adbccf5161..26d21d814e8 100644
--- a/mozilla/netwerk/cache/public/Makefile.in
+++ b/mozilla/netwerk/cache/public/Makefile.in
@@ -26,6 +26,7 @@ VPATH		= @srcdir@
 
 MODULE		= nkcache
 XPIDL_MODULE	= necko_cache
+GRE_MODULE	= 1
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/mozilla/netwerk/cookie/public/Makefile.in b/mozilla/netwerk/cookie/public/Makefile.in
index f26285eb844..5941bb977ae 100644
--- a/mozilla/netwerk/cookie/public/Makefile.in
+++ b/mozilla/netwerk/cookie/public/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= necko
 XPIDL_MODULE	= necko_cookie
+GRE_MODULE	= 1
 
 XPIDLSRCS	= \
 		nsICookieService.idl \
diff --git a/mozilla/netwerk/dns/public/Makefile.in b/mozilla/netwerk/dns/public/Makefile.in
index 3bc8a7e805e..dba8e7f4cf0 100644
--- a/mozilla/netwerk/dns/public/Makefile.in
+++ b/mozilla/netwerk/dns/public/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= necko
 XPIDL_MODULE	= necko_dns
+GRE_MODULE	= 1
 
 XPIDLSRCS	= \
 		nsIDNSListener.idl \
diff --git a/mozilla/netwerk/protocol/about/public/Makefile.in b/mozilla/netwerk/protocol/about/public/Makefile.in
index e2e936eae56..8e7c1021f98 100644
--- a/mozilla/netwerk/protocol/about/public/Makefile.in
+++ b/mozilla/netwerk/protocol/about/public/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= necko
 XPIDL_MODULE	= necko_about
+GRE_MODULE	= 1
 
 XPIDLSRCS	= nsIAboutModule.idl
 
diff --git a/mozilla/netwerk/protocol/data/public/Makefile.in b/mozilla/netwerk/protocol/data/public/Makefile.in
index e4d091987e5..7fe5f8e7826 100644
--- a/mozilla/netwerk/protocol/data/public/Makefile.in
+++ b/mozilla/netwerk/protocol/data/public/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= necko
 XPIDL_MODULE	= necko_data
+GRE_MODULE	= 1
 
 XPIDLSRCS	= nsIDataChannel.idl
 
diff --git a/mozilla/netwerk/protocol/file/public/Makefile.in b/mozilla/netwerk/protocol/file/public/Makefile.in
index ce1da1bdabd..bf14a1fef57 100644
--- a/mozilla/netwerk/protocol/file/public/Makefile.in
+++ b/mozilla/netwerk/protocol/file/public/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= necko
 XPIDL_MODULE	= necko_file
+GRE_MODULE	= 1
 
 XPIDLSRCS	= \
 		nsIFileProtocolHandler.idl \
diff --git a/mozilla/netwerk/protocol/ftp/public/Makefile.in b/mozilla/netwerk/protocol/ftp/public/Makefile.in
index c7e7fba4ce3..776bf661918 100644
--- a/mozilla/netwerk/protocol/ftp/public/Makefile.in
+++ b/mozilla/netwerk/protocol/ftp/public/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= necko2
 XPIDL_MODULE	= necko_ftp
+GRE_MODULE	= 1
 
 XPIDLSRCS	= \
 	nsIFTPChannel.idl \
diff --git a/mozilla/netwerk/protocol/http/public/Makefile.in b/mozilla/netwerk/protocol/http/public/Makefile.in
index 6115988e104..557dfc7dc9e 100644
--- a/mozilla/netwerk/protocol/http/public/Makefile.in
+++ b/mozilla/netwerk/protocol/http/public/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE = necko
 XPIDL_MODULE = necko_http
+GRE_MODULE	= 1
 
 SDK_XPIDLSRCS   = \
 		nsIHttpChannel.idl \
diff --git a/mozilla/netwerk/protocol/jar/public/Makefile.in b/mozilla/netwerk/protocol/jar/public/Makefile.in
index f6d5faf9307..ccf6ea4c4d2 100644
--- a/mozilla/netwerk/protocol/jar/public/Makefile.in
+++ b/mozilla/netwerk/protocol/jar/public/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= necko
 XPIDL_MODULE	= necko_jar
+GRE_MODULE	= 1
 
 XPIDLSRCS	= nsIJARChannel.idl \
 		  nsIJARURI.idl	    \
diff --git a/mozilla/netwerk/protocol/res/public/Makefile.in b/mozilla/netwerk/protocol/res/public/Makefile.in
index 4ef630ca01a..fbd629060a9 100644
--- a/mozilla/netwerk/protocol/res/public/Makefile.in
+++ b/mozilla/netwerk/protocol/res/public/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= necko
 XPIDL_MODULE	= necko_res
+GRE_MODULE	= 1
 
 XPIDLSRCS	=			  \
 		nsIResProtocolHandler.idl \
diff --git a/mozilla/netwerk/protocol/viewsource/public/Makefile.in b/mozilla/netwerk/protocol/viewsource/public/Makefile.in
index 7c9eb66e849..5f609c36287 100644
--- a/mozilla/netwerk/protocol/viewsource/public/Makefile.in
+++ b/mozilla/netwerk/protocol/viewsource/public/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= necko2
 XPIDL_MODULE	= necko_viewsource
+GRE_MODULE	= 1
 
 XPIDLSRCS	= \
 		nsIViewSourceChannel.idl \
diff --git a/mozilla/netwerk/streamconv/public/Makefile.in b/mozilla/netwerk/streamconv/public/Makefile.in
index 559989da0a0..eecf4c465fd 100644
--- a/mozilla/netwerk/streamconv/public/Makefile.in
+++ b/mozilla/netwerk/streamconv/public/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= necko
 XPIDL_MODULE	= necko_strconv
+GRE_MODULE	= 1
 
 XPIDLSRCS	= \
 		nsIStreamConverter.idl \
diff --git a/mozilla/other-licenses/libart_lgpl/Makefile.in b/mozilla/other-licenses/libart_lgpl/Makefile.in
index 733ce9f6a87..9f668f677fc 100644
--- a/mozilla/other-licenses/libart_lgpl/Makefile.in
+++ b/mozilla/other-licenses/libart_lgpl/Makefile.in
@@ -8,6 +8,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE	= libart_lgpl
 LIBRARY_NAME = moz_art_lgpl
+GRE_MODULE	= 1
 
 ifeq ($(OS_ARCH),WINNT)
 DEFFILE	= $(srcdir)/libart.def
diff --git a/mozilla/parser/htmlparser/public/Makefile.in b/mozilla/parser/htmlparser/public/Makefile.in
index e1a99e406f7..46c07e4c348 100644
--- a/mozilla/parser/htmlparser/public/Makefile.in
+++ b/mozilla/parser/htmlparser/public/Makefile.in
@@ -27,6 +27,7 @@ VPATH       = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE      = htmlparser
+GRE_MODULE	= 1
 
 XPIDLSRCS = \
 	nsIExpatSink.idl \
diff --git a/mozilla/parser/htmlparser/src/Makefile.in b/mozilla/parser/htmlparser/src/Makefile.in
index 9183b7d5151..bbd2ab2f20c 100644
--- a/mozilla/parser/htmlparser/src/Makefile.in
+++ b/mozilla/parser/htmlparser/src/Makefile.in
@@ -32,6 +32,8 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT   = 1
 MODULE_NAME	   = nsParserModule
 SHORT_LIBNAME  = gkparser
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  necko \
diff --git a/mozilla/profile/build/Makefile.in b/mozilla/profile/build/Makefile.in
index c2ff419ff85..82f829ab1f4 100644
--- a/mozilla/profile/build/Makefile.in
+++ b/mozilla/profile/build/Makefile.in
@@ -46,6 +46,8 @@ LIBRARY_NAME	= profile
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsProfileModule
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  chrome \
diff --git a/mozilla/profile/public/Makefile.in b/mozilla/profile/public/Makefile.in
index 0ac795c186c..a80b2b18a8d 100644
--- a/mozilla/profile/public/Makefile.in
+++ b/mozilla/profile/public/Makefile.in
@@ -27,6 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= profile
+GRE_MODULE	= 1
 
 SDK_XPIDLSRCS	= \
                   nsIProfile.idl \
diff --git a/mozilla/rdf/base/idl/Makefile.in b/mozilla/rdf/base/idl/Makefile.in
index 03156622a5f..db4efbebc96 100644
--- a/mozilla/rdf/base/idl/Makefile.in
+++ b/mozilla/rdf/base/idl/Makefile.in
@@ -27,6 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= rdf
+GRE_MODULE	= 1
 
 XPIDLSRCS	= \
 		nsIRDFCompositeDataSource.idl \
diff --git a/mozilla/rdf/build/Makefile.in b/mozilla/rdf/build/Makefile.in
index 362990aab86..e92954e720c 100644
--- a/mozilla/rdf/build/Makefile.in
+++ b/mozilla/rdf/build/Makefile.in
@@ -31,6 +31,8 @@ LIBRARY_NAME	= rdf
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsRDFModule
+GRE_MODULE	= 1
+
 EXTRA_DSO_LIBS	= 
 REQUIRES	= xpcom \
 		  string \
diff --git a/mozilla/rdf/chrome/build/Makefile.in b/mozilla/rdf/chrome/build/Makefile.in
index 07db6ea3897..8c8ad41f5d3 100644
--- a/mozilla/rdf/chrome/build/Makefile.in
+++ b/mozilla/rdf/chrome/build/Makefile.in
@@ -31,6 +31,7 @@ LIBRARY_NAME	= chrome
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsChromeModule
+GRE_MODULE	= 1
 
 REQUIRES	= xpcom \
 		  string \
diff --git a/mozilla/rdf/chrome/public/Makefile.in b/mozilla/rdf/chrome/public/Makefile.in
index b90ca0c804c..4238f27a3e2 100644
--- a/mozilla/rdf/chrome/public/Makefile.in
+++ b/mozilla/rdf/chrome/public/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= chrome
 XPIDL_MODULE= chrome
+GRE_MODULE	= 1
 
 XPIDLSRCS	= \
 			nsIChromeRegistry.idl \
diff --git a/mozilla/security/manager/Makefile.in b/mozilla/security/manager/Makefile.in
index 57249c0274e..b6fd54c2605 100644
--- a/mozilla/security/manager/Makefile.in
+++ b/mozilla/security/manager/Makefile.in
@@ -106,6 +106,18 @@ else
 	cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
 endif
 	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
+ifndef DISABLE_DIST_GRE
+	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST)
+	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST)
+	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST)
+	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST)
+	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST)
+ifdef HAVE_FREEBL_MODULES
+	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST)
+	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST)
+endif
+endif
+ifndef _SKIP_OLD_GRE_INSTALL
 	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
 	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
 	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
@@ -114,6 +126,7 @@ endif
 ifdef HAVE_FREEBL_MODULES
 	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin
 	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
+endif
 endif
 	$(MAKE) -C boot $@
 	$(MAKE) -C ssl $@
diff --git a/mozilla/security/manager/boot/public/Makefile.in b/mozilla/security/manager/boot/public/Makefile.in
index 0b55783e857..4ec536b9907 100644
--- a/mozilla/security/manager/boot/public/Makefile.in
+++ b/mozilla/security/manager/boot/public/Makefile.in
@@ -35,8 +35,6 @@
 #
 # ***** END LICENSE BLOCK *****
 
-MODULE = pipboot
-
 DEPTH           = ../../../..
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
@@ -44,6 +42,9 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+MODULE = pipboot
+GRE_MODULE	= 1
+
 XPIDLSRCS = \
     nsISSLStatusProvider.idl \
     nsISecurityWarningDialogs.idl \
diff --git a/mozilla/security/manager/boot/src/Makefile.in b/mozilla/security/manager/boot/src/Makefile.in
index ba374a6a660..f2d7eddbe9c 100644
--- a/mozilla/security/manager/boot/src/Makefile.in
+++ b/mozilla/security/manager/boot/src/Makefile.in
@@ -50,6 +50,7 @@ IS_COMPONENT	= 1
 MODULE_NAME	= BOOT
 EXPORT_LIBRARY	= 1
 META_COMPONENT	= crypto
+GRE_MODULE	= 1
 
 CPPSRCS = \
 	nsEntropyCollector.cpp \
diff --git a/mozilla/security/manager/pki/public/Makefile.in b/mozilla/security/manager/pki/public/Makefile.in
index c9758f2990e..4fd0da47f51 100644
--- a/mozilla/security/manager/pki/public/Makefile.in
+++ b/mozilla/security/manager/pki/public/Makefile.in
@@ -32,8 +32,6 @@
 # GPL.
 # 
 
-MODULE = pippki
-
 DEPTH           = ../../../..
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
@@ -41,6 +39,9 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+MODULE = pippki
+GRE_MODULE	= 1
+
 XPIDLSRCS = \
     nsIPKIParamBlock.idl \
     nsIASN1Tree.idl \
diff --git a/mozilla/security/manager/pki/src/Makefile.in b/mozilla/security/manager/pki/src/Makefile.in
index 60eaf1c557b..7b82d055140 100644
--- a/mozilla/security/manager/pki/src/Makefile.in
+++ b/mozilla/security/manager/pki/src/Makefile.in
@@ -47,6 +47,7 @@ IS_COMPONENT	= 1
 MODULE_NAME	= PKI
 EXPORT_LIBRARY	= 1
 META_COMPONENT	= crypto
+GRE_MODULE	= 1
 
 CPPSRCS = \
 	nsNSSDialogs.cpp \
diff --git a/mozilla/security/manager/ssl/public/Makefile.in b/mozilla/security/manager/ssl/public/Makefile.in
index 1813594cc75..b41faf5cfd7 100644
--- a/mozilla/security/manager/ssl/public/Makefile.in
+++ b/mozilla/security/manager/ssl/public/Makefile.in
@@ -34,8 +34,6 @@
 # GPL.
 # 
 
-MODULE = pipnss
-
 DEPTH           = ../../../..
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
@@ -43,6 +41,9 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+MODULE = pipnss
+GRE_MODULE	= 1
+
 XPIDLSRCS = \
     nsIBadCertListener.idl \
     nsICertSelect.idl \
diff --git a/mozilla/security/manager/ssl/src/Makefile.in b/mozilla/security/manager/ssl/src/Makefile.in
index de78ff8afeb..3e46c05a0d1 100644
--- a/mozilla/security/manager/ssl/src/Makefile.in
+++ b/mozilla/security/manager/ssl/src/Makefile.in
@@ -47,6 +47,7 @@ IS_COMPONENT	= 1
 MODULE_NAME	= NSS
 EXPORT_LIBRARY	= 1
 META_COMPONENT	= crypto
+GRE_MODULE	= 1
 
 CPPSRCS = 				\
 	nsNSSCallbacks.cpp		\
diff --git a/mozilla/uriloader/base/Makefile.in b/mozilla/uriloader/base/Makefile.in
index d98201c3fb6..65f41c6659e 100644
--- a/mozilla/uriloader/base/Makefile.in
+++ b/mozilla/uriloader/base/Makefile.in
@@ -28,6 +28,8 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= uriloader
 LIBRARY_NAME	= uriloaderbase_s
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  necko \
diff --git a/mozilla/uriloader/build/Makefile.in b/mozilla/uriloader/build/Makefile.in
index 910c72a976e..9e587576d95 100644
--- a/mozilla/uriloader/build/Makefile.in
+++ b/mozilla/uriloader/build/Makefile.in
@@ -32,6 +32,8 @@ EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= urildr
 IS_COMPONENT	= 1
 MODULE_NAME	= nsURILoaderModule
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  necko \
diff --git a/mozilla/view/src/Makefile.in b/mozilla/view/src/Makefile.in
index 8ac500bb05c..be32ea9ea59 100644
--- a/mozilla/view/src/Makefile.in
+++ b/mozilla/view/src/Makefile.in
@@ -31,6 +31,8 @@ LIBRARY_NAME	= gkview
 EXPORT_LIBRARY = 1
 IS_COMPONENT    = 1
 MODULE_NAME	= nsViewModule
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  gfx \
diff --git a/mozilla/widget/public/Makefile.in b/mozilla/widget/public/Makefile.in
index b065f3acbfb..c1221e9d13c 100644
--- a/mozilla/widget/public/Makefile.in
+++ b/mozilla/widget/public/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= widget
 XPIDL_MODULE	= widget
+GRE_MODULE	= 1
 
 EXPORTS		= \
 		nsIMenuBar.h \
diff --git a/mozilla/widget/src/beos/Makefile.in b/mozilla/widget/src/beos/Makefile.in
index 49624807aae..6f447d44f42 100644
--- a/mozilla/widget/src/beos/Makefile.in
+++ b/mozilla/widget/src/beos/Makefile.in
@@ -31,6 +31,7 @@ LIBRARY_NAME	= widget_beos
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsWidgetBeOSModule
+GRE_MODULE	= 1
 
 REQUIRES	= xpcom \
 		  string \
diff --git a/mozilla/widget/src/cocoa/Makefile.in b/mozilla/widget/src/cocoa/Makefile.in
index 8ea52a18c09..b556aeaa7a5 100644
--- a/mozilla/widget/src/cocoa/Makefile.in
+++ b/mozilla/widget/src/cocoa/Makefile.in
@@ -28,6 +28,8 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsWidgetMacModule
 XPIDL_MODULE	= widget_cocoa
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  gfx \
 		  string \
diff --git a/mozilla/widget/src/gtk/Makefile.in b/mozilla/widget/src/gtk/Makefile.in
index 7f49f72516d..c4e9b0257e8 100644
--- a/mozilla/widget/src/gtk/Makefile.in
+++ b/mozilla/widget/src/gtk/Makefile.in
@@ -27,6 +27,8 @@ LIBRARY_NAME	= widget_gtk
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsWidgetGTKModule
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  appshell \
diff --git a/mozilla/widget/src/gtk2/Makefile.in b/mozilla/widget/src/gtk2/Makefile.in
index f5069d64474..5e02ca0039c 100644
--- a/mozilla/widget/src/gtk2/Makefile.in
+++ b/mozilla/widget/src/gtk2/Makefile.in
@@ -30,6 +30,8 @@ LIBRARY_NAME	= widget_gtk2
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsWidgetGtk2Module
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  gfx \
diff --git a/mozilla/widget/src/mac/Makefile.in b/mozilla/widget/src/mac/Makefile.in
index e6d1bec7ece..8964aa1425e 100644
--- a/mozilla/widget/src/mac/Makefile.in
+++ b/mozilla/widget/src/mac/Makefile.in
@@ -28,6 +28,8 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsWidgetMacModule
 XPIDL_MODULE	= widget_mac
+GRE_MODULE	= 1
+
 REQUIRES  = xpcom \
           gfx \
           string \
diff --git a/mozilla/widget/src/os2/Makefile.in b/mozilla/widget/src/os2/Makefile.in
index a4eebaa101d..fb37a6ce7cc 100644
--- a/mozilla/widget/src/os2/Makefile.in
+++ b/mozilla/widget/src/os2/Makefile.in
@@ -29,6 +29,7 @@ EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 RESFILE		= widget.res
 MODULE_NAME	= nsWidgetOS2Module
+GRE_MODULE	= 1
 
 REQUIRES	= gfx \
 		  xpcom \
diff --git a/mozilla/widget/src/photon/Makefile.in b/mozilla/widget/src/photon/Makefile.in
index 122ab15f4fb..f97717de173 100644
--- a/mozilla/widget/src/photon/Makefile.in
+++ b/mozilla/widget/src/photon/Makefile.in
@@ -31,6 +31,8 @@ LIBRARY_NAME	= widget_photon
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsWidgetPhModule
+GRE_MODULE	= 1
+
 REQUIRES    = xpcom \
     	      string \
 		      appshell \
diff --git a/mozilla/widget/src/qt/Makefile.in b/mozilla/widget/src/qt/Makefile.in
index 9eac8dcf7e6..bf605fe8f55 100644
--- a/mozilla/widget/src/qt/Makefile.in
+++ b/mozilla/widget/src/qt/Makefile.in
@@ -30,6 +30,10 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= widget
 LIBRARY_NAME	= widget_qt
 EXPORT_LIBRARY = 1
+IS_COMPONENT    = 1
+MODULE_NAME	= nsWidgetQTModule
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  gfx \
@@ -40,8 +44,6 @@ REQUIRES	= xpcom \
 		  pref \
 		  uconv \
 		  $(NULL)
-IS_COMPONENT    = 1
-MODULE_NAME	= nsWidgetQTModule
 
 CPPSRCS		= \
 		$(MOCSRCS) \
diff --git a/mozilla/widget/src/xlib/Makefile.in b/mozilla/widget/src/xlib/Makefile.in
index 74a689ded65..6d7839e15e6 100644
--- a/mozilla/widget/src/xlib/Makefile.in
+++ b/mozilla/widget/src/xlib/Makefile.in
@@ -32,6 +32,8 @@ LIBRARY_NAME	= widget_xlib
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsWidgetXLIBModule
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  appshell \
diff --git a/mozilla/xpcom/Makefile.in b/mozilla/xpcom/Makefile.in
index fcc676b14b3..45cc5a21eb3 100644
--- a/mozilla/xpcom/Makefile.in
+++ b/mozilla/xpcom/Makefile.in
@@ -26,6 +26,8 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+GRE_MODULE	= 1
+
 DIRS		= \
 		typelib \
 		glue \
diff --git a/mozilla/xpcom/base/Makefile.in b/mozilla/xpcom/base/Makefile.in
index 1eb98355090..15e397a3481 100644
--- a/mozilla/xpcom/base/Makefile.in
+++ b/mozilla/xpcom/base/Makefile.in
@@ -29,6 +29,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= xpcom
 XPIDL_MODULE	= xpcom_base
 LIBRARY_NAME	= xpcombase_s
+GRE_MODULE	= 1
 
 REQUIRES	= string \
 		  $(NULL)
diff --git a/mozilla/xpcom/build/Makefile.in b/mozilla/xpcom/build/Makefile.in
index 5c0bafeb76d..98042baecfe 100644
--- a/mozilla/xpcom/build/Makefile.in
+++ b/mozilla/xpcom/build/Makefile.in
@@ -37,6 +37,8 @@ endif
 
 # Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list
 #EXPORT_LIBRARY = 1
+GRE_MODULE	= 1
+
 REQUIRES	= libreg \
 		  string \
 		  $(NULL)
diff --git a/mozilla/xpcom/components/Makefile.in b/mozilla/xpcom/components/Makefile.in
index 7f944ba95c2..5ccdb53bde3 100644
--- a/mozilla/xpcom/components/Makefile.in
+++ b/mozilla/xpcom/components/Makefile.in
@@ -29,6 +29,8 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= xpcom
 XPIDL_MODULE	= xpcom_components
 LIBRARY_NAME	= xpcomcomponents_s
+GRE_MODULE	= 1
+
 REQUIRES	= libreg \
 		  string \
 		  $(NULL)
diff --git a/mozilla/xpcom/ds/Makefile.in b/mozilla/xpcom/ds/Makefile.in
index babe28df19a..d0a58f4e32c 100644
--- a/mozilla/xpcom/ds/Makefile.in
+++ b/mozilla/xpcom/ds/Makefile.in
@@ -29,6 +29,8 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= xpcom
 XPIDL_MODULE	= xpcom_ds
 LIBRARY_NAME	= xpcomds_s
+GRE_MODULE	= 1
+
 REQUIRES	= \
 		  string \
 		  $(NULL)
diff --git a/mozilla/xpcom/io/Makefile.in b/mozilla/xpcom/io/Makefile.in
index 11010d85e7d..ec7ad01b8dd 100644
--- a/mozilla/xpcom/io/Makefile.in
+++ b/mozilla/xpcom/io/Makefile.in
@@ -29,6 +29,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= xpcom
 XPIDL_MODULE	= xpcom_io
 LIBRARY_NAME	= xpcomio_s
+GRE_MODULE	= 1
 REQUIRES	= string \
 		  $(NULL)
 
diff --git a/mozilla/xpcom/reflect/xptinfo/public/Makefile.in b/mozilla/xpcom/reflect/xptinfo/public/Makefile.in
index e850f7fc1e0..466e2fb11a0 100644
--- a/mozilla/xpcom/reflect/xptinfo/public/Makefile.in
+++ b/mozilla/xpcom/reflect/xptinfo/public/Makefile.in
@@ -30,6 +30,8 @@ MODULE		= xpcom
 
 XPIDL_MODULE = xpcom_xpti
 
+GRE_MODULE	= 1
+
 EXPORTS		= \
 		xptinfo.h \
 		$(NULL)
diff --git a/mozilla/xpcom/threads/Makefile.in b/mozilla/xpcom/threads/Makefile.in
index 5dc2b22deac..bbfd784b4f3 100644
--- a/mozilla/xpcom/threads/Makefile.in
+++ b/mozilla/xpcom/threads/Makefile.in
@@ -33,6 +33,7 @@ else
 XPIDL_MODULE	= xpcom_threads
 endif
 LIBRARY_NAME	= xpcomthreads_s
+GRE_MODULE	= 1
 REQUIRES	= string \
 		  $(NULL)
 
diff --git a/mozilla/xpfe/appshell/public/Makefile.in b/mozilla/xpfe/appshell/public/Makefile.in
index 3679f9f90ad..4aee6230dd1 100644
--- a/mozilla/xpfe/appshell/public/Makefile.in
+++ b/mozilla/xpfe/appshell/public/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= appshell
 XPIDL_MODULE	= appshell
+GRE_MODULE	= 1
 
 EXPORTS		= \
 		nsIWebShellWindow.h \
diff --git a/mozilla/xpfe/appshell/src/Makefile.in b/mozilla/xpfe/appshell/src/Makefile.in
index e6a0aa90eea..f5169cd8f88 100644
--- a/mozilla/xpfe/appshell/src/Makefile.in
+++ b/mozilla/xpfe/appshell/src/Makefile.in
@@ -32,6 +32,8 @@ MODULE		= appshell
 LIBRARY_NAME	= nsappshell
 EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= appshell
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  widget \
diff --git a/mozilla/xpfe/browser/public/Makefile.in b/mozilla/xpfe/browser/public/Makefile.in
index 32c5388a21d..3a99d9c7672 100644
--- a/mozilla/xpfe/browser/public/Makefile.in
+++ b/mozilla/xpfe/browser/public/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= browser
 XPIDL_MODULE	= mozbrwsr
+GRE_MODULE	= 1
 
 XPIDLSRCS	= nsIBrowserInstance.idl nsIXULBrowserWindow.idl
 
diff --git a/mozilla/xpfe/components/history/public/Makefile.in b/mozilla/xpfe/components/history/public/Makefile.in
index 331bec8cdb8..e8169ba715a 100644
--- a/mozilla/xpfe/components/history/public/Makefile.in
+++ b/mozilla/xpfe/components/history/public/Makefile.in
@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= appcomps
 XPIDL_MODULE	= history
+GRE_MODULE	= 1
 
 SDK_XPIDLSRCS   = nsIGlobalHistory.idl  \
 		  $(NULL)
diff --git a/mozilla/xpfe/components/shistory/public/Makefile.in b/mozilla/xpfe/components/shistory/public/Makefile.in
index e305d30c307..dd6e95330fb 100644
--- a/mozilla/xpfe/components/shistory/public/Makefile.in
+++ b/mozilla/xpfe/components/shistory/public/Makefile.in
@@ -27,6 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= shistory
+GRE_MODULE	= 1
 
 SDK_XPIDLSRCS   = \
                   nsIHistoryEntry.idl \
diff --git a/mozilla/xpfe/components/shistory/src/Makefile.in b/mozilla/xpfe/components/shistory/src/Makefile.in
index 7358b84fea4..8137f54a56b 100644
--- a/mozilla/xpfe/components/shistory/src/Makefile.in
+++ b/mozilla/xpfe/components/shistory/src/Makefile.in
@@ -31,6 +31,8 @@ LIBRARY_NAME	= shistory
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= Session_History_Module
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  necko \
diff --git a/mozilla/xpinstall/cleanup/Makefile.in b/mozilla/xpinstall/cleanup/Makefile.in
index c53b34ee5c6..89e816b767d 100644
--- a/mozilla/xpinstall/cleanup/Makefile.in
+++ b/mozilla/xpinstall/cleanup/Makefile.in
@@ -30,6 +30,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpinstall
 PROGRAM		= xpicleanup$(BIN_SUFFIX)
+GRE_MODULE	= 1
 REQUIRES	= libreg \
 		  $(NULL)
 
diff --git a/mozilla/xpinstall/public/Makefile.in b/mozilla/xpinstall/public/Makefile.in
index b3bba3ef661..d27ca06f4fd 100644
--- a/mozilla/xpinstall/public/Makefile.in
+++ b/mozilla/xpinstall/public/Makefile.in
@@ -30,6 +30,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpinstall
+GRE_MODULE	= 1
 
 XPIDLSRCS	= \
 		nsIXPIDialogService.idl \
diff --git a/mozilla/xpinstall/src/Makefile.in b/mozilla/xpinstall/src/Makefile.in
index 3582efa98ed..24bf91f38f8 100644
--- a/mozilla/xpinstall/src/Makefile.in
+++ b/mozilla/xpinstall/src/Makefile.in
@@ -29,18 +29,14 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-# Make this a true dynamic component even in static builds because
-# this component is shared by installer
-MOZ_STATIC_COMPONENT_LIBS=
-BUILD_STATIC_LIBS=
-BUILD_SHARED_LIBS=1
-
 MODULE		= xpinstall
 LIBRARY_NAME	= xpinstall
 EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= xpinstal
 IS_COMPONENT	= 1
 MODULE_NAME	= nsSoftwareUpdate
+GRE_MODULE	= 1
+
 REQUIRES	= xpcom \
 		  string \
 		  jar \
@@ -121,6 +117,10 @@ EXTRA_DSO_LDOPTS = \
 		$(ZLIB_LIBS) \
 		$(NULL)
 
+# Make this a true dynamic component even in static builds because
+# this component is shared by installer
+FORCE_SHARED_LIB	= 1
+
 include $(topsrcdir)/config/rules.mk
 
 ifeq ($(OS_ARCH),WINNT)