[Libreoffice-commits] .: 3 commits - Module_ooo.mk Repository.mk

[David Tardon]

 Module_ooo.mk |   58 +++++++++++++++++++++++++++++-----------------------------
 Repository.mk |    2 ++
 2 files changed, 31 insertions(+), 29 deletions(-)

New commits:
commit fb6b4ef0f9bc1939e7d6b39dc71efbfec5a71d63
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Apr 3 19:23:07 2011 +0200

    convert leading tab to spaces

diff --git a/Module_ooo.mk b/Module_ooo.mk
index c6efde0..67eba81 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -14,12 +14,12 @@
 #
 # OpenOffice.org is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.    See the
 # GNU Lesser General Public License version 3 for more details
 # (a copy is included in the LICENSE file that accompanied this code).
 #
 # You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.	If not, see
+# version 3 along with OpenOffice.org.    If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
@@ -28,37 +28,37 @@
 $(eval $(call gb_Module_Module,ooo))
 
 $(eval $(call gb_Module_add_moduledirs,ooo,\
-	comphelper \
-	drawinglayer \
-	editeng \
-	fileaccess \
-	forms \
-	framework \
-	padmin \
-	sfx2 \
-	sot \
-	svl \
-	svtools \
-	svx \
-	sw \
-	toolkit \
-	tools \
-	unotools \
-	unoxml \
-	xmloff \
-	vbahelper \
+    comphelper \
+    drawinglayer \
+    editeng \
+    fileaccess \
+    forms \
+    framework \
+    padmin \
+    sfx2 \
+    sot \
+    svl \
+    svtools \
+    svx \
+    sw \
+    toolkit \
+    tools \
+    unotools \
+    unoxml \
+    xmloff \
+    vbahelper \
 ))
 
 # these have only migrated subsequentcheck for now
 $(eval $(call gb_Module_add_moduledirs,ooo,\
-	chart2 \
-	configmgr \
-	dbaccess \
-	linguistic \
-	qadevOOo \
-	sal \
-	ucb \
-	unotools \
+    chart2 \
+    configmgr \
+    dbaccess \
+    linguistic \
+    qadevOOo \
+    sal \
+    ucb \
+    unotools \
 ))
 
 # vim: set noet ts=4 sw=4:
commit dd1a97f11633439ee32e95c042fa80543d52c277
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Apr 3 19:15:05 2011 +0200

    forms is completely under gbuild now

diff --git a/Module_ooo.mk b/Module_ooo.mk
index 189361d..c6efde0 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -54,7 +54,6 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 	chart2 \
 	configmgr \
 	dbaccess \
-	forms \
 	linguistic \
 	qadevOOo \
 	sal \
commit 6d771550774c918a8b6a9306fe756b69d7b03a58
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Apr 3 19:14:07 2011 +0200

    gbuildize drawinglayer

diff --git a/Module_ooo.mk b/Module_ooo.mk
index bf51377..189361d 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Module_Module,ooo))
 
 $(eval $(call gb_Module_add_moduledirs,ooo,\
 	comphelper \
+	drawinglayer \
 	editeng \
 	fileaccess \
 	forms \
diff --git a/Repository.mk b/Repository.mk
index 5badf86..44fe3c6 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -45,6 +45,8 @@ $(eval $(call gb_Helper_register_executables,OOO, \
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     avmedia \
     basegfx \
+    canvastools \
+    cppcanvas \
     cui \
     dbtools \
     drawinglayer \