Commit db048b2f authored by Javier Jardón's avatar Javier Jardón Committed by Ray Strode

Use new documentation infrastructure

Use yelp-tools instead gnome-doc-utils

https://bugzilla.gnome.org/show_bug.cgi?id=681604
parent 0f2caf80
......@@ -11,7 +11,6 @@
*.pox
*.tab.c
.*.swp
gdm.xml
at-spi-registryd-wrapper.desktop.in
./autom4te.cache
.deps
......@@ -62,7 +61,6 @@ gdm-xdmcp-chooser-slave-glue.c
gdm-xdmcp-greeter-display-glue.h
gdm-greeter-glue.h
gdm-greeter-glue.c
gnome-doc-utils.make
GNOME_FastUserSwitchApplet.server
GNOME_FastUserSwitchApplet.server.in
gnome-power-manager.desktop.in
......@@ -84,17 +82,14 @@ Makefile.in
Makefile.in.in
na-marshal.c
na-marshal.h
oc/gdm.xml
PostSession
POTFILES
PreSession
so_locations
stamp-h1
stamp-it
sv/gdm.xml
tags
TAGS
uk/gdm.xml
Xsession
INSTALL
aclocal.m4
......@@ -127,17 +122,6 @@ data/applications/orca-screen-reader.desktop
data/applications/polkit-gnome-authentication-agent-1.desktop
data/applications/polkit-gnome-authentication-agent-1.desktop.in
depcomp
docs/gdm-C.omf
docs/gdm-de.omf
docs/gdm-en_GB.omf
docs/gdm-es.omf
docs/gdm-fr.omf
docs/gdm-it.omf
docs/gdm-ko.omf
docs/gdm-oc.omf
docs/gdm-ru.omf
docs/gdm-sv.omf
docs/gdm-uk.omf
gui/libgdm/gdm-client-glue.h
gui/libgdm/gdm-client-glue.c
gui/libgdm/gdm-manager-glue.h
......@@ -177,7 +161,6 @@ utils/gdmflexiserver
*.pc
*.gir
*.typelib
*.omf
*.tar.*
gdm-smartcard-worker
dconf-override-db
......@@ -13,22 +13,13 @@ if ENABLE_DOCUMENTATION
SUBDIRS += docs
endif
# add these when help gets added back
# omf-install
EXTRA_DIST = \
MAINTAINERS \
ChangeLog \
README \
gnome-doc-utils.make \
xmldocs.make \
omf.make \
$(NULL)
DISTCLEANFILES = \
gnome-doc-utils.make \
$(NULL)
DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-split-authentication --enable-introspection --enable-documentation
distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper'
DISTCHECK_CONFIGURE_FLAGS = --enable-split-authentication --enable-introspection
......@@ -41,10 +41,12 @@ AC_SUBST(VERSION)
AM_CONFIG_HEADER(config.h)
AC_CONFIG_MACRO_DIR([m4])
GNOME_DOC_INIT
AC_ARG_ENABLE([documentation],
AS_HELP_STRING([--enable-documentation], [enable man pages and HTML documentation]),
[], [enable_documentation=yes])
# Documentation
enable_documentation=no
m4_ifdef([YELP_HELP_INIT],[
YELP_HELP_INIT
enable_documentation=yes
])
AM_CONDITIONAL(ENABLE_DOCUMENTATION, test x$enable_documentation = xyes)
# i18n stuff
......@@ -1598,4 +1600,5 @@ echo \
UPower support: ${have_upower}
Build with RBAC: ${msg_rbac_shutdown}
Initial VT: ${GDM_INITIAL_VT}
Enable documentation: ${enable_documentation}
"
This diff is collapsed.
include $(top_srcdir)/gnome-doc-utils.make
dist-hook: doc-dist-hook
@YELP_HELP_RULES@
DOC_MODULE = gdm
DOC_ENTITIES = legal.xml
DOC_INCLUDES =
DOC_LINGUAS = ca de el en_GB es fr gl id it ko oc ru sl sv te uk zh_CN
# ja zh_HK zh_TW need to be transitioned to gnome-doc-utils
HELP_ID = gdm
#man_MANS = gdm.1
#EXTRA_DIST = gdm.1
HELP_FILES = \
index.docbook \
legal.xml
HELP_LINGUAS = ca de el en_GB es fr gl id it ko oc ru sl sv te uk zh_CN
<?xml version="1.0" standalone="no"?>
<omf>
<resource>
<subject category="GNOME|Applications|System Tools"/>
<type>
user's guide
</type>
<relation seriesid="04d4eadb-48ec-0cc0-6cfb-b23c6efee183f0"/>
<rights type="GNU FDL" license.version="1.1" holder="Sun Microsystems, Inc."/>
</resource>
</omf>
#
# No modifications of this Makefile should be necessary.
#
# This file contains the build instructions for installing OMF files. It is
# generally called from the makefiles for particular formats of documentation.
#
# Note that you must configure your package with --localstatedir=/var
# so that the scrollkeeper-update command below will update the database
# in the standard scrollkeeper directory.
#
# If it is impossible to configure with --localstatedir=/var, then
# modify the definition of scrollkeeper_localstate_dir so that
# it points to the correct location. Note that you must still use
# $(localstatedir) in this or when people build RPMs it will update
# the real database on their system instead of the one under RPM_BUILD_ROOT.
#
# Note: This make file is not incorporated into xmldocs.make because, in
# general, there will be other documents install besides XML documents
# and the makefiles for these formats should also include this file.
#
# About this file:
# This file was derived from scrollkeeper_example2, a package
# illustrating how to install documentation and OMF files for use with
# ScrollKeeper 0.3.x and 0.4.x. For more information, see:
# http://scrollkeeper.sourceforge.net/
# Version: 0.1.3 (last updated: March 20, 2002)
#
omf_dest_dir=$(datadir)/omf/@PACKAGE@
scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
# At some point, it may be wise to change to something like this:
# scrollkeeper_localstate_dir = @SCROLLKEEPER_STATEDIR@
omf: omf_timestamp
omf_timestamp: $(omffile)
-for file in $(omffile); do \
scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
done; \
touch omf_timestamp
install-data-hook-omf:
$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
for file in $(omffile); do \
$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
done
-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
uninstall-local-omf:
-for file in $(srcdir)/*.omf; do \
basefile=`basename $$file`; \
rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \
done
-rmdir $(DESTDIR)$(omf_dest_dir)
-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
clean-local-omf:
-for file in $(omffile); do \
rm -f $$file.out; \
done
#
# No modifications of this Makefile should be necessary.
#
# To use this template:
# 1) Define: figdir, docname, lang, omffile, and entities in
# your Makefile.am file for each document directory,
# although figdir, omffile, and entities may be empty
# 2) Make sure the Makefile in (1) also includes
# "include $(top_srcdir)/xmldocs.make" and
# "dist-hook: app-dist-hook".
# 3) Optionally define 'entities' to hold xml entities which
# you would also like installed
# 4) Figures must go under $(figdir)/ and be in PNG format
# 5) You should only have one document per directory
# 6) Note that the figure directory, $(figdir)/, should not have its
# own Makefile since this Makefile installs those figures.
#
# example Makefile.am:
# figdir = figures
# docname = scrollkeeper-manual
# lang = C
# omffile=scrollkeeper-manual-C.omf
# entities = fdl.xml
# include $(top_srcdir)/xmldocs.make
# dist-hook: app-dist-hook
#
# About this file:
# This file was taken from scrollkeeper_example2, a package illustrating
# how to install documentation and OMF files for use with ScrollKeeper
# 0.3.x and 0.4.x. For more information, see:
# http://scrollkeeper.sourceforge.net/
# Version: 0.1.2 (last updated: March 20, 2002)
#
# ********** Begin of section some packagers may need to modify **********
# This variable (docdir) specifies where the documents should be installed.
# This default value should work for most packages.
docdir = $(datadir)/gnome/help/$(docname)/$(lang)
# ********** You should not have to edit below this line **********
xml_files = $(entities) $(docname).xml
EXTRA_DIST = $(xml_files) $(omffile)
CLEANFILES = omf_timestamp
include $(top_srcdir)/omf.make
all: omf
$(docname).xml: $(entities)
-ourdir=`pwd`; \
cd $(srcdir); \
cp $(entities) $$ourdir
app-dist-hook:
if test "$(figdir)"; then \
$(mkinstalldirs) $(distdir)/$(figdir); \
for file in $(srcdir)/$(figdir)/*.png; do \
basefile=`echo $$file | sed -e 's,^.*/,,'`; \
$(INSTALL_DATA) $$file $(distdir)/$(figdir)/$$basefile; \
done \
fi
install-data-local: omf
$(mkinstalldirs) $(DESTDIR)$(docdir)
for file in $(xml_files); do \
cp $(srcdir)/$$file $(DESTDIR)$(docdir); \
done
if test "$(figdir)"; then \
$(mkinstalldirs) $(DESTDIR)$(docdir)/$(figdir); \
for file in $(srcdir)/$(figdir)/*.png; do \
basefile=`echo $$file | sed -e 's,^.*/,,'`; \
$(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \
done \
fi
install-data-hook: install-data-hook-omf
uninstall-local: uninstall-local-doc uninstall-local-omf
uninstall-local-doc:
-if test "$(figdir)"; then \
for file in $(srcdir)/$(figdir)/*.png; do \
basefile=`echo $$file | sed -e 's,^.*/,,'`; \
rm -f $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \
done; \
rmdir $(DESTDIR)$(docdir)/$(figdir); \
fi
-for file in $(xml_files); do \
rm -f $(DESTDIR)$(docdir)/$$file; \
done
-rmdir $(DESTDIR)$(docdir)
clean-local: clean-local-omf
Markdown is supported
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