Move wrappers directory in a desperate attempt to make our build system build bug 574924.

--HG--
rename : js/src/xpconnect/src/wrappers/AccessCheck.cpp => js/src/xpconnect/wrappers/AccessCheck.cpp
rename : js/src/xpconnect/src/wrappers/AccessCheck.h => js/src/xpconnect/wrappers/AccessCheck.h
rename : js/src/xpconnect/src/wrappers/CrossOriginWrapper.cpp => js/src/xpconnect/wrappers/CrossOriginWrapper.cpp
rename : js/src/xpconnect/src/wrappers/CrossOriginWrapper.h => js/src/xpconnect/wrappers/CrossOriginWrapper.h
rename : js/src/xpconnect/src/wrappers/FilteringWrapper.cpp => js/src/xpconnect/wrappers/FilteringWrapper.cpp
rename : js/src/xpconnect/src/wrappers/FilteringWrapper.h => js/src/xpconnect/wrappers/FilteringWrapper.h
rename : js/src/xpconnect/src/wrappers/Makefile.in => js/src/xpconnect/wrappers/Makefile.in
rename : js/src/xpconnect/src/wrappers/WrapperFactory.cpp => js/src/xpconnect/wrappers/WrapperFactory.cpp
rename : js/src/xpconnect/src/wrappers/WrapperFactory.h => js/src/xpconnect/wrappers/WrapperFactory.h
rename : js/src/xpconnect/src/wrappers/XrayWrapper.cpp => js/src/xpconnect/wrappers/XrayWrapper.cpp
rename : js/src/xpconnect/src/wrappers/XrayWrapper.h => js/src/xpconnect/wrappers/XrayWrapper.h

js/src/xpconnect/Makefile.in

@@ -44,7 +44,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpconnect
-DIRS		= public idl
+DIRS		= public idl wrappers
 
 ifdef MOZ_JSLOADER
 DIRS         +=  loader

js/src/xpconnect/src/Makefile.in

@@ -46,8 +46,6 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpconnect
 
-DIRS            = wrappers
-
 ifeq (xpconnect, $(findstring xpconnect, $(BUILD_MODULES)))
 LIBRARY_NAME	= xpconnect
 EXPORT_LIBRARY = 1
@@ -118,7 +116,7 @@ endif
 include $(topsrcdir)/config/config.mk
 
 LOCAL_INCLUDES = \
-		-I$(srcdir)/wrappers \
+		-I$(srcdir)/../wrappers \
 		-I$(srcdir)/../loader \
 		-I$(topsrcdir)/js/src \
 		-I$(topsrcdir)/js/src/nanojit \
@@ -141,7 +139,7 @@ SHARED_LIBRARY_LIBS = \
 endif
 
 SHARED_LIBRARY_LIBS += \
-		./wrappers/$(LIB_PREFIX)xpcwrappers_s.$(LIB_SUFFIX) \
+		../wrappers/$(LIB_PREFIX)xpcwrappers_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk

js/src/xpconnect/src/nsXPConnect.cpp

@@ -56,7 +56,7 @@
 
 #include "jstypedarray.h"
 
-#include "wrappers/XrayWrapper.h"
+#include "XrayWrapper.h"
 
 NS_IMPL_THREADSAFE_ISUPPORTS6(nsXPConnect,
                               nsIXPConnect,

js/src/xpconnect/wrappers/Makefile.in

@@ -35,7 +35,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH 		= ../../../../..
+DEPTH 		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
@@ -54,6 +54,6 @@ CPPSRCS		= AccessCheck.cpp \
 		  WrapperFactory.cpp
 
 LOCAL_INCLUDES = \
-                -I$(srcdir)/.. \
+                -I$(srcdir)/../src \
 
 include $(topsrcdir)/config/rules.mk