wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
browser/app/Makefile.in
View File

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

7
xulrunner/app/Makefile.in
View File

@ -107,18 +107,11 @@ endif
LIBS += \ LIBS += \
$(EXTRA_DSO_LIBS) \ $(EXTRA_DSO_LIBS) \
$(MOZ_JS_LIBS) \
$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
$(XPCOM_LIBS) \ $(XPCOM_LIBS) \
$(NSPR_LIBS) \ $(NSPR_LIBS) \
$(TK_LIBS) \
$(NULL) $(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 ifdef MOZ_JPROF
LIBS += -ljprof LIBS += -ljprof
endif endif