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 /udkapi | |
| 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 'udkapi')
| -rw-r--r-- | udkapi/Module_udkapi.mk | 1 | ||||
| -rw-r--r-- | udkapi/README | 3 | ||||
| -rw-r--r-- | udkapi/UnoApiMerge_uretypes.mk | 35 |
3 files changed, 3 insertions, 36 deletions
diff --git a/udkapi/Module_udkapi.mk b/udkapi/Module_udkapi.mk index e8bafe8308fe..430e46a75673 100644 --- a/udkapi/Module_udkapi.mk +++ b/udkapi/Module_udkapi.mk @@ -31,7 +31,6 @@ $(eval $(call gb_Module_Module,udkapi)) $(eval $(call gb_Module_add_targets,udkapi,\ UnoApi_udkapi \ - UnoApiMerge_uretypes \ )) # vim: set noet sw=4 ts=4: diff --git a/udkapi/README b/udkapi/README index 3510fddc9150..9fb99e8ae013 100644 --- a/udkapi/README +++ b/udkapi/README @@ -2,5 +2,8 @@ Low level UNO stuff API IDL files i.e. those that are part of the standalone URE. +During the build the resulting .rdb file is known as udkapi.rdb. In the +installation set, it is known as types.rdb (in the URE's sub-tree). + See also: [[offapi]] diff --git a/udkapi/UnoApiMerge_uretypes.mk b/udkapi/UnoApiMerge_uretypes.mk deleted file mode 100644 index e56ea27e4fcf..000000000000 --- a/udkapi/UnoApiMerge_uretypes.mk +++ /dev/null @@ -1,35 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_UnoApiMerge_UnoApiMerge,ure/types)) - -$(eval $(call gb_UnoApiMerge_use_api,ure/types,\ - udkapi \ -)) - -# vim: set noet sw=4 ts=4: |