postprocess/Package_config.mk | 2 ++
solenv/Package_gdb.mk | 2 +-
solenv/gbuild/Package.mk | 6 ++++++
3 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 74b960ef3cd96f0f0e170234bc0947bfb51723f4
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Sun Dec 16 12:45:31 2012 +0100
add missing dep: gb_Package_use_custom_target
Change-Id: I888d9efe8bad905c108a6c824f2e2c7228fdd56d
diff --git a/postprocess/Package_config.mk b/postprocess/Package_config.mk
index ce2b0a5..4800b5f 100644
--- a/postprocess/Package_config.mk
+++ b/postprocess/Package_config.mk
@@ -9,6 +9,8 @@
$(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,\
diff --git a/solenv/Package_gdb.mk b/solenv/Package_gdb.mk
index a516a08..946bc07 100644
--- a/solenv/Package_gdb.mk
+++ b/solenv/Package_gdb.mk
@@ -35,6 +35,6 @@ $(eval $(call gb_Package_add_files,solenv_gdb,lib,\
$(call gb_Library_get_runtime_filename,tl)-gdb.py \
))
-$(call gb_Package_get_preparation_target,solenv_gdb) : $(call
gb_CustomTarget_get_target,solenv/gdb)
+$(eval $(call gb_Package_use_custom_target,solenv_gdb,solenv/gdb))
# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 31728bbf..2292faa 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -115,6 +115,12 @@ $(foreach file,$(3),$(call
gb_Package_add_file,$(1),$(2)/$(file),$(file)))
endef
+# Package files from custom target
+define gb_Package_use_custom_target
+$(call gb_Package_get_preparation_target,$(1)) :| $(call
gb_CustomTarget_get_target,$(2))
+
+endef
+
# Package files from unpacked tarball of an external project
define gb_Package_use_unpacked
$(call gb_Package_get_preparation_target,$(1)) :| $(call
gb_UnpackedTarball_get_target,$(2))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
