[Libreoffice-commits] core.git: odk/CustomTarget_allheaders.mk odk/CustomTarget_doxygen.mk

Michael Stahl mstahl at redhat.com
Fri Jun 2 23:30:55 UTC 2017


 odk/CustomTarget_allheaders.mk |    4 ++--
 odk/CustomTarget_doxygen.mk    |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f7b5b5448b0d21675569d4f011e518a282ca0612
Author: Michael Stahl <mstahl at redhat.com>
Date:   Sat Jun 3 01:26:42 2017 +0200

    odk: fix extremely stupid typo
    
    Better to delete Set than get.
    
    (regression from 83719c5d4a91222b8aa30fe1cc64b97eb)
    
    Change-Id: If4ba3982ad5391206641e56a7674a1dfe3bef646

diff --git a/odk/CustomTarget_allheaders.mk b/odk/CustomTarget_allheaders.mk
index 5aed70ad4635..b432317c4a72 100644
--- a/odk/CustomTarget_allheaders.mk
+++ b/odk/CustomTarget_allheaders.mk
@@ -30,8 +30,8 @@ $(if $(2),#endif)
 endef
 
 $(odk_allheaders_DIR)/allheaders.hxx : \
-			  $(call gb_PackageSet_target,odk_headers) \
-			  $(call gb_PackageSet_target,odk_headers_generated) \
+			  $(call gb_Package_get_target,odk_headers) \
+			  $(call gb_Package_get_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 100aa0d02364..9a28a54c21d7 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/odk/CustomTarget_doxygen.mk
@@ -51,8 +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_generated)
+		$(call gb_Package_get_target,odk_headers) \
+		$(call gb_Package_get_target,odk_headers_generated)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GEN,1)
 	rm -rf $(odk_cpp_DOXY_WORKDIR)/ && $(DOXYGEN) $< > $@
 


More information about the Libreoffice-commits mailing list