[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - 2 commits - comphelper/Library_comphelper.mk officecfg/Configuration_officecfg.mk writerfilter/CppunitTest_writerfilter_rtftok.mk

[Matus Kukan]

 comphelper/Library_comphelper.mk                |    5 ++++-
 officecfg/Configuration_officecfg.mk            |   12 ++++++------
 writerfilter/CppunitTest_writerfilter_rtftok.mk |    4 ----
 3 files changed, 10 insertions(+), 11 deletions(-)

New commits:
commit 587ac17d51ded650ed72bb68a126587a9c2ca698
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Mon Aug 6 10:22:56 2012 +0200

    fix typo causing missing dependency
    
    Change-Id: I9ac316b0491d2c2c69308c0a78e1be0009bf2caf

diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk
index 682a3e2..4ae5d5a 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -16,9 +16,9 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-$(eval $(call gb_Configuration_Configuration,registry))
+$(eval $(call gb_Configuration_Configuration,officecfg))
 
-$(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\
+$(eval $(call gb_Configuration_add_schemas,officecfg,officecfg/registry/schema,\
 	org/openoffice/LDAP.xcs \
 	org/openoffice/Inet.xcs \
 	org/openoffice/Setup.xcs \
@@ -119,7 +119,7 @@ $(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\
 	org/openoffice/ucb/Store.xcs \
 ))
 
-$(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\
+$(eval $(call gb_Configuration_add_datas,officecfg,officecfg/registry/data,\
 	org/openoffice/Inet.xcu \
 	org/openoffice/System.xcu \
 	org/openoffice/UserProfile.xcu \
@@ -149,7 +149,7 @@ $(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\
 	org/openoffice/ucb/Configuration.xcu \
 ))
 
-$(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/data,\
+$(eval $(call gb_Configuration_add_spool_modules,officecfg,officecfg/registry/data,\
 	org/openoffice/Inet-macosx.xcu \
 	org/openoffice/Inet-unixdesktop.xcu \
 	org/openoffice/Inet-wnt.xcu \
@@ -210,11 +210,11 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
 ))
 
 # perhaps this file should be moved 2 levels up?
-$(eval $(call gb_Configuration_add_spool_langpack,registry,officecfg/registry/data/org/openoffice,\
+$(eval $(call gb_Configuration_add_spool_langpack,officecfg,officecfg/registry/data/org/openoffice,\
 	Langpack.xcu \
 ))
 
-$(eval $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/data,\
+$(eval $(call gb_Configuration_add_localized_datas,officecfg,officecfg/registry/data,\
 	org/openoffice/Setup.xcu \
 	org/openoffice/Office/Accelerators.xcu \
 	org/openoffice/Office/Common.xcu \
diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk
index 9b660d3..79d13e7 100644
--- a/writerfilter/CppunitTest_writerfilter_rtftok.mk
+++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk
@@ -64,8 +64,4 @@ $(eval $(call gb_CppunitTest_use_components,writerfilter_rtftok,\
 
 $(eval $(call gb_CppunitTest_use_configuration,writerfilter_rtftok))
 
-# we need to explicitly depend on library writerfilter because it is not implied
-# by a link relation
-$(call gb_CppunitTest_get_target,writerfilter_rtftok) : $(call gb_Library_get_target,writerfilter)
-
 # vim: set noet sw=4 ts=4:
commit 4e10bc77f9e6891980d8bb38aab78287a1aa6007
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Mon Aug 6 00:40:31 2012 +0200

    missing package dependency
    
    Change-Id: I4171de4ad24ac1bb9956171f3256cbcd766dae29

diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index 5a2074a..76c75f1 100644
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@@ -19,7 +19,10 @@
 
 $(eval $(call gb_Library_Library,comphelper))
 
-$(eval $(call gb_Library_use_package,comphelper,comphelper_inc))
+$(eval $(call gb_Library_use_packages,comphelper,\
+	comphelper_inc \
+	officecfg_cppheader \
+))
 
 $(eval $(call gb_Library_set_componentfile,comphelper,comphelper/util/comphelp))