Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-24 19:37:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
bsmedberg%covad.net 2004-12-10 17:58:29 +00:00
parent c94e575e59
commit f6d769bd98
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/libpr0n/decoders/Makefile.in
View File

@ -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

9
modules/libpr0n/decoders/icon/Makefile.in
View File

@ -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