[Libreoffice-commits] .: Branch 'feature/gnumake4' - 3 commits - filter/source unoxml/JunitTest_unordf_complex.mk unoxml/JunitTest_unoxml_complex.mk unoxml/Library_unordf.mk unoxml/Library_unoxml.mk

[Bjoern Michaelsen]

 filter/source/config/cache/filtercache.cxx |    2 +-
 unoxml/JunitTest_unordf_complex.mk         |    2 +-
 unoxml/JunitTest_unoxml_complex.mk         |    2 +-
 unoxml/Library_unordf.mk                   |   21 +++++----------------
 unoxml/Library_unoxml.mk                   |   10 ++--------
 5 files changed, 10 insertions(+), 27 deletions(-)

New commits:
commit f777e52a955dd2883eada3589eb2b3a55b65c7ff
Author: Michael Stahl <mst at openoffice.org>
Date:   Fri Apr 1 20:49:35 2011 +0000

    gnumake4: #i117610#: add RepositoryExternal.mk, and use it. [hg:62e2f8dc95a7]

diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk
index 79123c6..4a2ef0f 100644
--- a/unoxml/Library_unordf.mk
+++ b/unoxml/Library_unordf.mk
@@ -43,11 +43,14 @@ $(eval $(call gb_Library_add_linked_libs,unordf,\
     cppu \
     sal \
     stl \
-    rdf \
-    xslt \
     $(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_externals,unordf,\
+	librdf \
+	libxslt \
+)
+
 $(eval $(call gb_Library_add_exception_objects,unordf,\
     unoxml/source/rdf/CBlankNode \
     unoxml/source/rdf/CURI \
@@ -56,19 +59,5 @@ $(eval $(call gb_Library_add_exception_objects,unordf,\
     unoxml/source/rdf/librdf_services \
 ))
 
-ifeq ($(SYSTEM_REDLAND),YES)
-$(eval $(call gb_Library_set_cxxflags,unordf,\
-    $$(CXXFLAGS) \
-    -DSYSTEM_REDLAND $$(REDLAND_CFLAGS) \
-))
-endif
-
-ifeq ($(SYSTEM_LIBXSLT),YES)
-$(eval $(call gb_Library_set_cxxflags,unordf,\
-    $$(CXXFLAGS) \
-    $$(LIBXSLT_CFLAGS) \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
 
diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk
index 517c8a8..d88296e 100644
--- a/unoxml/Library_unoxml.mk
+++ b/unoxml/Library_unoxml.mk
@@ -46,10 +46,11 @@ $(eval $(call gb_Library_add_linked_libs,unoxml,\
     cppu \
     sal \
     stl \
-    xml2 \
     $(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_external,unoxml,libxml2)
+
 $(eval $(call gb_Library_add_exception_objects,unoxml,\
     unoxml/source/dom/node \
     unoxml/source/dom/document \
@@ -85,12 +86,5 @@ $(eval $(call gb_Library_add_exception_objects,unoxml,\
     unoxml/source/service/services \
 ))
 
-ifeq ($(SYSTEM_LIBXML),YES)
-$(eval $(call gb_Library_set_cxxflags,unoxml,\
-    $$(CXXFLAGS) \
-    -DSYSTEM_LIBXML $$(LIBXML_CFLAGS) \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
 
commit 78766833f1ffa813904db49d142d50164a6ca3b9
Author: Michael Stahl <mst at openoffice.org>
Date:   Fri Apr 1 20:47:04 2011 +0000

    gnumake4: #i117340#: JavaClassSet: adapt users [hg:efb3d33ce8ca]

diff --git a/unoxml/JunitTest_unordf_complex.mk b/unoxml/JunitTest_unordf_complex.mk
index 7637eef..7f4b772 100644
--- a/unoxml/JunitTest_unordf_complex.mk
+++ b/unoxml/JunitTest_unordf_complex.mk
@@ -25,7 +25,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,unordf_complex))
+$(eval $(call gb_JunitTest_JunitTest,unordf_complex,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,unordf_complex,\
     $$(DEFS) \
diff --git a/unoxml/JunitTest_unoxml_complex.mk b/unoxml/JunitTest_unoxml_complex.mk
index 09eaa32..cb6ce85 100644
--- a/unoxml/JunitTest_unoxml_complex.mk
+++ b/unoxml/JunitTest_unoxml_complex.mk
@@ -25,7 +25,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,unoxml_complex))
+$(eval $(call gb_JunitTest_JunitTest,unoxml_complex,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,unoxml_complex,\
     $$(DEFS) \
commit e5e0d98b5bf5153f9f1a199cca141d11bb5e1bd1
Author: Michael Stahl <mst at openoffice.org>
Date:   Fri Apr 1 20:47:04 2011 +0000

    gnumake4: filtercache.cxx: this should not be an assertion [hg:9458985f83ae]

diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 50c33ba..4f3ffb9 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -224,7 +224,7 @@ void FilterCache::load(EFillState eRequired,
         )
        )
     {
-        OSL_ENSURE(sal_False, "Who disturb our \"fill cache on demand\" feature and force loading of ALL data during office startup? Please optimize your code, so a full filled filter cache is not realy needed here!");
+        OSL_TRACE("Who disturb our \"fill cache on demand\" feature and force loading of ALL data during office startup? Please optimize your code, so a full filled filter cache is not realy needed here!");
     }
 #endif