Bug 584474 part 8 - Applications don't need to link against libraries that are either part of libxul or only used by libxul. r=ted

This commit is contained in:
Mike Hommey 2011-02-25 15:02:04 +01:00
parent 02d1b83149
commit ba03d5da53
2 changed files with 6 additions and 8 deletions

View File

@ -124,9 +124,13 @@ endif
LIBS += \
$(STATIC_COMPONENTS_LINKER_PATH) \
$(EXTRA_DSO_LIBS) \
$(MOZ_JS_LIBS) \
$(APP_XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NULL)
ifdef BUILD_STATIC_LIBS
LIBS += \
$(MOZ_JS_LIBS) \
$(TK_LIBS) \
$(NULL)
@ -134,6 +138,7 @@ LIBS += \
ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
LIBS += $(XLDFLAGS) $(XLIBS) $(ZLIB_LIBS)
endif
endif
ifdef MOZ_JPROF
LIBS += -ljprof

View File

@ -107,18 +107,11 @@ endif
LIBS += \
$(EXTRA_DSO_LIBS) \
$(MOZ_JS_LIBS) \
$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(TK_LIBS) \
$(NULL)
# Add explicit X11 dependency when building against X11 toolkits
ifneq (,$(filter gtk gtk2 xlib,$(MOZ_WIDGET_TOOLKIT)))
LIBS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS)
endif
ifdef MOZ_JPROF
LIBS += -ljprof
endif