[Libreoffice-commits] .: 2 commits - RepositoryExternal.mk Repository.mk RepositoryModule_ooo.mk

[Matus Kukan]

 Repository.mk           |    4 ++++
 RepositoryExternal.mk   |   24 ++++++++++++++++++++++++
 RepositoryModule_ooo.mk |    5 ++++-
 3 files changed, 32 insertions(+), 1 deletion(-)

New commits:
commit 05bd1da8bdedfac559306b5753c28b63d8fcbb7d
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Thu Jul 28 01:11:12 2011 +0200

    more modules in gbuild

diff --git a/Repository.mk b/Repository.mk
index 94d4b7d..be48a4c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -45,9 +45,12 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 	adabas \
 	adabasui \
 	agg \
+	analysis \
 	animcore \
+	basctl \
 	basebmp \
 	canvastools \
+	date \
 	forui \
 	odbc \
 	odbcbase \
@@ -106,6 +109,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     sfx \
     sm \
     smd \
+	solver \
     sot \
     spa \
     svl \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 98758f3..95253e9 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -28,7 +28,8 @@
 $(eval $(call gb_Module_Module,ooo))
 
 $(eval $(call gb_Module_add_moduledirs,ooo,\
-	animations \
+    animations \
+    basctl \
     chart2 \
     comphelper \
     cui \
@@ -46,6 +47,8 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     oox \
     padmin \
     sc \
+    scaddins \
+    sccomp \
     sd \
     sfx2 \
     slideshow \
commit 3910794245fd3d38081de4bfcf37fe7f38fc1761
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Thu Jul 28 01:03:23 2011 +0200

    add lpsolve55 to external libs

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 795e553..0eb3f61 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -437,6 +437,30 @@ endef
 
 endif # SYSTEM_OPENSSL
 
+
+ifeq ($(SYSTEM_LPSOLVE),YES)
+
+define gb_LinkTarget__use_lpsolve55
+$(call gb_LinkTarget_add_libs,$(1),-llpsolve55)
+
+endef
+
+else # !SYSTEM_LPSOLVE
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+	lpsolve55 \
+))
+
+define gb_LinkTarget__use_lpsolve55
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+	lpsolve55 \
+)
+
+endef
+
+endif # SYSTEM_LPSOLVE
+
+
 define gb_LinkTarget__use_gtk
 $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \