diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-04-24 10:42:40 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-04-24 10:51:31 +0200 |
| commit | ab149c7e3f9bb4be6f3c7d26401b67a0635c13ab (patch) | |
| tree | fbc29c9f7d8af2bd5d9223949e29c28a68fb0417 /RepositoryExternal.mk | |
| parent | 294ad90704b7b19aa64c26bfa83442a96a31e57b (diff) | |
Get rid of UnoApiMerge_uretypes, which is just a duplicate of UnoApi_udkapi
What is a little confusing is that the udkapi.rdb ends up as types.rdb in the
installation set (in the URE's sub-tree). So all places that reference it
during the build do so as "udkapi" while all places that reference it in an
installation set do so as "types."
Change-Id: I35d0695966b3bd703f5494b636b9782efc0d3fcb
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 15b694822a8a..941554afee22 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2810,7 +2810,7 @@ $(call gb_Executable_add_runtime_dependencies,climaker,\ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ $(call gb_Package_get_target_for_build,cppuhelper_unorc) \ $(call gb_Rdb_get_outdir_target_for_build,ure/services) \ - $(call gb_UnoApiMerge_get_target_for_build,ure/types) \ + $(call gb_UnoApi_get_target_for_build,udkapi) \ ) endef @@ -2838,7 +2838,7 @@ $(call gb_Executable_add_runtime_dependencies,localize,\ ) endef -# The dependencies on ure/services.rdb and ure/types.rdb are implicitly required +# The dependencies on ure/services.rdb and udkapi.rdb are implicitly required # due to the settings for URE_SERVICES and URE_TYPES in cppuhelper/source/unorc: # FIXME: the library target should be for build too define gb_Executable__register_saxparser @@ -2847,11 +2847,11 @@ $(call gb_Executable_add_runtime_dependencies,saxparser,\ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ $(call gb_Package_get_target_for_build,cppuhelper_unorc) \ $(call gb_Rdb_get_outdir_target_for_build,ure/services) \ - $(call gb_UnoApiMerge_get_target_for_build,ure/types) \ + $(call gb_UnoApi_get_target_for_build,udkapi) \ ) endef -# NOTE: the dependencies on ure/services.rdb and ure/types.rdb are implicitly +# NOTE: the dependencies on ure/services.rdb and udkapi.rdb are implicitly # required due to the settings for URE_SERVICES and URE_TYPES in # cppuhelper/source/unorc # FIXME: the library target should be for build too @@ -2860,7 +2860,7 @@ $(call gb_Executable_add_runtime_dependencies,uno,\ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ $(call gb_Package_get_target_for_build,cppuhelper_unorc) \ $(call gb_Rdb_get_outdir_target_for_build,ure/services) \ - $(call gb_UnoApiMerge_get_target_for_build,ure/types) \ + $(call gb_UnoApi_get_target_for_build,udkapi) \ ) endef |