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 | |
| 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')
| -rw-r--r-- | odk/CustomTarget_allheaders.mk | 3 | ||||
| -rw-r--r-- | odk/CustomTarget_doxygen.mk | 3 | ||||
| -rw-r--r-- | odk/Module_odk.mk | 1 | ||||
| -rw-r--r-- | odk/PackageSet_odk_headers.mk | 17 |
4 files changed, 4 insertions, 20 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),) 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) $< > $@ diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index a72102c9b951..4ca21d3eaf32 100644 --- a/odk/Module_odk.mk +++ b/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) diff --git a/odk/PackageSet_odk_headers.mk b/odk/PackageSet_odk_headers.mk deleted file mode 100644 index d28f6d1bb559..000000000000 --- a/odk/PackageSet_odk_headers.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -*- 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: |