Bug 833879 - Move layout/xul/base/src/tree/ to layout/xul/tree, layout/xul/base/src/grid to layout/xul/grid. r=roc

content/events/src/Makefile.in

@@ -81,7 +81,7 @@ LOCAL_INCLUDES	+= \
              -I$(srcdir)/../../../dom/src/storage \
              -I$(srcdir)/../../../layout/generic \
              -I$(srcdir)/../../../layout/xul/base/src \
-             -I$(srcdir)/../../../layout/xul/base/src/tree/src \
+             -I$(srcdir)/../../../layout/xul/tree/ \
              $(NULL)
 
 ifdef MOZ_B2G_RIL

content/xul/templates/src/Makefile.in

@@ -51,7 +51,7 @@ include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= -I$(srcdir)/../../../base/src \
 		  -I$(srcdir)/../../content/src \
-		  -I$(srcdir)/../../../../layout/xul/base/src/tree/src \
+		  -I$(srcdir)/../../../../layout/xul/tree/ \
 		  $(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT

dom/dom-config.mk

@@ -35,7 +35,7 @@ DOM_SRCDIRS = \
   layout/generic \
   layout/style \
   layout/xul/base/src \
-  layout/xul/base/src/tree/src \
+  layout/xul/tree \
   dom/camera \
   $(NULL)
 

layout/Makefile.in

@@ -29,6 +29,10 @@ ifdef NS_PRINTING
 PARALLEL_DIRS += printing
 endif
 
+ifdef MOZ_XUL
+PARALLEL_DIRS += xul/tree xul/grid
+endif
+
 PARALLEL_DIRS += inspector/public inspector/src
 ifdef ENABLE_TESTS
 PARALLEL_DIRS += inspector/tests inspector/tests/chrome

layout/base/Makefile.in

@@ -138,7 +138,7 @@ LOCAL_INCLUDES += \
 		-I$(srcdir)/../tables \
 		-I$(srcdir)/../printing \
 		-I$(srcdir)/../xul/base/src \
-		-I$(srcdir)/../xul/base/src/tree/src \
+		-I$(srcdir)/../xul/tree/ \
 		-I$(srcdir)/../../content/base/src \
 		-I$(srcdir)/../../content/events/src \
 		-I$(srcdir)/../../content/xbl/src \

layout/build/Makefile.in

@@ -236,8 +236,8 @@ endif
 
 ifdef MOZ_XUL
 SHARED_LIBRARY_LIBS += \
-		../xul/base/src/tree/src/$(LIB_PREFIX)gkxultree_s.$(LIB_SUFFIX) \
-		../xul/base/src/grid/$(LIB_PREFIX)gkxulgrid_s.$(LIB_SUFFIX) \
+		../xul/tree/$(LIB_PREFIX)gkxultree_s.$(LIB_SUFFIX) \
+		../xul/grid/$(LIB_PREFIX)gkxulgrid_s.$(LIB_SUFFIX) \
 		$(DEPTH)/content/xul/content/src/$(LIB_PREFIX)gkconxulcon_s.$(LIB_SUFFIX) \
 		$(DEPTH)/content/xul/templates/src/$(LIB_PREFIX)gkconxultmpl_s.$(LIB_SUFFIX) \
 		$(NULL)

layout/reftests/reftest.list

@@ -313,7 +313,7 @@ skip-if(B2G) include xul/reftest.list
 skip-if(B2G) include ../xul/base/reftest/reftest.list
 
 # xul grid
-skip-if(B2G) include ../xul/base/src/grid/reftests/reftest.list
+skip-if(B2G) include ../xul/grid/reftests/reftest.list
 
 # z-index/
 skip-if(B2G) include z-index/reftest.list

layout/xul/base/src/Makefile.in

@@ -17,11 +17,6 @@ ifndef _MSC_VER
 FAIL_ON_WARNINGS = 1
 endif # !_MSC_VER
 
-
-ifdef MOZ_XUL
-PARALLEL_DIRS = tree/public tree/src grid
-endif
-
 CPPSRCS		= \
 		nsScrollBoxFrame.cpp \
 		nsRootBoxFrame.cpp \

layout/xul/base/src/tree/public/Makefile.in

@@ -1,26 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= layout
-XPIDL_MODULE	= layout_xul_tree
-
-XPIDLSRCS=	nsITreeColumns.idl \
-		nsITreeView.idl \
-                nsITreeSelection.idl \
-                nsITreeBoxObject.idl \
-                nsITreeContentView.idl \
-                $(NULL)
-
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
-include $(topsrcdir)/config/rules.mk
-

layout/xul/grid/Makefile.in

@@ -41,10 +41,10 @@ EXPORTS = \
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir) \
-		-I$(srcdir)/../../../base/src \
-		-I$(srcdir)/../../../../generic \
-		-I$(srcdir)/../../../../style \
-		-I$(srcdir)/../../../../forms \
+		-I$(srcdir)/../base/src \
+		-I$(srcdir)/../../generic \
+		-I$(srcdir)/../../style \
+		-I$(srcdir)/../../forms \
 		$(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.

layout/xul/tree/Makefile.in

@@ -11,10 +11,19 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= layout
+XPIDL_MODULE	= layout_xul_tree
 LIBRARY_NAME	= gkxultree_s
 LIBXUL_LIBRARY  = 1
 FAIL_ON_WARNINGS = 1
 
+XPIDLSRCS	= \
+		nsITreeColumns.idl \
+		nsITreeView.idl \
+		nsITreeSelection.idl \
+		nsITreeBoxObject.idl \
+		nsITreeContentView.idl \
+		$(NULL)
+
 CPPSRCS		= \
 		nsTreeBodyFrame.cpp \
 		nsTreeBoxObject.cpp \
@@ -34,12 +43,12 @@ EXPORTS		= \
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir) \
-		-I$(srcdir)/../../../../../../content/events/src \
-		-I$(srcdir)/../../../../base/src \
-		-I$(srcdir)/../../../../../base \
-		-I$(srcdir)/../../../../../generic \
-		-I$(srcdir)/../../../../../style \
-		-I$(srcdir)/../../../../../forms \
+		-I$(topsrcdir)/content/events/src \
+		-I$(srcdir)/../base/src \
+		-I$(srcdir)/../../base \
+		-I$(srcdir)/../../generic \
+		-I$(srcdir)/../../style \
+		-I$(srcdir)/../../forms \
 		$(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.