|
 |
f325b2 |
From d876fa68f90b10608e77f34a71d37e772df8184b Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
Date: Thu, 17 Sep 2015 20:13:38 +0200
|
|
|
f325b2 |
Subject: [PATCH 116/398] sysui: depend on libreofficekitgtk for introspection
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I028d4e6d3c5fd57ae412fcfca5184722e4283524
|
|
|
f325b2 |
Reviewed-on: https://gerrit.libreoffice.org/18671
|
|
|
f325b2 |
Tested-by: Jenkins <ci@libreoffice.org>
|
|
|
f325b2 |
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
(cherry picked from commit 9b3495b4af679bd868e03e707100948bc4ba6019)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
sysui/CustomTarget_share.mk | 2 +-
|
|
|
f325b2 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
|
|
|
f325b2 |
index e4dde6fbaaaf..84907d1003c4 100644
|
|
|
f325b2 |
--- a/sysui/CustomTarget_share.mk
|
|
|
f325b2 |
+++ b/sysui/CustomTarget_share.mk
|
|
|
f325b2 |
@@ -175,7 +175,7 @@ $(share_WORKDIR)/%/openoffice.sh: $(share_SRCDIR)/share/openoffice.sh
|
|
|
f325b2 |
|
|
|
f325b2 |
$(share_WORKDIR)/%/create_tree.sh: $(share_SRCDIR)/share/create_tree.sh $(share_WORKDIR)/%/mimelnklist \
|
|
|
f325b2 |
$(share_WORKDIR)/%/openoffice.org.xml $(share_WORKDIR)/%/openoffice.applications $(share_WORKDIR)/%/openoffice.mime \
|
|
|
f325b2 |
- $(share_WORKDIR)/%/openoffice.keys $(share_WORKDIR)/%/launcherlist
|
|
|
f325b2 |
+ $(share_WORKDIR)/%/openoffice.keys $(share_WORKDIR)/%/launcherlist $(if $(INTROSPECTION_SCANNER),$(call gb_Library_get_target,libreofficekitgtk))
|
|
|
f325b2 |
mkdir -p $(dir $@)
|
|
|
f325b2 |
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,1)
|
|
|
f325b2 |
echo "#!/bin/sh" > $@
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|