Bug 363491 Stops xul apps needing to build in xpfe/global. r=benjamin,mscott,sr=Neil

xpfe/Makefile.in

@@ -53,13 +53,17 @@ DIRS += \
         $(NULL)
 else
 ifndef MOZ_SUNBIRD
-DIRS += browser global
+DIRS += browser
 ifndef MOZ_SUITE
 DIRS += communicator
 endif
 endif
 endif
 
+ifndef MOZ_XUL_APP
+DIRS += global
+endif
+
 # Because of our great use of encapsulation, there are
 # some header file in xpfe/components that are required
 # by layout and the dom.  This MOZ_XPFE_COMPONENTS, if 

xpfe/global/Makefile.in

@@ -66,10 +66,8 @@ build.dtd: build.dtd.in $(DEPTH)/config/build_number
 	@$(RM) -f $@
 	$(PERL) -I$(topsrcdir)/config $(topsrcdir)/config/aboutime.pl $@ $(DEPTH)/config/build_number $(srcdir)/build.dtd.in
 
-ifndef MOZ_XUL_APP
 libs realchrome::
 	@$(REGCHROME) locale en-US/global-platform/$(CHROME_PLATFORM) en-US.jar
 
 install::
 	@$(REGCHROME_INSTALL) locale en-US/global-platform/$(CHROME_PLATFORM) en-US.jar
-endif

xpfe/global/jar.mn

@@ -1,5 +1,4 @@
 toolkit.jar:
-#ifndef MOZ_XUL_APP
 *       content/global/contents.rdf                 (resources/content/contents.rdf)
 *       content/global-platform/contents.rdf        (resources/content/contents-platform.rdf)
 *       content/global-region/contents.rdf          (resources/content/contents-region.rdf)
@@ -74,19 +73,17 @@ toolkit.jar:
 #ifdef MOZ_SVG
         content/global/svg/svgBindings.xml          (/layout/svg/base/src/resources/content/svgBindings.xml)
 #endif
-#endif
-        content/global/hiddenWindow.xul             (resources/content/hiddenWindow.xul) 
+        content/global/about.xul                    (resources/content/about.xul) 
 #ifdef MOZ_SUITE
         content/global/logo.gif                     (/suite/branding/content/logo.gif) 
 #else
         content/global/logo.gif                     (resources/content/logo.gif) 
-#endif
         content/global/aboutAbout.html              (resources/content/aboutAbout.html) 
-        content/global/about.xul                    (resources/content/about.xul) 
+        content/global/hiddenWindow.xul             (resources/content/hiddenWindow.xul) 
         content/global/fullScreen.js                (resources/content/fullScreen.js)
         content/global/build.dtd                    (build.dtd)
+#endif
 
-#ifndef MOZ_XUL_APP
 en-US.jar:
 *   locale/en-US/global/contents.rdf                (resources/locale/en-US/contents.rdf) 
     locale/en-US/global/intl.css                    (resources/locale/en-US/intl.css) 
@@ -129,4 +126,3 @@ en-US.jar:
     locale/en-US/global-platform/mac/platformDialogOverlay.dtd  (resources/locale/en-US/mac/platformDialogOverlay.dtd)
     locale/en-US/global-platform/mac/platformKeys.properties    (resources/locale/en-US/mac/platformKeys.properties)
     locale/en-US/global-platform/mac/wizard.properties          (resources/locale/en-US/mac/wizard.properties)
-#endif

xpfe/global/resources/content/Makefile.in

@@ -54,7 +54,6 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
-ifndef MOZ_XUL_APP
 libs realchrome::
 	@$(REGCHROME) content global toolkit.jar
 	@$(REGCHROME) locale en-US/global en-US.jar
@@ -62,4 +61,3 @@ libs realchrome::
 install::
 	@$(REGCHROME_INSTALL) content global toolkit.jar
 	@$(REGCHROME_INSTALL) locale en-US/global en-US.jar
-endif