Bug 692625 - Move browser/components/sidebar/src/ to browser/components/sidebar/; r=gavin
authorEd Morley <bmo@edmorley.co.uk>
Fri, 16 Dec 2011 09:11:21 +0000
changeset 83552 4e4c03e4c37bf184990224d4ff9bfb2accada1ef
parent 83551 d24c34dbf1c8cb9ddf1d4a15d93a8b3c4b6723ab
child 83553 379a992ed77ccf980d7580f56ae54e82af59364e
push idunknown
push userunknown
push dateunknown
reviewersgavin
bugs692625
milestone11.0a1
Bug 692625 - Move browser/components/sidebar/src/ to browser/components/sidebar/; r=gavin
browser/components/Makefile.in
browser/components/sidebar/Makefile.in
browser/components/sidebar/nsSidebar.js
browser/components/sidebar/nsSidebar.manifest
browser/components/sidebar/src/Makefile.in
browser/components/sidebar/src/nsSidebar.js
browser/components/sidebar/src/nsSidebar.manifest
--- a/browser/components/Makefile.in
+++ b/browser/components/Makefile.in
@@ -64,17 +64,17 @@ PARALLEL_DIRS = \
   dirprovider \
   feeds \
   places \
   preferences \
   privatebrowsing \
   search \
   sessionstore \
   shell \
-  sidebar/src \
+  sidebar \
   tabview \
   migration \
   $(NULL)
 
 ifdef MOZ_SAFE_BROWSING
 PARALLEL_DIRS += safebrowsing
 endif
 
rename from browser/components/sidebar/src/Makefile.in
rename to browser/components/sidebar/Makefile.in
--- a/browser/components/sidebar/src/Makefile.in
+++ b/browser/components/sidebar/Makefile.in
@@ -30,17 +30,17 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXTRA_COMPONENTS = nsSidebar.manifest
 EXTRA_PP_COMPONENTS = nsSidebar.js
rename from browser/components/sidebar/src/nsSidebar.js
rename to browser/components/sidebar/nsSidebar.js
rename from browser/components/sidebar/src/nsSidebar.manifest
rename to browser/components/sidebar/nsSidebar.manifest