diff options
author | Michael Stahl <mstahl@redhat.com> | 2017-06-02 20:43:53 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2017-06-02 23:01:11 +0200 |
commit | 3563faa83719c5d4a91222b8aa30fe1cc64b97eb (patch) | |
tree | 67190bc917cb65a76ab143aa7d125b4e90a94ae8 /odk/CustomTarget_doxygen.mk | |
parent | 040372195a9884ffd8065a6ed8be195fd56fc6fc (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_doxygen.mk')
-rw-r--r-- | odk/CustomTarget_doxygen.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk index 2f67cc6f1897..100aa0d02364 100644 --- a/odk/CustomTarget_doxygen.mk +++ b/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) $< > $@ |