diff options
| author | David Tardon <dtardon@redhat.com> | 2012-08-07 07:47:50 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-09-22 08:15:41 +0200 |
| commit | 7edc1390e4472ee469656e8094ee17669a3e0f49 (patch) | |
| tree | 92add992e1f7d9e454c28343905643f55a75bb7f | |
| parent | cbae5ff373a43e5ad3b5d3b55727e783fa8451d2 (diff) | |
let's do this the other way around...
This reverts commit 587ac17d51ded650ed72bb68a126587a9c2ca698.
| -rw-r--r-- | officecfg/Configuration_officecfg.mk | 12 | ||||
| -rw-r--r-- | writerfilter/CppunitTest_writerfilter_rtftok.mk | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk index df476ae91145..503a0a49ae2c 100644 --- a/officecfg/Configuration_officecfg.mk +++ b/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 \ diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk index 96319d6d2e7e..6e583e9227f5 100644 --- a/writerfilter/CppunitTest_writerfilter_rtftok.mk +++ b/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: |