summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-05-24 14:57:01 +0300
committerMartin Jansa <Martin.Jansa@gmail.com>2016-06-08 14:55:26 +0200
commitb4d7caaff9ee7e3ba2f5756b3d2ea2de498d4c2f (patch)
treea6c368b68b1a6181cca37fda37bf5444e20e4512
parentf0de8ed2c3301b8629d87a4e3357d580d4db154a (diff)
downloadmeta-openembedded-b4d7caaff9ee7e3ba2f5756b3d2ea2de498d4c2f.tar.gz
gnome-doc-utils-stub: add a recipe
Real gnome-doc-utils can no longer be build (because it requires both python 2 and libxml2, which can only be build for one version of Python), so a stub recipe which provides just m4 macros is provided, and usage of gnome-doc-utils is disabled where needed. Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat
-rw-r--r--meta-gnome/recipes-extended/gparted/gparted_0.24.0.bb2
-rw-r--r--meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb1
-rw-r--r--meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch29
-rw-r--r--meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb12
-rw-r--r--meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb1
-rw-r--r--meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb1
-rw-r--r--meta-gnome/recipes-gnome/gnome-panel/gnome-panel/0001-Add-gnome-doc-utils.make.patch730
-rw-r--r--meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb4
-rw-r--r--meta-gnome/recipes-gnome/gthumb/files/0001-Drop-help-directory-from-build.patch25
-rw-r--r--meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb7
-rw-r--r--meta-oe/recipes-devtools/geany/geany_1.27.bb4
-rw-r--r--meta-oe/recipes-devtools/glade/glade3_3.8.5.bb6
-rw-r--r--meta-oe/recipes-gnome/gnome-doc-utils-stub/files/gnome-doc-utils.m461
-rw-r--r--meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb18
14 files changed, 882 insertions, 19 deletions
diff --git a/meta-gnome/recipes-extended/gparted/gparted_0.24.0.bb b/meta-gnome/recipes-extended/gparted/gparted_0.24.0.bb
index 2f38977fd..c1666a3b6 100644
--- a/meta-gnome/recipes-extended/gparted/gparted_0.24.0.bb
+++ b/meta-gnome/recipes-extended/gparted/gparted_0.24.0.bb
@@ -13,7 +13,7 @@ SRC_URI = " \
13SRC_URI[md5sum] = "b8480274c68876acff5965d4346710e7" 13SRC_URI[md5sum] = "b8480274c68876acff5965d4346710e7"
14SRC_URI[sha256sum] = "02398ab33894a59b0bd8707e598c46d8bb56f1413cd54de48eed61e2920ecd60" 14SRC_URI[sha256sum] = "02398ab33894a59b0bd8707e598c46d8bb56f1413cd54de48eed61e2920ecd60"
15 15
16DEPENDS = "glib-2.0 gtkmm parted gnome-doc-utils-native" 16DEPENDS = "glib-2.0 gtkmm parted gnome-doc-utils"
17 17
18do_install_append() { 18do_install_append() {
19 # Add a script which checks if polkit is installed. 19 # Add a script which checks if polkit is installed.
diff --git a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
index 259c609fd..9ede2f5bf 100644
--- a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
+++ b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
@@ -34,6 +34,7 @@ EXTRA_OECONF = " \
34 34
35do_configure_prepend() { 35do_configure_prepend() {
36 sed -i -e "s:\bdocs::g" ${S}/Makefile.am 36 sed -i -e "s:\bdocs::g" ${S}/Makefile.am
37 rm -f ${S}/m4/gnome-doc-utils.m4
37} 38}
38 39
39do_install_prepend() { 40do_install_prepend() {
diff --git a/meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch b/meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch
new file mode 100644
index 000000000..4ad57effe
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch
@@ -0,0 +1,29 @@
1From 1d2e6165e3154e27ecde329a40c05f0880afb9e0 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 17 May 2016 14:14:03 +0300
4Subject: [PATCH] Remove help directory from build
5
6It hardcodes the use of xml2po utility, which is provided by obsolete gnome-doc-utils
7
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9---
10 Makefile.am | 3 ---
11 1 file changed, 3 deletions(-)
12
13diff --git a/Makefile.am b/Makefile.am
14index e57b203..a88152d 100644
15--- a/Makefile.am
16+++ b/Makefile.am
17@@ -3,9 +3,6 @@ ACLOCAL_AMFLAGS = -I m4
18
19 SUBDIRS = gedit pixmaps po data plugin-loaders plugins docs tests win32 osx
20
21-if !OS_OSX
22-SUBDIRS += help
23-endif
24
25 distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper
26
27--
282.8.1
29
diff --git a/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb b/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb
index 1c7b7e3ed..4ae5bbb81 100644
--- a/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb
+++ b/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb
@@ -3,12 +3,13 @@ SECTION = "x11/gnome"
3LICENSE = "GPLv2+" 3LICENSE = "GPLv2+"
4PR = "r2" 4PR = "r2"
5 5
6DEPENDS = "gvfs enchant gconf gnome-doc-utils gnome-doc-utils-native glib-2.0 gtk+ gtksourceview2 iso-codes" 6DEPENDS = "gvfs enchant gconf gnome-doc-utils glib-2.0 gtk+ gtksourceview2 iso-codes"
7 7
8LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 8LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
9 9
10inherit gnome gettext pythonnative 10inherit gnome gettext pythonnative
11SRC_URI+= "file://0001-workaround-void-pointer-arithmetic.patch" 11SRC_URI+= "file://0001-workaround-void-pointer-arithmetic.patch \
12 file://0001-Remove-help-directory-from-build.patch"
12SRC_URI[archive.md5sum] = "e1eecb0a92a1a363b3d375ec5ac0fb3b" 13SRC_URI[archive.md5sum] = "e1eecb0a92a1a363b3d375ec5ac0fb3b"
13SRC_URI[archive.sha256sum] = "a561fe3dd1d199baede1bd07c4ee65f06fc7c494dd4d3327117f04149a608e3c" 14SRC_URI[archive.sha256sum] = "a561fe3dd1d199baede1bd07c4ee65f06fc7c494dd4d3327117f04149a608e3c"
14GNOME_COMPRESS_TYPE="bz2" 15GNOME_COMPRESS_TYPE="bz2"
@@ -16,13 +17,6 @@ GNOME_COMPRESS_TYPE="bz2"
16EXTRA_OECONF = "--disable-scrollkeeper \ 17EXTRA_OECONF = "--disable-scrollkeeper \
17 --enable-gvfs-metadata" 18 --enable-gvfs-metadata"
18 19
19do_configure_prepend() {
20 cd ${S}
21 gnome-doc-common --copy || true
22 gnome-doc-prepare --force --copy || true
23 cd ${B}
24}
25
26FILES_${PN} += "${libdir}/gedit-2/plugin* ${datadir}/gedit-2" 20FILES_${PN} += "${libdir}/gedit-2/plugin* ${datadir}/gedit-2"
27FILES_${PN}-dbg += "${libdir}/gedit-2/plugin-loaders/.debug ${libdir}/gedit-2/plugins/.debug" 21FILES_${PN}-dbg += "${libdir}/gedit-2/plugin-loaders/.debug ${libdir}/gedit-2/plugins/.debug"
28 22
diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb
index 86b913bb1..dfb81339d 100644
--- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb
@@ -16,6 +16,7 @@ LDFLAGS += "-lgthread-2.0 -lxml2"
16 16
17do_configure_prepend() { 17do_configure_prepend() {
18 sed -i s:help::g ${S}/Makefile.am 18 sed -i s:help::g ${S}/Makefile.am
19 rm -r ${S}/m4/gnome-doc-utils.m4
19} 20}
20do_install_append() { 21do_install_append() {
21 rm -rf ${D}${datadir}/mime 22 rm -rf ${D}${datadir}/mime
diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb
index 703c397b2..d5f603574 100644
--- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb
@@ -18,6 +18,7 @@ EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs --disable-gnome-ab
18 18
19do_configure_prepend () { 19do_configure_prepend () {
20 sed -i -e s:^#!@PYTHON@:#!${bindir}/python: ${S}/gnome-about/gnome-about.in 20 sed -i -e s:^#!@PYTHON@:#!${bindir}/python: ${S}/gnome-about/gnome-about.in
21 rm -f ${S}/m4/gnome-doc-utils.m4
21} 22}
22 23
23PACKAGES =+ "libgnome-desktop" 24PACKAGES =+ "libgnome-desktop"
diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/0001-Add-gnome-doc-utils.make.patch b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/0001-Add-gnome-doc-utils.make.patch
new file mode 100644
index 000000000..fdcccb9d7
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/0001-Add-gnome-doc-utils.make.patch
@@ -0,0 +1,730 @@
1From 7345730ac882ee5a493254e5cf9162c96c648ef2 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 17 May 2016 14:40:33 +0300
4Subject: [PATCH] Add gnome-doc-utils.make
5
6Since the sources are taken from git, the file is absent
7(and is installed by tools from gnome-doc-utils which
8are no longer provided).
9
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11---
12 gnome-doc-utils.make | 706 +++++++++++++++++++++++++++++++++++++++++++++++++++
13 1 file changed, 706 insertions(+)
14 create mode 100644 gnome-doc-utils.make
15
16diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make
17new file mode 100644
18index 0000000..b2e0fa1
19--- /dev/null
20+++ b/gnome-doc-utils.make
21@@ -0,0 +1,706 @@
22+# gnome-doc-utils.make - make magic for building documentation
23+# Copyright (C) 2004-2005 Shaun McCance <shaunm@gnome.org>
24+#
25+# This program is free software; you can redistribute it and/or modify
26+# it under the terms of the GNU General Public License as published by
27+# the Free Software Foundation; either version 2 of the License, or
28+# (at your option) any later version.
29+#
30+# This program is distributed in the hope that it will be useful,
31+# but WITHOUT ANY WARRANTY; without even the implied warranty of
32+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
33+# GNU General Public License for more details.
34+#
35+# You should have received a copy of the GNU General Public License
36+# along with this program; if not, write to the Free Software Foundation,
37+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
38+#
39+# As a special exception to the GNU General Public License, if you
40+# distribute this file as part of a program that contains a
41+# configuration script generated by Autoconf, you may include it under
42+# the same distribution terms that you use for the rest of that program.
43+
44+################################################################################
45+## @@ Generating Header Files
46+
47+## @ DOC_H_FILE
48+## The name of the header file to generate
49+DOC_H_FILE ?=
50+
51+## @ DOC_H_DOCS
52+## The input DocBook files for generating the header file
53+DOC_H_DOCS ?=
54+
55+$(DOC_H_FILE): $(DOC_H_DOCS);
56+ @rm -f $@.tmp; touch $@.tmp;
57+ echo 'const gchar* documentation_credits[] = {' >> $@.tmp
58+ list='$(DOC_H_DOCS)'; for doc in $$list; do \
59+ xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \
60+ if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \
61+ xsltproc -nonet --path "$$xmlpath" $(_credits) $$doc; \
62+ done | sort | uniq \
63+ | awk 'BEGIN{s=""}{n=split($$0,w,"<");if(s!=""&&s!=substr(w[1],1,length(w[1])-1)){print s};if(n>1){print $$0;s=""}else{s=$$0}};END{if(s!=""){print s}}' \
64+ | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp
65+ echo ' NULL' >> $@.tmp
66+ echo '};' >> $@.tmp
67+ echo >> $@.tmp
68+ list='$(DOC_H_DOCS)'; for doc in $$list; do \
69+ xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \
70+ if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \
71+ docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \
72+ | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \
73+ echo $$xmlpath; \
74+ ids=`xsltproc -nonet --xinclude --path "$$xmlpath" $(_ids) $$doc`; \
75+ for id in $$ids; do \
76+ echo '#define HELP_'`echo $$docid`'_'`echo $$id \
77+ | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@.tmp; \
78+ done; \
79+ echo >> $@.tmp; \
80+ done;
81+ cp $@.tmp $@ && rm -f $@.tmp
82+
83+dist-check-gdu:
84+if !HAVE_GNOME_DOC_UTILS
85+ @echo "*** GNOME Doc Utils must be installed in order to make dist"
86+ @false
87+endif
88+
89+.PHONY: dist-doc-header
90+dist-doc-header: $(DOC_H_FILE)
91+ @if test -f "$(DOC_H_FILE)"; then d=; else d="$(srcdir)/"; fi; \
92+ echo "$(INSTALL_DATA) $${d}$(DOC_H_FILE) $(distdir)/$(DOC_H_FILE)"; \
93+ $(INSTALL_DATA) "$${d}$(DOC_H_FILE)" "$(distdir)/$(DOC_H_FILE)";
94+
95+doc-dist-hook: dist-check-gdu $(if $(DOC_H_FILE),dist-doc-header)
96+
97+.PHONY: clean-doc-header
98+_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
99+clean-local: $(_clean_doc_header)
100+distclean-local: $(_clean_doc_header)
101+mostlyclean-local: $(_clean_doc_header)
102+maintainer-clean-local: $(_clean_doc_header)
103+clean-doc-header:
104+ rm -f $(DOC_H_FILE)
105+
106+all: $(DOC_H_FILE)
107+
108+
109+################################################################################
110+## @@ Generating Documentation Files
111+
112+## @ DOC_MODULE
113+## The name of the document being built
114+DOC_MODULE ?=
115+
116+## @ DOC_ID
117+## The unique identifier for a Mallard document
118+DOC_ID ?=
119+
120+## @ DOC_PAGES
121+## Page files in a Mallard document
122+DOC_PAGES ?=
123+
124+## @ DOC_ENTITIES
125+## Files included with a SYSTEM entity
126+DOC_ENTITIES ?=
127+
128+## @ DOC_INCLUDES
129+## Files included with XInclude
130+DOC_INCLUDES ?=
131+
132+## @ DOC_FIGURES
133+## Figures and other external data
134+DOC_FIGURES ?=
135+
136+## @ DOC_FORMATS
137+## The default formats to be built and installed
138+DOC_FORMATS ?= docbook
139+_DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS))
140+
141+## @ DOC_LINGUAS
142+## The languages this document is translated into
143+DOC_LINGUAS ?=
144+_DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)), \
145+ $(filter $(LINGUAS),$(DOC_LINGUAS)), \
146+ $(DOC_LINGUAS))
147+
148+_DOC_ABS_SRCDIR = @abs_srcdir@
149+
150+
151+################################################################################
152+## Variables for Bootstrapping
153+
154+_xml2po ?= `which xml2po`
155+_xml2po_mode = $(if $(DOC_ID),mallard,docbook)
156+
157+_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
158+_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
159+_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
160+_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
161+_ids ?= ${PKG_CONFIG_SYSROOT_DIR}$(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl
162+
163+if ENABLE_SK
164+_ENABLE_SK = true
165+_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
166+_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
167+_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
168+endif
169+
170+
171+################################################################################
172+## Support for automake silent-rules
173+GDU_V_XML2PO=$(GDU__v_XML2PO_$(V))
174+GDU__v_XML2PO_=$(GDU__v_XML2PO_$(AM_DEFAULT_VERBOSITY))
175+GDU__v_XML2PO_0=@echo " XML2PO" $@;
176+
177+GDU_V_MSGFMT=$(GDU__v_MSGFMT_$(V))
178+GDU__v_MSGFMT_=$(GDU__v_MSGFMT_$(AM_DEFAULT_VERBOSITY))
179+GDU__v_MSGFMT_0=@echo " MSGFMT" $@;
180+
181+GDU_V_DB2OMF=$(GDU__v_DB2OMF_$(V))
182+GDU__v_DB2OMF_=$(GDU__v_DB2OMF_$(AM_DEFAULT_VERBOSITY))
183+GDU__v_DB2OMF_0=@echo " DB2OMF" $@;
184+
185+GDU_V_DB2HTM=$(GDU__v_DB2HTM_$(V))
186+GDU__v_DB2HTM_=$(GDU__v_DB2HTM_$(AM_DEFAULT_VERBOSITY))
187+GDU__v_DB2HTM_0=@echo " DB2HTM" $@;
188+
189+################################################################################
190+## @@ Rules for OMF Files
191+
192+db2omf_args = \
193+ --stringparam db2omf.basename $(DOC_MODULE) \
194+ --stringparam db2omf.format $(3) \
195+ --stringparam db2omf.dtd \
196+ $(shell xmllint --format $(2) | grep -h PUBLIC | head -n 1 \
197+ | sed -e 's/.*PUBLIC \(\"[^\"]*\"\).*/\1/') \
198+ --stringparam db2omf.lang $(notdir $(patsubst %/$(notdir $(2)),%,$(2))) \
199+ --stringparam db2omf.omf_dir "$(OMF_DIR)" \
200+ --stringparam db2omf.help_dir "$(HELP_DIR)" \
201+ --stringparam db2omf.omf_in "$(_DOC_OMF_IN)" \
202+ $(if $(_ENABLE_SK), \
203+ --stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)") \
204+ $(_db2omf) $(2)
205+
206+## @ _DOC_OMF_IN
207+## The OMF input file
208+_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(_DOC_ABS_SRCDIR)/$(DOC_MODULE).omf.in))
209+
210+## @ _DOC_OMF_DB
211+## The OMF files for DocBook output
212+_DOC_OMF_DB = $(if $(_DOC_OMF_IN), \
213+ $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-$(lc).omf))
214+
215+$(_DOC_OMF_DB) : $(_DOC_OMF_IN)
216+$(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml
217+ @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \
218+ echo "The file '$(_skcontentslist)' does not exist." >&2; \
219+ echo "Please check your ScrollKeeper installation." >&2; \
220+ exit 1; }
221+ $(GDU_V_DB2OMF)xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
222+
223+## @ _DOC_OMF_HTML
224+## The OMF files for HTML output
225+_DOC_OMF_HTML = $(if $(_DOC_OMF_IN), \
226+ $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-html-$(lc).omf))
227+
228+$(_DOC_OMF_HTML) : $(_DOC_OMF_IN)
229+$(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml
230+if ENABLE_SK
231+ @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \
232+ echo "The file '$(_skcontentslist)' does not exist" >&2; \
233+ echo "Please check your ScrollKeeper installation." >&2; \
234+ exit 1; }
235+endif
236+ $(GDU_V_DB2OMF)xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
237+
238+## @ _DOC_OMF_ALL
239+## All OMF output files to be built
240+# FIXME
241+_DOC_OMF_ALL = \
242+ $(if $(filter docbook,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_DB)) \
243+ $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_HTML))
244+
245+.PHONY: omf
246+omf: $(_DOC_OMF_ALL)
247+
248+
249+################################################################################
250+## @@ C Locale Documents
251+
252+## @ _DOC_C_MODULE
253+## The top-level documentation file in the C locale
254+_DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml)
255+
256+## @ _DOC_C_PAGES
257+## Page files in a Mallard document in the C locale
258+_DOC_C_PAGES = $(foreach page,$(DOC_PAGES),C/$(page))
259+
260+## @ _DOC_C_ENTITIES
261+## Files included with a SYSTEM entity in the C locale
262+_DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent))
263+
264+## @ _DOC_C_XINCLUDES
265+## Files included with XInclude in the C locale
266+_DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc))
267+
268+## @ _DOC_C_DOCS
269+## All documentation files in the C locale
270+_DOC_C_DOCS = \
271+ $(_DOC_C_ENTITIES) $(_DOC_C_INCLUDES) \
272+ $(_DOC_C_PAGES) $(_DOC_C_MODULE)
273+
274+## @ _DOC_C_DOCS_NOENT
275+## All documentation files in the C locale,
276+## except files included with a SYSTEM entity
277+_DOC_C_DOCS_NOENT = \
278+ $(_DOC_C_MODULE) $(_DOC_C_INCLUDES) \
279+ $(_DOC_C_PAGES)
280+
281+## @ _DOC_C_FIGURES
282+## All figures and other external data in the C locale
283+_DOC_C_FIGURES = $(if $(DOC_FIGURES), \
284+ $(foreach fig,$(DOC_FIGURES),C/$(fig)), \
285+ $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/C/figures/*.png)))
286+
287+## @ _DOC_C_HTML
288+## All HTML documentation in the C locale
289+# FIXME: probably have to shell escape to determine the file names
290+_DOC_C_HTML = $(foreach f, \
291+ $(shell xsltproc -nonet --xinclude \
292+ --stringparam db.chunk.basename "$(DOC_MODULE)" \
293+ $(_chunks) "C/$(DOC_MODULE).xml"), \
294+ C/$(f).xhtml)
295+
296+###############################################################################
297+## @@ Other Locale Documentation
298+
299+## @ _DOC_POFILES
300+## The .po files used for translating the document
301+_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID), \
302+ $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po))
303+
304+.PHONY: po
305+po: $(_DOC_POFILES)
306+
307+## @ _DOC_MOFILES
308+## The .mo files used for translating the document
309+_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES))
310+
311+.PHONY: mo
312+mo: $(_DOC_MOFILES)
313+
314+## @ _DOC_LC_MODULES
315+## The top-level documentation files in all other locales
316+_DOC_LC_MODULES = $(if $(DOC_MODULE), \
317+ $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml))
318+
319+## @ _DOC_LC_PAGES
320+## Page files in a Mallard document in all other locales
321+_DOC_LC_PAGES = \
322+ $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach page,$(_DOC_C_PAGES), \
323+ $(lc)/$(notdir $(page)) ))
324+
325+## @ _DOC_LC_XINCLUDES
326+## Files included with XInclude in all other locales
327+_DOC_LC_INCLUDES = \
328+ $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES), \
329+ $(lc)/$(notdir $(inc)) ))
330+
331+## @ _DOC_LC_HTML
332+## All HTML documentation in all other locales
333+# FIXME: probably have to shell escape to determine the file names
334+_DOC_LC_HTML = \
335+ $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach doc,$(_DOC_C_HTML), \
336+ $(lc)/$(notdir $(doc)) ))
337+
338+## @ _DOC_LC_DOCS
339+## All documentation files in all other locales
340+_DOC_LC_DOCS = \
341+ $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) $(_DOC_LC_PAGES) \
342+ $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
343+
344+## @ _DOC_LC_FIGURES
345+## All figures and other external data in all other locales
346+_DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS), \
347+ $(patsubst C/%,$(lc)/%,$(_DOC_C_FIGURES)) )
348+
349+_DOC_SRC_FIGURES = \
350+ $(foreach fig,$(_DOC_C_FIGURES), $(foreach lc,C $(_DOC_REAL_LINGUAS), \
351+ $(wildcard $(srcdir)/$(lc)/$(patsubst C/%,%,$(fig))) ))
352+
353+$(_DOC_POFILES):
354+ @if ! test -d $(dir $@); then \
355+ echo "mkdir $(dir $@)"; \
356+ mkdir "$(dir $@)"; \
357+ fi
358+ @if test ! -f $@ -a -f $(srcdir)/$@; then \
359+ echo "cp $(srcdir)/$@ $@"; \
360+ cp "$(srcdir)/$@" "$@"; \
361+ fi;
362+ @docs=; \
363+ list='$(_DOC_C_DOCS_NOENT)'; for doc in $$list; do \
364+ docs="$$docs $(_DOC_ABS_SRCDIR)/$$doc"; \
365+ done; \
366+ if ! test -f $@; then \
367+ echo "(cd $(dir $@) && \
368+ $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
369+ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \
370+ (cd $(dir $@) && \
371+ $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
372+ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \
373+ else \
374+ echo "(cd $(dir $@) && \
375+ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs)"; \
376+ (cd $(dir $@) && \
377+ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
378+ fi
379+
380+$(_DOC_MOFILES): %.mo: %.po
381+ $(AM_V_at)if ! test -d $(dir $@); then mkdir "$(dir $@)"; fi
382+ $(GDU_V_MSGFMT)msgfmt -o $@ $<
383+
384+# FIXME: fix the dependancy
385+# FIXME: hook xml2po up
386+$(_DOC_LC_DOCS) : $(_DOC_MOFILES)
387+$(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
388+ $(AM_V_at)if ! test -d $(dir $@); then mkdir $(dir $@); fi
389+ $(GDU_V_XML2PO)if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
390+ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \
391+ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \
392+ (cd $(dir $@) && \
393+ $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \
394+ "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
395+ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
396+
397+## @ _DOC_POT
398+## A pot file
399+_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot,$(if $(DOC_ID),$(DOC_ID).pot))
400+.PHONY: pot
401+pot: $(_DOC_POT)
402+$(_DOC_POT): $(_DOC_C_DOCS_NOENT)
403+ $(GDU_V_XML2PO)$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^
404+
405+
406+################################################################################
407+## @@ All Documentation
408+
409+## @ _DOC_HTML_ALL
410+## All HTML documentation, only if it's built
411+_DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \
412+ $(_DOC_C_HTML) $(_DOC_LC_HTML))
413+
414+_DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml)
415+
416+$(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
417+ $(GDU_V_DB2HTM)xsltproc -nonet -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
418+
419+
420+################################################################################
421+## All
422+
423+all: \
424+ $(_DOC_C_DOCS) $(_DOC_LC_DOCS) \
425+ $(_DOC_OMF_ALL) $(_DOC_DSK_ALL) \
426+ $(_DOC_HTML_ALL) $(_DOC_POFILES)
427+
428+
429+################################################################################
430+## Clean
431+
432+.PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir
433+
434+clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML)
435+clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML)
436+clean-doc-lc:
437+ rm -f $(_DOC_LC_DOCS)
438+ rm -f $(_DOC_MOFILES)
439+ @list='$(_DOC_POFILES)'; for po in $$list; do \
440+ if ! test "$$po" -ef "$(srcdir)/$$po"; then \
441+ echo "rm -f $$po"; \
442+ rm -f "$$po"; \
443+ fi; \
444+ done
445+# .xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x
446+ @for lc in C $(_DOC_REAL_LINGUAS); do \
447+ if test -f "$$lc/.xml2po.mo"; then \
448+ echo "rm -f $$lc/.xml2po.mo"; \
449+ rm -f "$$lc/.xml2po.mo"; \
450+ fi; \
451+ done
452+clean-doc-dir: clean-doc-lc
453+ @for lc in C $(_DOC_REAL_LINGUAS); do \
454+ for dir in `find $$lc -depth -type d`; do \
455+ if ! test $$dir -ef $(srcdir)/$$dir; then \
456+ echo "rmdir $$dir"; \
457+ rmdir "$$dir"; \
458+ fi; \
459+ done; \
460+ done
461+
462+_clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
463+_clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
464+_clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
465+_clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
466+
467+clean-local: \
468+ $(_clean_omf) $(_clean_dsk) \
469+ $(_clean_lc) $(_clean_dir)
470+distclean-local: \
471+ $(_clean_omf) $(_clean_dsk) \
472+ $(_clean_lc) $(_clean_dir)
473+mostlyclean-local: \
474+ $(_clean_omf) $(_clean_dsk) \
475+ $(_clean_lc) $(_clean_dir)
476+maintainer-clean-local: \
477+ $(_clean_omf) $(_clean_dsk) \
478+ $(_clean_lc) $(_clean_dir)
479+
480+
481+
482+################################################################################
483+## Dist
484+
485+.PHONY: dist-doc-docs dist-doc-pages dist-doc-figs dist-doc-omf dist-doc-dsk
486+doc-dist-hook: \
487+ $(if $(DOC_MODULE)$(DOC_ID),dist-doc-docs) \
488+ $(if $(_DOC_C_FIGURES),dist-doc-figs) \
489+ $(if $(_DOC_OMF_IN),dist-doc-omf)
490+# $(if $(_DOC_DSK_IN),dist-doc-dsk)
491+
492+dist-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)
493+ @for lc in C $(_DOC_REAL_LINGUAS); do \
494+ echo " $(mkinstalldirs) $(distdir)/$$lc"; \
495+ $(mkinstalldirs) "$(distdir)/$$lc"; \
496+ done
497+ @list='$(_DOC_C_DOCS)'; \
498+ for doc in $$list; do \
499+ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
500+ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
501+ if ! test -d "$(distdir)/$$docdir"; then \
502+ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
503+ $(mkinstalldirs) "$(distdir)/$$docdir"; \
504+ fi; \
505+ echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
506+ $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
507+ done
508+ @list='$(_DOC_LC_DOCS)'; \
509+ for doc in $$list; do \
510+ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
511+ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
512+ if ! test -d "$(distdir)/$$docdir"; then \
513+ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
514+ $(mkinstalldirs) "$(distdir)/$$docdir"; \
515+ fi; \
516+ echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
517+ $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
518+ done
519+ @list='$(_DOC_POFILES)'; \
520+ for doc in $$list; do \
521+ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
522+ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
523+ if ! test -d "$(distdir)/$$docdir"; then \
524+ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
525+ $(mkinstalldirs) "$(distdir)/$$docdir"; \
526+ fi; \
527+ echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
528+ $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
529+ done
530+
531+dist-doc-figs: $(_DOC_SRC_FIGURES)
532+ @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; \
533+ for fig in $$list; do \
534+ if test -f "$$fig"; then d=; else d="$(srcdir)/"; fi; \
535+ if test -f "$$d$$fig"; then \
536+ figdir=`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
537+ if ! test -d "$(distdir)/$$figdir"; then \
538+ echo "$(mkinstalldirs) $(distdir)/$$figdir"; \
539+ $(mkinstalldirs) "$(distdir)/$$figdir"; \
540+ fi; \
541+ echo "$(INSTALL_DATA) $$d$$fig $(distdir)/$$fig"; \
542+ $(INSTALL_DATA) "$$d$$fig" "$(distdir)/$$fig"; \
543+ fi; \
544+ done;
545+
546+dist-doc-omf:
547+ @if test -f "$(_DOC_OMF_IN)"; then d=; else d="$(srcdir)/"; fi; \
548+ echo "$(INSTALL_DATA) $$d$(_DOC_OMF_IN) $(distdir)/$(notdir $(_DOC_OMF_IN))"; \
549+ $(INSTALL_DATA) "$$d$(_DOC_OMF_IN)" "$(distdir)/$(notdir $(_DOC_OMF_IN))"
550+
551+dist-doc-dsk:
552+ @if test -f "$(_DOC_DSK_IN)"; then d=; else d="$(srcdir)/"; fi; \
553+ echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \
554+ $(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))"
555+
556+
557+
558+################################################################################
559+## Check
560+
561+.PHONY: check-doc-docs check-doc-omf
562+check: \
563+ $(if $(DOC_MODULE),check-doc-docs) \
564+ $(if $(DOC_ID),check-doc-pages) \
565+ $(if $(_DOC_OMF_IN),check-doc-omf)
566+
567+check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
568+ @for lc in C $(_DOC_REAL_LINGUAS); do \
569+ if test -f "$$lc"; \
570+ then d=; \
571+ xmlpath="$$lc"; \
572+ else \
573+ d="$(srcdir)/"; \
574+ xmlpath="$$lc:$(srcdir)/$$lc"; \
575+ fi; \
576+ echo "xmllint --noout --noent --path $$xmlpath --xinclude --postvalid $$d$$lc/$(DOC_MODULE).xml"; \
577+ xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \
578+ done
579+
580+check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES)
581+ for lc in C $(_DOC_REAL_LINGUAS); do \
582+ if test -f "$$lc"; \
583+ then d=; \
584+ xmlpath="$$lc"; \
585+ else \
586+ d="$(srcdir)/"; \
587+ xmlpath="$$lc:$(srcdir)/$$lc"; \
588+ fi; \
589+ for page in $(DOC_PAGES); do \
590+ echo "xmllint --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \
591+ xmllint --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \
592+ done; \
593+ done
594+
595+check-doc-omf: $(_DOC_OMF_ALL)
596+ @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
597+ echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
598+ xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
599+ done
600+
601+
602+
603+################################################################################
604+## Install
605+
606+.PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
607+
608+_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
609+
610+install-data-local: \
611+ $(if $(DOC_MODULE)$(DOC_ID),install-doc-docs) \
612+ $(if $(_DOC_HTML_ALL),install-doc-html) \
613+ $(if $(_DOC_C_FIGURES),install-doc-figs) \
614+ $(if $(_DOC_OMF_IN),install-doc-omf)
615+# $(if $(_DOC_DSK_IN),install-doc-dsk)
616+
617+install-doc-docs:
618+ @for lc in C $(_DOC_REAL_LINGUAS); do \
619+ echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \
620+ $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \
621+ done
622+ @list='$(_DOC_C_DOCS)'; for doc in $$list; do \
623+ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
624+ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
625+ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \
626+ if ! test -d "$$docdir"; then \
627+ echo "$(mkinstalldirs) $$docdir"; \
628+ $(mkinstalldirs) "$$docdir"; \
629+ fi; \
630+ echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
631+ $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \
632+ done
633+ @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \
634+ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
635+ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
636+ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \
637+ if ! test -d "$$docdir"; then \
638+ echo "$(mkinstalldirs) $$docdir"; \
639+ $(mkinstalldirs) "$$docdir"; \
640+ fi; \
641+ echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
642+ $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \
643+ done
644+
645+install-doc-figs:
646+ @list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \
647+ for lc in C $(_DOC_REAL_LINGUAS); do \
648+ figsymlink=false; \
649+ if test -f "$$lc/$$fig"; then \
650+ figfile="$$lc/$$fig"; \
651+ elif test -f "$(srcdir)/$$lc/$$fig"; then \
652+ figfile="$(srcdir)/$$lc/$$fig"; \
653+ else \
654+ figsymlink=true; \
655+ fi; \
656+ figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
657+ figdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$figdir"; \
658+ if ! test -d "$$figdir"; then \
659+ echo "$(mkinstalldirs) $$figdir"; \
660+ $(mkinstalldirs) "$$figdir"; \
661+ fi; \
662+ figbase=`echo $$fig | sed -e 's/^.*\///'`; \
663+ if $$figsymlink; then \
664+ echo "cd $$figdir && $(LN_S) -f ../../C/$$fig $$figbase"; \
665+ ( cd "$$figdir" && $(LN_S) -f "../../C/$$fig" "$$figbase" ); \
666+ else \
667+ echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
668+ $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
669+ fi; \
670+ done; \
671+ done
672+
673+install-doc-html:
674+ echo install-html
675+
676+install-doc-omf:
677+ $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)
678+ @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
679+ echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
680+ $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf; \
681+ done
682+ @if test "x$(_ENABLE_SK)" = "xtrue"; then \
683+ echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
684+ scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
685+ fi;
686+
687+install-doc-dsk:
688+ echo install-dsk
689+
690+
691+
692+################################################################################
693+## Uninstall
694+
695+.PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk
696+uninstall-local: \
697+ $(if $(DOC_MODULE)$(DOC_ID),uninstall-doc-docs) \
698+ $(if $(_DOC_HTML_ALL),uninstall-doc-html) \
699+ $(if $(_DOC_C_FIGURES),uninstall-doc-figs) \
700+ $(if $(_DOC_OMF_IN),uninstall-doc-omf)
701+# $(if $(_DOC_DSK_IN),uninstall-doc-dsk)
702+
703+uninstall-doc-docs:
704+ @list='$(_DOC_C_DOCS)'; for doc in $$list; do \
705+ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
706+ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
707+ done
708+ @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \
709+ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
710+ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
711+ done
712+
713+uninstall-doc-figs:
714+ @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \
715+ echo "rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
716+ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
717+ done;
718+
719+uninstall-doc-omf:
720+ @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
721+ if test "x$(_ENABLE_SK)" = "xtrue"; then \
722+ echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
723+ scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
724+ fi; \
725+ echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
726+ rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
727+ done
728--
7292.8.1
730
diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb
index 9be2ec10a..0f7cb59df 100644
--- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb
@@ -9,7 +9,7 @@ SECTION = "x11/gnome"
9 9
10PR = "r7" 10PR = "r7"
11 11
12DEPENDS = "gnome-doc-utils-native gconf glib-2.0 gnome-desktop gtk+ \ 12DEPENDS = "gnome-doc-utils gconf glib-2.0 gnome-desktop gtk+ \
13 pango libwnck gnome-menus cairo libgweather dbus dbus-glib \ 13 pango libwnck gnome-menus cairo libgweather dbus dbus-glib \
14 librsvg libcanberra" 14 librsvg libcanberra"
15RDEPENDS_${PN} = "python" 15RDEPENDS_${PN} = "python"
@@ -19,6 +19,7 @@ inherit gtk-doc gnome autotools-brokensep gettext pkgconfig gconf gobject-intros
19SRCREV = "8292bd2b8a36df7eed3c760899400790cde68590" 19SRCREV = "8292bd2b8a36df7eed3c760899400790cde68590"
20SRC_URI = "git://git.gnome.org/gnome-panel;branch=gnome-2-32 \ 20SRC_URI = "git://git.gnome.org/gnome-panel;branch=gnome-2-32 \
21 file://0001-Fix-build-with-gcc-5.patch \ 21 file://0001-Fix-build-with-gcc-5.patch \
22 file://0001-Add-gnome-doc-utils.make.patch \
22 " 23 "
23 24
24S = "${WORKDIR}/git" 25S = "${WORKDIR}/git"
@@ -29,7 +30,6 @@ PACKAGECONFIG ??= ""
29PACKAGECONFIG[networkmanager] = "--enable-network-manager,--disable-network-manager,networkmanager" 30PACKAGECONFIG[networkmanager] = "--enable-network-manager,--disable-network-manager,networkmanager"
30 31
31do_configure_prepend() { 32do_configure_prepend() {
32 gnome-doc-prepare --automake
33 sed -i -e s:help:: ${S}/Makefile.am 33 sed -i -e s:help:: ${S}/Makefile.am
34 sed -i -e s:^#!@PYTHON@:#!/usr/bin/python: ${S}/gnome-panel/gnome-panel-add.in 34 sed -i -e s:^#!@PYTHON@:#!/usr/bin/python: ${S}/gnome-panel/gnome-panel-add.in
35} 35}
diff --git a/meta-gnome/recipes-gnome/gthumb/files/0001-Drop-help-directory-from-build.patch b/meta-gnome/recipes-gnome/gthumb/files/0001-Drop-help-directory-from-build.patch
new file mode 100644
index 000000000..d116968a6
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gthumb/files/0001-Drop-help-directory-from-build.patch
@@ -0,0 +1,25 @@
1From 48cb878cb724e7a509260f014db6365510b8b541 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 17 May 2016 14:05:29 +0300
4Subject: [PATCH] Drop help directory from build
5
6It hardcodes the use of xml2po tool form gnome-doc-utils
7
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9---
10 Makefile.am | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/Makefile.am b/Makefile.am
14index d056875..3fc4a41 100644
15--- a/Makefile.am
16+++ b/Makefile.am
17@@ -1,4 +1,4 @@
18-SUBDIRS = m4 copy-n-paste data po gthumb extensions tests help
19+SUBDIRS = m4 copy-n-paste data po gthumb extensions tests
20
21 ACLOCAL_AMFLAGS = -I m4
22 AMCFLAGS = -fPIC -DPIC
23--
242.8.1
25
diff --git a/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb b/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb
index 0bf1321de..d22d5da8e 100644
--- a/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb
+++ b/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb
@@ -14,7 +14,12 @@ SRC_URI[archive.md5sum] = "97fc13221b0c5d80c27a2e25a3a3ac6f"
14SRC_URI[archive.sha256sum] = "cf809695230ab8892a078be454a42ade865754c72ec1da7c3d74d4310de54f1d" 14SRC_URI[archive.sha256sum] = "cf809695230ab8892a078be454a42ade865754c72ec1da7c3d74d4310de54f1d"
15GNOME_COMPRESS_TYPE="bz2" 15GNOME_COMPRESS_TYPE="bz2"
16 16
17SRC_URI += "file://parallel.patch" 17SRC_URI += "file://parallel.patch \
18 file://0001-Drop-help-directory-from-build.patch"
19
20do_configure_prepend () {
21 rm -r ${S}/m4/gnome-doc-utils.m4
22}
18 23
19do_install_append () { 24do_install_append () {
20 rm -f ${D}${libdir}/${BPN}/extensions/*.a 25 rm -f ${D}${libdir}/${BPN}/extensions/*.a
diff --git a/meta-oe/recipes-devtools/geany/geany_1.27.bb b/meta-oe/recipes-devtools/geany/geany_1.27.bb
index 686222ac8..15b21da14 100644
--- a/meta-oe/recipes-devtools/geany/geany_1.27.bb
+++ b/meta-oe/recipes-devtools/geany/geany_1.27.bb
@@ -2,7 +2,7 @@ SUMMARY = "A fast and lightweight IDE"
2HOMEPAGE = "http://www.geany.org/" 2HOMEPAGE = "http://www.geany.org/"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=bd7b2c994af21d318bd2cd3b3f80c2d5" 4LIC_FILES_CHKSUM = "file://COPYING;md5=bd7b2c994af21d318bd2cd3b3f80c2d5"
5DEPENDS = "gtk+ python-docutils-native" 5DEPENDS = "gtk+ python3-docutils-native"
6 6
7inherit autotools pkgconfig perlnative pythonnative 7inherit autotools pkgconfig perlnative pythonnative
8 8
@@ -14,3 +14,5 @@ SRC_URI[md5sum] = "7c23f835f45def89d10884c1343fa29e"
14SRC_URI[sha256sum] = "846ff699a5944c5c3c068ae0199d4c13946a668bfc6d03f8c79765667c20cadf" 14SRC_URI[sha256sum] = "846ff699a5944c5c3c068ae0199d4c13946a668bfc6d03f8c79765667c20cadf"
15 15
16FILES_${PN} += "${datadir}/icons" 16FILES_${PN} += "${datadir}/icons"
17
18EXTRA_OECONF = "--disable-html-docs"
diff --git a/meta-oe/recipes-devtools/glade/glade3_3.8.5.bb b/meta-oe/recipes-devtools/glade/glade3_3.8.5.bb
index 4e7ef9b5c..dcc0cbe73 100644
--- a/meta-oe/recipes-devtools/glade/glade3_3.8.5.bb
+++ b/meta-oe/recipes-devtools/glade/glade3_3.8.5.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2 & LGPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \ 4LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \
5 file://COPYING.GPL;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 \ 5 file://COPYING.GPL;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 \
6 file://COPYING.LGPL;md5=252890d9eee26aab7b432e8b8a616475" 6 file://COPYING.LGPL;md5=252890d9eee26aab7b432e8b8a616475"
7DEPENDS = "gtk+ gnome-doc-utils-native gnome-common libxml2" 7DEPENDS = "gtk+ gnome-doc-utils gnome-common libxml2"
8 8
9inherit autotools pkgconfig pythonnative 9inherit autotools pkgconfig pythonnative
10 10
@@ -18,10 +18,6 @@ EXTRA_OECONF += "--disable-scrollkeeper"
18PACKAGECONFIG ??= "" 18PACKAGECONFIG ??= ""
19PACKAGECONFIG[gnome] = "--enable-gnome,--disable-gnome,libbonoboui libgnomeui" 19PACKAGECONFIG[gnome] = "--enable-gnome,--disable-gnome,libbonoboui libgnomeui"
20 20
21do_configure_prepend() {
22 sed -i '/^if HAVE_GNOME_DOC_UTILS/,/^endif/d' ${S}/Makefile.am
23}
24
25FILES_${PN} += "${datadir}/icons" 21FILES_${PN} += "${datadir}/icons"
26FILES_${PN}-dbg += "${libdir}/glade3/modules/.debug" 22FILES_${PN}-dbg += "${libdir}/glade3/modules/.debug"
27FILES_${PN}-dev += "${libdir}/glade3/modules/*.la" 23FILES_${PN}-dev += "${libdir}/glade3/modules/*.la"
diff --git a/meta-oe/recipes-gnome/gnome-doc-utils-stub/files/gnome-doc-utils.m4 b/meta-oe/recipes-gnome/gnome-doc-utils-stub/files/gnome-doc-utils.m4
new file mode 100644
index 000000000..f8d160a9e
--- /dev/null
+++ b/meta-oe/recipes-gnome/gnome-doc-utils-stub/files/gnome-doc-utils.m4
@@ -0,0 +1,61 @@
1dnl Do not call GNOME_DOC_DEFINES directly. It is split out from
2dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself.
3AC_DEFUN([GNOME_DOC_DEFINES],
4[
5AC_ARG_WITH([help-dir],
6 AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),,
7 [with_help_dir='${datadir}/gnome/help'])
8HELP_DIR="$with_help_dir"
9AC_SUBST(HELP_DIR)
10
11AC_ARG_WITH([omf-dir],
12 AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),,
13 [with_omf_dir='${datadir}/omf'])
14OMF_DIR="$with_omf_dir"
15AC_SUBST(OMF_DIR)
16
17AC_ARG_WITH([help-formats],
18 AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),,
19 [with_help_formats=''])
20DOC_USER_FORMATS="$with_help_formats"
21AC_SUBST(DOC_USER_FORMATS)
22
23AC_ARG_ENABLE([scrollkeeper],
24 [AC_HELP_STRING([--disable-scrollkeeper],
25 [do not make updates to the scrollkeeper database])],,
26 enable_scrollkeeper=yes)
27AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"])
28
29dnl disable scrollkeeper automatically for distcheck
30DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
31AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
32
33AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"])
34])
35
36# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
37#
38AC_DEFUN([GNOME_DOC_INIT],
39[AC_REQUIRE([AC_PROG_LN_S])dnl
40
41if test -z "$AM_DEFAULT_VERBOSITY"; then
42 AM_DEFAULT_VERBOSITY=1
43fi
44AC_SUBST([AM_DEFAULT_VERBOSITY])
45
46ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1])
47
48AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required])
49PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required],
50 [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no])
51
52if test "$gdu_cv_have_gdu" = "yes"; then
53 AC_MSG_RESULT([yes])
54 ifelse([$2],,[:],[$2])
55else
56 AC_MSG_RESULT([no])
57 ifelse([$3],,[:],[$3])
58fi
59
60GNOME_DOC_DEFINES
61])
diff --git a/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb b/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb
new file mode 100644
index 000000000..d6da51b0d
--- /dev/null
+++ b/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb
@@ -0,0 +1,18 @@
1SUMMARY = "Stub implementation of gnome-doc-utils"
2DESCRIPTION = "This recipe provides m4 macros from gnome-doc-utils project, so \
3that dependent recipes can build. Gnome-doc-utils itself is no longer packaged because \
4it requires libxml2 and python 2 at the same time, which can no longer be satisfied. "
5LICENSE = "GPLv2 & LGPLv2.1"
6LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \
7 file://${COREBASE}/meta/files/common-licenses/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780"
8SRC_URI = "file://gnome-doc-utils.m4"
9
10PROVIDES = "gnome-doc-utils"
11
12do_install_append() {
13 install -d ${D}${datadir}/aclocal/
14 install ${WORKDIR}/gnome-doc-utils.m4 ${D}${datadir}/aclocal/
15}
16
17FILES_${PN} += "${datadir}"
18
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 10:26:05 +0000