Bugscape 11533 - hooking up commercial splash screen. Adding a rule to xpfe/bootstrap/Makefile.in to echo the list of object files so that we don't have to duplicate it in the commercial version. No longer exporting splash.xpm to dist/bin or packaging it, since it's compiled in. r=cls.

xpfe/bootstrap/Makefile.in

@@ -191,8 +191,10 @@ OS2_PROGRAM_RESOURCE = $(srcdir)/splashos2.rc
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk)
+SPLASH_XPM = $(srcdir)/splash.xpm
 CPPSRCS += nsNativeAppSupportGtk.cpp \
 	   nsNativeAppSupportBase.cpp
+DEFINES += -DSPLASH_XPM=\"$(SPLASH_XPM)\"
 LIBS += $(MOZ_GTK_LDFLAGS)
 endif
 
@@ -221,6 +223,10 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk)
+$(PROGRAM): $(SPLASH_XPM)
+endif
+
 ifeq ($(OS_ARCH),Darwin)
 # don't let us build with "-dynamiclib"
 EXTRA_DSO_LDOPTS = -execute
@@ -262,6 +268,8 @@ endif
 
 CXXFLAGS	+= $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
 
+LOCAL_INCLUDES	= -I$(srcdir)
+
 ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
 libs:: mozilla.1
 	$(INSTALL) $< $(DIST)/man/man1
@@ -283,11 +291,6 @@ libs:: $(srcdir)/splash.bmp
 	$(INSTALL) $< $(DIST)/bin
 endif
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk)
-libs:: $(srcdir)/splash.xpm
-	$(INSTALL) $< $(DIST)/bin
-endif
-
 ifeq ($(OS_ARCH),OS2)
 ifdef BUILD_STATIC_LIBS
 $(EXE_DEF_FILE):
@@ -338,3 +341,5 @@ libs:: $(PROGRAM)
 
 endif
 
+echo_objs:
+	@echo $(OBJS)

xpinstall/packager/packages-unix

@@ -58,7 +58,6 @@ bin/regExport
 bin/regxpcom
 bin/regchrome
 bin/mozilla-xremote-client
-bin/splash.xpm
 bin/xpicleanup
 bin/res/cmessage.txt
 ; this is used by gtk embedding clients