[Libreoffice-commits] .: 4 commits - Module_ooo.mk RepositoryFixes.mk Repository.mk solenv/gbuild

[David Tardon]

 Module_ooo.mk                  |    3 +++
 Repository.mk                  |    7 +++++++
 RepositoryFixes.mk             |    2 ++
 solenv/gbuild/Executable.mk    |    1 +
 solenv/gbuild/Library.mk       |    1 +
 solenv/gbuild/LinkTarget.mk    |    4 ++++
 solenv/gbuild/StaticLibrary.mk |    1 +
 7 files changed, 19 insertions(+)

New commits:
commit 2e86ffaf95f39a3777591f16f87a120614beaa27
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Apr 14 12:38:43 2011 +0200

    gbuildize writerfilter

diff --git a/Module_ooo.mk b/Module_ooo.mk
index 02d2ec8..188072f 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     unoxml \
     xmloff \
     vbahelper \
+    writerfilter \
 ))
 
 # these have only migrated subsequentcheck for now
diff --git a/Repository.mk b/Repository.mk
index 829db4e..c260746 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     cppcanvas \
     cui \
     dbtools \
+    doctok \
     drawinglayer \
     editeng \
     for \
@@ -65,7 +66,9 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     msfilter \
     msword \
     oox \
+    ooxml \
     qstart_gtk \
+    resourcemodel \
     sax \
     sb \
     sc \
@@ -92,6 +95,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     utl \
     vbahelper \
     vcl \
+    writerfilter \
     xcr \
     xo \
     xof \
@@ -134,6 +138,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
     productregistration \
     vbaobj \
     vbaswobj \
+    writerfilter_uno \
 ))
 
 
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 2b446ff..c9bce7d 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -147,6 +147,8 @@ gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salh
 
 endif
 
+gb_Library_FILENAMES := $(patsubst writerfilter_uno:writerfilter_uno%,writerfilter_uno:writerfilter%,$(gb_Library_FILENAMES))
+
 # we do not require a known rule for these, when using system libs
 
 ifeq ($(SYSTEM_LIBXML),YES)
commit e7503ebded5f496af3cdf44d768781ab02fe651f
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Apr 14 12:38:33 2011 +0200

    define gb_LinkTarget_add_generated_cxxobjects

diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 1ffb1ef..88b98ac 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -71,6 +71,7 @@ $(eval $(foreach method,\
 	add_objcxxobjects \
 	add_exception_objects \
 	add_noexception_objects \
+	add_generated_cxxobjects \
 	add_generated_exception_objects \
 	set_cflags \
 	set_cxxflags \
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 2c8edab..7d386ff 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -112,6 +112,7 @@ $(eval $(foreach method,\
 	add_objcxxobjects \
 	add_exception_objects \
 	add_noexception_objects \
+	add_generated_cxxobjects \
 	add_generated_exception_objects \
 	set_cflags \
 	set_cxxflags \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 5f0cdc5..49ce493 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -626,6 +626,10 @@ define gb_LinkTarget_add_exception_objects
 $(foreach obj,$(2),$(call gb_LinkTarget_add_exception_object,$(1),$(obj)))
 endef
 
+define gb_LinkTarget_add_generated_cxxobjects
+$(foreach obj,$(2),$(call gb_LinkTarget_add_generated_cxx_object,$(1),$(obj),$(3)))
+endef
+
 define gb_LinkTarget_add_generated_exception_object
 $(call gb_LinkTarget_add_generated_cxx_object,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS))
 endef
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index d217f58..5b85f56 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -88,6 +88,7 @@ $(eval $(foreach method,\
 	add_objcxxobjects \
 	add_exception_objects \
 	add_noexception_objects \
+	add_generated_cxxobjects \
 	add_generated_exception_objects \
 	set_cflags \
 	set_cxxflags \
commit 93b01444782848bb6e9f2314a39a22826a315334
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Apr 13 08:59:00 2011 +0200

    gbuildize oox

diff --git a/Module_ooo.mk b/Module_ooo.mk
index 3d71ce5..02d2ec8 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     forms \
     framework \
     lotuswordpro \
+    oox \
     padmin \
     sfx2 \
     sot \
commit 85248742c3a8a89f020e7156761a4e3988060f87
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Apr 11 10:07:35 2011 +0200

    gbuildize lotuswordpro

diff --git a/Module_ooo.mk b/Module_ooo.mk
index 7da5426..3d71ce5 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     fileaccess \
     forms \
     framework \
+    lotuswordpro \
     padmin \
     sfx2 \
     sot \
diff --git a/Repository.mk b/Repository.mk
index 44fe3c6..829db4e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -61,6 +61,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     fwm \
     i18npaper \
     lng \
+    lwpft \
     msfilter \
     msword \
     oox \
@@ -105,6 +106,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
     cppunit \
     fileacc \
     icui18n \
+    icule \
     icuuc \
     rdf \
     xslt \