deliver component desc. xml, if used

Change-Id: I2908d5851ae33d70a49a032130fdc1a406310c7d

io/Module_io.mk

@@ -36,7 +36,6 @@ $(eval $(call gb_Module_add_targets,io,\
     Library_streams \
     Library_textinstream \
     Library_textoutstream \
-    Package_xml \
 ))
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:

io/Package_xml.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,io/source))
-
-$(eval $(call gb_Package_add_file,xml/acceptor.uno.xml,acceptor/acceptor.xml))
-$(eval $(call gb_Package_add_file,xml/connector.uno.xml,connector/connectr.xml))
-$(eval $(call gb_Package_add_file,xml/streams.uno.xml,stm/stm.xml))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:

solenv/gbuild/InternalUnoApi.mk

@@ -113,6 +113,8 @@ endef
 
 define gb_InternalUnoApi_set_xmlfile
 $(call gb_UnoApiTarget_set_xmlfile,$(1)_out,$(2))
+$(call gb_Package_Package,$(1)_xml,$(SRCDIR))
+$(call gb_Package_add_file,$(1)_xml,xml/$(notdir $(2)),$(2))
 
 endef
 

stoc/Module_stoc.mk

@@ -46,7 +46,6 @@ $(eval $(call gb_Module_add_targets,stoc,\
     Library_proxyfac \
     Library_reflection \
     Library_stocservices \
-    Package_xml \
 ))
 
 ifeq ($(SOLAR_JAVA),TRUE)

stoc/Package_xml.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,stoc_xml,$(SRCDIR)/stoc/source))
-
-$(eval $(call gb_Package_add_file,stoc_xml,xml/module-description.dtd,module-description.dtd))
-
-$(eval $(call gb_Package_add_file,stoc_xml,xml/reflection.uno.xml,corereflection/corefl.xml))
-$(eval $(call gb_Package_add_file,stoc_xml,xml/introspection.uno.xml,inspect/insp.xml))
-$(eval $(call gb_Package_add_file,stoc_xml,xml/invocation.uno.xml,invocation/inv.xml))
-$(eval $(call gb_Package_add_file,stoc_xml,xml/invocadapt.uno.xml,invocation_adapterfactory/invadp.xml))
-$(eval $(call gb_Package_add_file,stoc_xml,xml/javavm.uno.xml,javavm/jen.xml))
-$(eval $(call gb_Package_add_file,stoc_xml,xml/javaloader.uno.xml,javaloader/javaloader.xml))
-$(eval $(call gb_Package_add_file,stoc_xml,xml/namingservice.uno.xml,namingservice/namingservice.xml))
-$(eval $(call gb_Package_add_file,stoc_xml,xml/proxyfac.uno.xml,proxy_factory/proxyfac.xml))
-$(eval $(call gb_Package_add_file,stoc_xml,xml/bootstrap.uno.xml,bootstrap/bootstrap.xml))
-$(eval $(call gb_Package_add_file,stoc_xml,xml/stocserv.uno.xml,stocservices/stocserv.xml))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab: