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

[Matus Kukan]

 Repository.mk           |    7 +++
 RepositoryExternal.mk   |   92 ++++++++++++++++++++++++++++++++++++++++++++++++
 RepositoryModule_ooo.mk |    3 +
 3 files changed, 102 insertions(+)

New commits:
commit fb497d56ed6baed2f79e2bfbac171756478fd407
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Thu Jul 28 19:04:31 2011 +0200

    basic, salhelper, writerperfect in gbuild

diff --git a/Repository.mk b/Repository.mk
index be48a4c..9552f64 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -89,6 +89,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     lwpft \
     msfilter \
     msword \
+	msworks \
     qstart_gtk \
     resourcemodel \
     rpt \
@@ -133,6 +134,9 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     vclplug_kde \
     vclplug_kde4 \
     vclplug_svp \
+	visioimport \
+	wpft \
+	wpgimport \
     writerfilter \
     xcr \
     xo \
@@ -196,13 +200,16 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
 ))
 
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+	app \
 	basegfx_s \
     libeay32 \
     ssleay32 \
     ooopathutils \
+	sample \
     salcpprt \
     toolshelpers \
 	vclmain \
+	writerperfect \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 95253e9..68d6192 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Module_Module,ooo))
 $(eval $(call gb_Module_add_moduledirs,ooo,\
     animations \
     basctl \
+    basic \
     chart2 \
     comphelper \
     cui \
@@ -46,6 +47,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     oovbaapi \
     oox \
     padmin \
+    salhelper \
     sc \
     scaddins \
     sccomp \
@@ -65,6 +67,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     xmloff \
     vbahelper \
     writerfilter \
+    writerperfect \
 ))
 
 # these have only migrated subsequentcheck for now
commit e82562d9e06869e7365d7d68fa61abdaa1680aaf
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Thu Jul 28 17:29:44 2011 +0200

    add visio, wpd, wpg, wps externals

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0eb3f61..cf0e6a8 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -438,6 +438,98 @@ endef
 endif # SYSTEM_OPENSSL
 
 
+ifeq ($(SYSTEM_LIBVISIO),YES)
+
+define gb_LinkTarget__use_visio
+$(call gb_LinkTarget_add_libs,$(1),-llibvisio)
+
+endef
+
+else # !SYSTEM_LIBVISIO
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+	visiolib \
+))
+
+define gb_LinkTarget__use_visio
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+	visiolib \
+)
+
+endef
+
+endif # SYSTEM_LIBVISIO
+
+
+ifeq ($(SYSTEM_LIBWPD),YES)
+
+define gb_LinkTarget__use_wpd
+$(call gb_LinkTarget_add_libs,$(1),-llibwpd)
+
+endef
+
+else # !SYSTEM_LIBWPD
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+	wpdlib \
+))
+
+define gb_LinkTarget__use_wpd
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+	wpdlib \
+)
+
+endef
+
+endif # SYSTEM_LIBWPD
+
+
+ifeq ($(SYSTEM_LIBWPG),YES)
+
+define gb_LinkTarget__use_wpg
+$(call gb_LinkTarget_add_libs,$(1),-llibwpg)
+
+endef
+
+else # !SYSTEM_LIBWPG
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+	wpglib \
+))
+
+define gb_LinkTarget__use_wpg
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+	wpglib \
+)
+
+endef
+
+endif # SYSTEM_LIBWPG
+
+
+ifeq ($(SYSTEM_LIBWPS),YES)
+
+define gb_LinkTarget__use_wps
+$(call gb_LinkTarget_add_libs,$(1),-llibwps)
+
+endef
+
+else # !SYSTEM_LIBWPS
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+	wpslib \
+))
+
+define gb_LinkTarget__use_wps
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+	wpslib \
+)
+
+endef
+
+endif # SYSTEM_LIBWPS
+
+
 ifeq ($(SYSTEM_LPSOLVE),YES)
 
 define gb_LinkTarget__use_lpsolve55