Bug 610556 - Linker errors on shared builds with NS_SetDllDirectory;
(Dv1-CC) s/topsrcdir/MOZILLA_SRCDIR/, Fix Sunbird too.
--- a/calendar/sunbird/app/Makefile.in
+++ b/calendar/sunbird/app/Makefile.in
@@ -88,17 +88,20 @@ ifneq (,$(filter OS2 WINCE WINNT,$(OS_AR
PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
else
PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
endif
CPPSRCS = nsCalendarApp.cpp
-LOCAL_INCLUDES += -I$(MOZILLA_SRCDIR)/toolkit/xre
+LOCAL_INCLUDES += \
+ -I$(MOZILLA_SRCDIR)/toolkit/xre \
+ -I$(MOZILLA_SRCDIR)/xpcom/base \
+ $(NULL)
ifdef BUILD_STATIC_LIBS
ifdef _MSC_VER
STATIC_COMPONENTS_LINKER_PATH = -LIBPATH:$(DEPTH)/staticlib
else
STATIC_COMPONENTS_LINKER_PATH = -L$(DEPTH)/staticlib
endif
LIBS += $(MOZDEPTH)/toolkit/xre/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -85,18 +85,20 @@ else
PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
endif
CPPSRCS = nsMailApp.cpp
DIST_FILES = application.ini
-LOCAL_INCLUDES += -I$(MOZILLA_SRCDIR)/toolkit/xre
-LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base
+LOCAL_INCLUDES += \
+ -I$(MOZILLA_SRCDIR)/toolkit/xre \
+ -I$(MOZILLA_SRCDIR)/xpcom/base \
+ $(NULL)
ifdef BUILD_STATIC_LIBS
ifdef _MSC_VER
STATIC_COMPONENTS_LINKER_PATH = -LIBPATH:$(MOZDEPTH)/staticlib
else
STATIC_COMPONENTS_LINKER_PATH = -L$(MOZDEPTH)/staticlib
endif
LIBS += $(MOZDEPTH)/toolkit/xre/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -71,18 +71,20 @@ else
PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
endif
CPPSRCS = nsSuiteApp.cpp
DIST_FILES = application.ini
-LOCAL_INCLUDES += -I$(MOZILLA_SRCDIR)/toolkit/xre
-LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base
+LOCAL_INCLUDES += \
+ -I$(MOZILLA_SRCDIR)/toolkit/xre \
+ -I$(MOZILLA_SRCDIR)/xpcom/base \
+ $(NULL)
ifdef BUILD_STATIC_LIBS
ifdef _MSC_VER
STATIC_COMPONENTS_LINKER_PATH = -LIBPATH:$(MOZDEPTH)/staticlib
else
STATIC_COMPONENTS_LINKER_PATH = -L$(MOZDEPTH)/staticlib
endif
LIBS += $(MOZDEPTH)/toolkit/xre/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)