From ba03d5da53242b8993d2ced724012d9b449796dd Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Fri, 25 Feb 2011 15:02:04 +0100 Subject: [PATCH] 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 --- browser/app/Makefile.in | 7 ++++++- xulrunner/app/Makefile.in | 7 ------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in index e6f70684321..cd46034601e 100644 --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -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 diff --git a/xulrunner/app/Makefile.in b/xulrunner/app/Makefile.in index df8677e1bb5..622a3e4277e 100644 --- a/xulrunner/app/Makefile.in +++ b/xulrunner/app/Makefile.in @@ -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