From a1b7adf83167a94d606c635c261b584967880d0b Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Sat, 18 Aug 2012 07:43:46 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:sugar-build/sugar-build

Conflicts:
	Makefile
	scripts/sugar.modules
---
diff --git a/Makefile b/Makefile
index fee9f3b..6794c7d 100644
--- a/Makefile
+++ b/Makefile
@@ -66,13 +66,6 @@ bug-report:
 
 clean:
 	rm -rf build install
-	rm -rf source/sugar
-	rm -rf source/sugar-datastore
-	rm -rf source/sugar-artwork
-	rm -rf source/sugar-toolkit
-	rm -rf source/sugar-base
-	rm -rf source/sugar-toolkit-gtk3
-	rm -rf source/sugar-fructose
 	rm -rf source/at-spi2-core
 	rm -rf source/at-spi2-atk
 	rm -rf source/gstreamer
diff --git a/scripts/sugar.modules b/scripts/sugar.modules
index 3b6dd68..c0f3f80 100644
--- a/scripts/sugar.modules
+++ b/scripts/sugar.modules
@@ -3,22 +3,22 @@
 <moduleset>
   <repository type="git" name="git.sugarlabs.org" default="yes"
       href="git://git.sugarlabs.org"/>
-  <autotools id="sugar-base" supports-non-srcdir-builds="no">
+  <autotools id="sugar-base">
     <branch module="sugar-base/mainline.git" checkoutdir="sugar-base"/>
   </autotools>
-  <autotools id="sugar-toolkit" supports-non-srcdir-builds="no">
+  <autotools id="sugar-toolkit">
     <branch module="sugar-toolkit/mainline.git" checkoutdir="sugar-toolkit"/>
     <dependencies>
       <dep package="sugar-datastore"/>
     </dependencies>
   </autotools>
-  <autotools id="sugar-toolkit-gtk3" supports-non-srcdir-builds="no">
+  <autotools id="sugar-toolkit-gtk3">
     <branch module="~manuq/sugar-toolkit-gtk3/manuqs-sugar-toolkit-gtk3.git" checkoutdir="sugar-toolkit-gtk3"/>
     <dependencies>
       <dep package="sugar-datastore"/>
     </dependencies>
   </autotools>
-  <autotools id="sugar" supports-non-srcdir-builds="no">
+  <autotools id="sugar">
     <branch module="~manuq/sugar/manuqs-erikos-shell-port.git" checkoutdir="sugar"/>
     <dependencies>
       <dep package="sugar-base"/>
@@ -26,10 +26,10 @@
       <dep package="sugar-artwork"/>
     </dependencies>
   </autotools>
-  <autotools id="sugar-artwork" supports-non-srcdir-builds="no">
+  <autotools id="sugar-artwork">
     <branch module="sugar-artwork/mainline.git" checkoutdir="sugar-artwork"/>
   </autotools>
-  <autotools id="sugar-datastore" supports-non-srcdir-builds="no">
+  <autotools id="sugar-datastore">
     <branch module="sugar-datastore/mainline.git" checkoutdir="sugar-datastore"/>
   </autotools>
 
--
cgit v0.9.1