summaryrefslogtreecommitdiff
path: root/odk/CustomTarget_allheaders.mk
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2017-06-02 20:43:53 +0200
committerMichael Stahl <mstahl@redhat.com>2017-06-02 23:01:11 +0200
commit3563faa83719c5d4a91222b8aa30fe1cc64b97eb (patch)
tree67190bc917cb65a76ab143aa7d125b4e90a94ae8 /odk/CustomTarget_allheaders.mk
parent040372195a9884ffd8065a6ed8be195fd56fc6fc (diff)
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
Diffstat (limited to 'odk/CustomTarget_allheaders.mk')
-rw-r--r--odk/CustomTarget_allheaders.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/odk/CustomTarget_allheaders.mk b/odk/CustomTarget_allheaders.mk
index d48abe0cd983..5aed70ad4635 100644
--- a/odk/CustomTarget_allheaders.mk
+++ b/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),)