Bug 610556 - Linker errors on shared builds with NS_SetDllDirectory; r=khuey a=bsmedberg

--HG--
rename : toolkit/xre/nsSetDllDirectory.cpp => xpcom/base/nsSetDllDirectory.cpp
rename : toolkit/xre/nsSetDllDirectory.h => xpcom/base/nsSetDllDirectory.h

browser/app/Makefile.in

@@ -93,6 +93,7 @@ endif
 CPPSRCS = nsBrowserApp.cpp
 
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
+LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base
 
 ifdef BUILD_STATIC_LIBS
 ifdef _MSC_VER

dom/plugins/Makefile.in

@@ -140,7 +140,7 @@ endif
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/modules/plugin/base/public/ \
   -I$(topsrcdir)/modules/plugin/base/src/ \
-  -I$(topsrcdir)/toolkit/xre \
+  -I$(topsrcdir)/xpcom/base/ \
   $(NULL)
 
 include $(topsrcdir)/config/config.mk

ipc/app/Makefile.in

@@ -63,6 +63,7 @@ LIBS += \
 endif
 
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
+LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base
 
 ifndef MOZ_WINCONSOLE
 ifdef MOZ_DEBUG

modules/plugin/base/src/Makefile.in

@@ -77,7 +77,7 @@ ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
 	CPPSRCS += nsPluginsDirWin.cpp
 	CPPSRCS += nsPluginNativeWindowWin.cpp
 	CPPSRCS += nsPluginDirServiceProvider.cpp
-	LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
+	LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 	CPPSRCS += nsPluginsDirOS2.cpp

toolkit/xre/Makefile.in

@@ -89,7 +89,6 @@ endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 CPPSRCS += nsNativeAppSupportWin.cpp
-CPPSRCS += nsSetDllDirectory.cpp
 DEFINES += -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE
 EXPORTS = nsWindowsDllInterceptor.h
 else

xpcom/base/Makefile.in

@@ -96,6 +96,10 @@ EXPORTS_mozilla = \
 	FunctionTimer.h \
 	$(NULL)
 
+ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
+CPPSRCS += nsSetDllDirectory.cpp
+endif
+
 ifeq ($(OS_ARCH),WINNT)
 ifdef MOZ_DEBUG
 CSRCS		+= pure_api.c