From f6d769bd98a0c9d65f745d06215502883b0f86ad Mon Sep 17 00:00:00 2001
From: "bsmedberg%covad.net" <bsmedberg%covad.net>
Date: Fri, 10 Dec 2004 17:58:29 +0000
Subject: [PATCH] The gnome icon decoder cannot be part of libxul because it
 uses gnome libs that are allowed to not be present at runtime. See bug 273876

---
 modules/libpr0n/decoders/Makefile.in      | 14 +++++++-------
 modules/libpr0n/decoders/icon/Makefile.in |  9 ++++-----
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/modules/libpr0n/decoders/Makefile.in b/modules/libpr0n/decoders/Makefile.in
index 93bb08e1f993..fbb25d569427 100644
--- a/modules/libpr0n/decoders/Makefile.in
+++ b/modules/libpr0n/decoders/Makefile.in
@@ -42,22 +42,22 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= $(MOZ_IMG_DECODERS)
-
-ifneq (,$(findstring icon,$(MOZ_IMG_DECODERS)))
+ifneq (,$(filter icon,$(MOZ_IMG_DECODERS)))
 ifdef MOZ_ENABLE_GNOMEUI
-DIRS    := icon/gtk $(DIRS)
+TOOL_DIRS = icon/gtk icon
 endif
 ifeq ($(OS_ARCH),WINNT)
-DIRS		:= icon/win $(DIRS)
+DIRS = icon/win icon
 endif
 ifeq ($(OS_ARCH),OS2)
-DIRS		:= icon/os2 $(DIRS)
+DIRS = icon/os2 icon
 endif
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-DIRS		:= icon/mac $(DIRS)
+DIRS = icon/mac icon
 endif
 endif # icon
 
+DIRS += $(filter-out icon,$(MOZ_IMG_DECODERS))
+
 include $(topsrcdir)/config/rules.mk
 
diff --git a/modules/libpr0n/decoders/icon/Makefile.in b/modules/libpr0n/decoders/icon/Makefile.in
index 08fe12666c8a..11b6a529c953 100644
--- a/modules/libpr0n/decoders/icon/Makefile.in
+++ b/modules/libpr0n/decoders/icon/Makefile.in
@@ -48,7 +48,6 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsIconDecoderModule
 GRE_MODULE	= 1
-LIBXUL_LIBRARY = 1
 
 PACKAGE_FILE = imgicon.pkg
 
@@ -57,10 +56,12 @@ EXTRA_DSO_LDOPTS = $(MOZ_GNOMEUI_LIBS)
 PLATFORM = gtk
 FORCE_SHARED_LIB = 1
 EXPORT_LIBRARY =
+else
+LIBXUL_LIBRARY = 1
 endif
 
 ifeq ($(OS_ARCH),WINNT)
-EXTRA_DSO_LIBS	= gkgfx
+EXTRA_DSO_LIBS = gkgfx
 PLATFORM = win
 endif
 
@@ -72,8 +73,6 @@ ifeq ($(OS_ARCH),Darwin)
 PLATFORM = mac
 endif
 
-DIRS		= $(PLATFORM)
-
 REQUIRES	= xpcom \
 		  string \
 		  gfx \
@@ -86,7 +85,7 @@ CPPSRCS		= \
 		nsIconModule.cpp \
 		nsIconProtocolHandler.cpp \
 		$(NULL)
-		
+
 ifeq (,$(filter-out Darwin OS2,$(OS_ARCH)))
 CPPSRCS	+= nsIconDecoder.cpp
 endif