243344 - consolidate makefiles in xpfe and components

xpfe/Makefile.in

@@ -46,29 +46,14 @@ MODULE       = browser
 PACKAGE_FILE = xpfe.pkg
 PACKAGE_VARS = USE_SHORT_LIBNAME
 
-# *Don't* build browser or communicator for Firefox - it's unnecessary cruft.
 ifdef MOZ_PHOENIX
 DIRS += \
         browser/public \
         browser/src \
-        components/directory \
-        components/filepicker \
-        components/find \
-        components/intl \
-        components/killAll \
-        components/resetPref \
-        components/search \
-        components/shistory \
-        components/windowds \
         $(NULL)
-
-ifdef MOZ_ENABLE_XREMOTE
-DIRS += components/xremote
-endif
-
-DIRS += components/build
 else
 DIRS += browser components/shistory communicator global
+endif
 
 # Because of our great use of encapsulation, there are
 # some header file in xpfe/components that are required
@@ -78,7 +63,6 @@ DIRS += browser components/shistory communicator global
 ifdef MOZ_XPFE_COMPONENTS
 DIRS     += components
 endif
-endif
 
 include $(topsrcdir)/config/rules.mk
 

xpfe/components/Makefile.in

@@ -42,24 +42,27 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+MOZ_HAVE_BROWSER=1
 ifdef MOZ_THUNDERBIRD
-MOZ_STANDALONE_NONBROWSER_XULAPP=1
+MOZ_HAVE_BROWSER=
 endif
 ifdef MOZ_STANDALONE_COMPOSER
-MOZ_STANDALONE_NONBROWSER_XULAPP=1
+MOZ_HAVE_BROWSER=
+endif
+ifdef MOZ_PHOENIX
+# Firefox uses this flag to stop the automatic processing of the jar.mn file
+# that lives parallel to this Makefile. The jar.mn is responsible for the 
+# packaging of a large number of chrome files Firefox does not need. 
+NO_DIST_INSTALL=1
 endif
 
-ifndef MOZ_STANDALONE_NONBROWSER_XULAPP
+ifdef MOZ_HAVE_BROWSER
 DIRS	= \
 			directory \
 			filepicker \
 			find \
 			search \
-			related \
-			prefwindow \
 			shistory \
-			console \
-			updates \
 			intl \
 			resetPref \
 			killAll \
@@ -68,6 +71,10 @@ DIRS	= \
 
 ifndef MOZ_PHOENIX
 DIRS += \
+		related \
+		prefwindow \
+		console \
+		updates \
 		autocomplete \
 		bookmarks \
 		download-manager \
@@ -78,18 +85,17 @@ DIRS += \
 endif
 
 ifeq ($(OS_ARCH),WINNT)
-DIRS		+= urlwidget 
 ifndef MOZ_PHOENIX
-DIRS    += winhooks alerts
+DIRS    += urlwidget winhooks alerts
 endif
 endif
 
 else
-
+# !MOZ_HAVE_BROWSER
 DIRS    = \
           intl \
-	  find \
-	  filepicker \
+          find \
+          filepicker \
           download-manager \
           autocomplete \
           windowds \
@@ -111,7 +117,7 @@ ifdef MOZ_ENABLE_XREMOTE
 DIRS		+= xremote
 endif
 
-ifndef MOZ_STANDALONE_NONBROWSER_XULAPP
+ifdef MOZ_HAVE_BROWSER
 DIRS		+= build
 else
 DIRS		+= build2