odk: remove PackageSet_odk_headers

This is quite confusing: the gb_Helper_register_packages_for_install
odk_headers does not actually use the Package odk_headers, but the
PackageSet odk_headers, because the name is the same and the PackageSet
directory comes first in the search path.

This means that the Package odk_headers_generated is installed despite
there being no obvious reason why.

The PackageSet doesn't provide much value here, so just remove it.

Change-Id: I564f3b9fc6acaabe700328bc8c3db70c3b2de0cd

Repository.mk

@@ -797,7 +797,6 @@ $(eval $(call gb_Helper_register_packages, \
 	$(if $(filter MSC,$(COM)),msvc_dlls) \
 	instsetoo_native_setup \
 	$(if $(ENABLE_OOENV),instsetoo_native_ooenv) \
-	odk_headers_generated \
 	postprocess_registry \
 	readlicense_oo_readmes \
 	setup_native_misc \
@@ -842,6 +841,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 	$(if $(DOXYGEN),odk_doxygen) \
 	odk_examples \
 	odk_headers \
+	odk_headers_generated \
 	odk_html \
 	odk_settings \
 	odk_settings_generated \

odk/CustomTarget_allheaders.mk

@@ -30,7 +30,8 @@ $(if $(2),#endif)
 endef
 
 $(odk_allheaders_DIR)/allheaders.hxx : \
-			  $(call gb_PackageSet_get_target,odk_headers) \
+			  $(call gb_PackageSet_target,odk_headers) \
+			  $(call gb_PackageSet_target,odk_headers_generated) \
             | $(odk_allheaders_DIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 ifeq ($(HAVE_GNUMAKE_FILE_FUNC),)

odk/CustomTarget_doxygen.mk

@@ -51,7 +51,8 @@ $(call gb_CustomTarget_get_workdir,odk/docs)/cpp/doxygen.log : \
 		$(call gb_CustomTarget_get_workdir,odk/docs)/cpp/Doxyfile \
 		$(SRCDIR)/include/sal/log-areas.dox \
 		$(SRCDIR)/odk/docs/cpp/main.dox \
-		$(call gb_PackageSet_get_target,odk_headers)
+		$(call gb_PackageSet_get_target,odk_headers) \
+		$(call gb_PackageSet_get_target,odk_headers_generated)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GEN,1)
 	rm -rf $(odk_cpp_DOXY_WORKDIR)/ && $(DOXYGEN) $< > $@
 

odk/Module_odk.mk

@@ -28,7 +28,6 @@ $(eval $(call gb_Module_add_targets,odk,\
 	Package_settings_generated \
 	Package_share_readme \
 	Package_share_readme_generated \
-	PackageSet_odk_headers \
 ))
 
 ifeq ($(OS),WNT)

odk/PackageSet_odk_headers.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_PackageSet_PackageSet,odk_headers))
-
-$(eval $(call gb_PackageSet_add_packages,odk_headers,\
-    odk_headers \
-    odk_headers_generated \
-))
-
-# vim: set noet sw=4 ts=4: