[Libreoffice-commits] .: postprocess/CustomTarget_config.mk postprocess/Package_config.mk

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Sun Dec 16 15:04:27 PST 2012


 postprocess/CustomTarget_config.mk |    5 +++++
 postprocess/Package_config.mk      |    2 --
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 2295d4b50b2a97e318856e552ee0e3c9a8f27346
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sun Dec 16 23:37:50 2012 +0100

    postprocess: hopefully solve dependency problems
    
    Change-Id: I48c3a6c621e5faa46eba9eb4f34428b2f947a86f

diff --git a/postprocess/CustomTarget_config.mk b/postprocess/CustomTarget_config.mk
index 284a43a..89c606c 100644
--- a/postprocess/CustomTarget_config.mk
+++ b/postprocess/CustomTarget_config.mk
@@ -15,6 +15,11 @@ $(eval $(call gb_CustomTarget_register_targets,postprocess/config,\
 
 .PHONY: $(call gb_CustomTarget_get_workdir,postprocess/config)/uiconfig.zip
 
+# We need this dependency for delivering in package postprocess_config:
+$(call gb_CustomTarget_get_workdir,postprocess/config)/uiconfig_%.zip : \
+		$(call gb_CustomTarget_get_workdir,postprocess/config)/uiconfig.zip
+	@true
+
 $(call gb_CustomTarget_get_workdir,postprocess/config)/uiconfig.zip : $(SRCDIR)/postprocess/packconfig/packconfig.pl
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
 	cd $(SRCDIR)/postprocess/packconfig \
diff --git a/postprocess/Package_config.mk b/postprocess/Package_config.mk
index 4800b5f..ce2b0a5 100644
--- a/postprocess/Package_config.mk
+++ b/postprocess/Package_config.mk
@@ -9,8 +9,6 @@
 
 $(eval $(call gb_Package_Package,postprocess_config,$(call gb_CustomTarget_get_workdir,postprocess/config)))
 
-$(eval $(call gb_Package_use_custom_target,postprocess_config,postprocess/config))
-
 $(eval $(call gb_Package_add_file,postprocess_config,bin/uiconfig.zip,uiconfig.zip))
 
 $(eval $(call gb_Package_add_files,postprocess_config,bin,\


More information about the Libreoffice-commits mailing list