Commit de1c3918 authored by Murray Cumming's avatar Murray Cumming
Browse files

Port from gnome-doc-utils to yelp-tools

gnome-doc-utils is deprecated in favour of yelp-tools
parent 32239aa1
......@@ -42,7 +42,6 @@ Makefile.in
/dist-changelog.am
/doc-reference.am
/generate-binding.am
/gnome-doc-utils.make
/messages.mo
/omf.make
/xmldocs.make
......
......@@ -17,7 +17,7 @@
## This project does not use recursive make, but a single toplevel Makefile
## to build the entire tree (excluding po and docs/user-guide as gettext and
## gnome-doc-utils come with their own build systems). Read Peter Miller's
## yelp-tools (TODO: Still?) come with their own build systems). Read Peter Miller's
## excellent paper to learn why recursive make invocations are both slow and
## error-prone: http://miller.emu.id.au/pmiller/books/rmch/
......@@ -40,12 +40,11 @@ doc_subdirs = docs/libglom_reference docs/pyglom_reference
else
doc_subdirs =
endif
if HAVE_GNOME_DOC_UTILS
gnome_doc_subdirs = docs/user-guide
else
gnome_doc_subdirs =
endif
SUBDIRS = po $(doc_subdirs) $(gnome_doc_subdirs)
# TODO: Allow this to be disabled, by letting YELP_HELP_INIT fail nicely as it could with GNOME_DOC_INIT?
yelp_doc_subdirs = docs/user-guide
SUBDIRS = po $(doc_subdirs) $(yelp_doc_subdirs)
if HOST_WIN32
win_resfile = glom/glom.res
......@@ -262,7 +261,7 @@ mimepackagesdir = $(mimedir)/packages
dist_mimepackages_DATA = glom.xml
dist_template = glom/glom.rc glom.service.in
dist_docutils = gnome-doc-utils.make omf.make xmldocs.make
dist_docutils =
dist_intltool = intltool-extract.in intltool-merge.in intltool-update.in
dist_docfiles = docs/overview.txt docs/developer_documentation.txt \
docs/postgres_test.c docs/postgres_gda_test.c win32/README
......@@ -279,7 +278,7 @@ CLEANFILES = $(dbusservice_DATA) $(desktop_DATA) $(appdata_DATA) $(win_resfile)
DISTCLEANFILES = intltool-extract intltool-merge intltool-update
MAINTAINERCLEANFILES += \
$(dist_docutils) $(dist_intltool) \
macros/gnome-doc-utils.m4 macros/intltool.m4 \
macros/intltool.m4 \
macros/libtool.m4 macros/ltoptions.m4 macros/ltsugar.m4 \
macros/ltversion.m4 macros/lt~obsolete.m4
......
......@@ -3,8 +3,6 @@ test -n "$srcdir" || srcdir=`dirname "$0"`
test -n "$srcdir" || srcdir=.
(
cd "$srcdir" &&
gnome-doc-common --copy &&
gnome-doc-prepare --automake --copy --force &&
mm-common-prepare --copy --force &&
autopoint --force &&
AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install
......
......@@ -301,8 +301,7 @@ AC_DEFINE_UNQUOTED([MYSQL_UTILS_PATH], ["$MYSQL_UTILS_PATH"],
[Define to the location of the MySQL utilities.])
GNOME_DOC_INIT([0.9.0],,
[AC_MSG_WARN([[gnome-doc-utils not found: documentation will not be built.]])])
YELP_HELP_INIT
MM_ARG_ENABLE_DOCUMENTATION
MM_ARG_WITH_TAGFILE_DOC([libstdc++.tag], [mm-common-libstdc++])
......
AUTOMAKE_OPTIONS = -Wno-portability
include $(top_srcdir)/gnome-doc-utils.make
@YELP_HELP_RULES@
dist-hook: doc-dist-hook
DOC_MODULE = glom
DOC_ENTITIES =
DOC_INCLUDES = legal.xml
DOC_FIGURES = \
HELP_ID = glom
HELP_EXTRA = legal.xml
HELP_MEDIA = \
figures/glom_data_details.png \
figures/glom_design_layout_details.png \
figures/glom_design_reports.png \
......@@ -25,4 +24,4 @@ DOC_FIGURES = \
figures/glom_design_reports_group_by.png \
figures/glom_report_result.png
DOC_LINGUAS = cs de en_GB es fr sl sv
HELP_LINGUAS = cs de en_GB es fr sl sv
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<omf>
<resource>
<creator>
murrayc@murrayc.com (Murray Cumming)
</creator>
<maintainer>
murrayc@murrayc.com (Murray Cumming)
</maintainer>
<title>
Guía del usuario de Glom
</title>
<date>
20-06-2004
</date>
<version identifier="0.1" date="2004-06-20" description="Added first User Guide"/>
<subject category="GNOME|Applications"/>
<description>
Guía del usuario de Glom
</description>
<type>
guía del usuario
</type>
<format mime="text/xml" dtd="-//OASIS//DTD DocBook V4.1.2//EN"/>
<identifier url="glom.xml"/>
<language code="C"/>
<relation seriesid="517f551c-b490-11d6-9295-da147643ae57"/>
<rights type="GNU FDL" license.version="1.1" holder="Murray Cumming"/>
</resource>
</omf>
<?xml version="1.0" standalone="no"?>
<omf>
<resource>
<subject category="GNOME|Applications|Office"/>
<type>user's guide</type>
<relation seriesid="0f51b462-10d8-11da-85a3-fc84e721c7fe"/>
<rights type="GNU FDL" license.version="1.1" holder="Murray Cumming"/>
</resource>
</omf>
gnome-doc-utils.m4
intltool.m4
libtool.m4
ltoptions.m4
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment