let's do this the other way around...

This reverts commit 587ac17d51ded650ed72bb68a126587a9c2ca698.

officecfg/Configuration_officecfg.mk

@@ -16,13 +16,13 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-$(eval $(call gb_Configuration_Configuration,officecfg))
+$(eval $(call gb_Configuration_Configuration,registry))
 
-$(eval $(call gb_Configuration_add_schemas,officecfg,officecfg/registry/schema,\
+$(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\
 	$(addprefix org/openoffice/,$(addsuffix .xcs,$(officecfg_XCSFILES))) \
 ))
 
-$(eval $(call gb_Configuration_add_datas,officecfg,officecfg/registry/data,\
+$(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\
 	org/openoffice/Inet.xcu \
 	org/openoffice/System.xcu \
 	org/openoffice/UserProfile.xcu \
@@ -52,7 +52,7 @@ $(eval $(call gb_Configuration_add_datas,officecfg,officecfg/registry/data,\
 	org/openoffice/ucb/Configuration.xcu \
 ))
 
-$(eval $(call gb_Configuration_add_spool_modules,officecfg,officecfg/registry/data,\
+$(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/data,\
 	org/openoffice/Inet-macosx.xcu \
 	org/openoffice/Inet-unixdesktop.xcu \
 	org/openoffice/Inet-wnt.xcu \
@@ -113,11 +113,11 @@ $(eval $(call gb_Configuration_add_spool_modules,officecfg,officecfg/registry/da
 ))
 
 # perhaps this file should be moved 2 levels up?
-$(eval $(call gb_Configuration_add_spool_langpack,officecfg,officecfg/registry/data/org/openoffice,\
+$(eval $(call gb_Configuration_add_spool_langpack,registry,officecfg/registry/data/org/openoffice,\
 	Langpack.xcu \
 ))
 
-$(eval $(call gb_Configuration_add_localized_datas,officecfg,officecfg/registry/data,\
+$(eval $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/data,\
 	org/openoffice/Setup.xcu \
 	org/openoffice/Office/Accelerators.xcu \
 	org/openoffice/Office/Common.xcu \

writerfilter/CppunitTest_writerfilter_rtftok.mk

@@ -63,4 +63,8 @@ $(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: