From 12ab3f7ef79c0a1505d7de874312346155ea52d8 Mon Sep 17 00:00:00 2001 From: "mvl%exedo.nl" Date: Thu, 9 Feb 2006 18:49:36 +0000 Subject: [PATCH] Bug 325592. the 1.8 branch needs different linking. r=bsmedberg. Patch by michael.buettner@sun.com and I git-svn-id: svn://10.0.0.236/trunk@189490 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/calendar/sunbird/app/Makefile.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mozilla/calendar/sunbird/app/Makefile.in b/mozilla/calendar/sunbird/app/Makefile.in index b14f1e9e443..01fa648bbb3 100644 --- a/mozilla/calendar/sunbird/app/Makefile.in +++ b/mozilla/calendar/sunbird/app/Makefile.in @@ -69,6 +69,9 @@ CPPSRCS = nsCalendarApp.cpp LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre +ifdef MOZILLA_1_8_BRANCH +LIBS += $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX) +else ifdef BUILD_STATIC_LIBS STATIC_COMPONENTS_LINKER_PATH = -L$(DIST)/lib/components LIBS += $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX) @@ -79,6 +82,7 @@ else EXTRA_DSO_LIBS += xul endif endif +endif ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) TK_LIBS := -framework Cocoa $(TK_LIBS)