diff options
| author | Shaun McCance <shaunm@src.gnome.org> | 2004-10-04 22:43:20 +0000 |
|---|---|---|
| committer | Shaun McCance <shaunm@src.gnome.org> | 2004-10-04 22:43:20 +0000 |
| commit | 82ad7ea79bf2d39727fd6a0fa501db0f1ce5275f (patch) | |
| tree | ef1def454c2bc71a8e77b2de7680ca743cda6dde | |
| parent | 8f8dd747a27559a50ef8bc14940caf90ee1f6abd (diff) | |
| download | yelp-tools-82ad7ea79bf2d39727fd6a0fa501db0f1ce5275f.tar.gz | |
- Build xml2po with gnome-doc-utils
* Makefile.am:
* bootstrap.make:
* configure.in:
* gnome-doc-utils.make:
* xml2po/Makefile.am:
- Build xml2po with gnome-doc-utils
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | bootstrap.make | 2 | ||||
| -rw-r--r-- | configure.in | 11 | ||||
| -rw-r--r-- | gnome-doc-utils.make | 6 | ||||
| -rw-r--r-- | xml2po/Makefile.am | 2 |
6 files changed, 27 insertions, 10 deletions
@@ -1,3 +1,12 @@ +2004-10-04 Shaun McCance <shaunm@gnome.org> + + * Makefile.am: + * bootstrap.make: + * configure.in: + * gnome-doc-utils.make: + * xml2po/Makefile.am: + - Build xml2po with gnome-doc-utils + 2004-09-27 Shaun McCance <shaunm@gnome.org> * gnome-doc-utils.make: diff --git a/Makefile.am b/Makefile.am index f759101..6eb8035 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,9 +2,9 @@ include $(top_srcdir)/gnome-doc-utils.make include $(top_srcdir)/bootstrap.make dist-hook: doc-dist-hook -SUBDIRS = doc po xslt - if ENABLE_BUILD_UTILS +xml2po_SUBDIRS = xml2po + DOC_H_FILE = gnome-doc-utils.h DOC_H_DOCS = doc/xslt/C/gnome-doc-xslt.xml doc/gnome-doc-make/C/gnome-doc-make.xml @@ -18,6 +18,9 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gnome-doc-utils.pc endif +# doc must go last +SUBDIRS = po xslt $(xml2po_SUBDIRS) doc + EXTRA_DIST = \ $(aclocal_DATA) \ $(share_DATA) \ diff --git a/bootstrap.make b/bootstrap.make index 99c7d71..c274d3d 100644 --- a/bootstrap.make +++ b/bootstrap.make @@ -1,3 +1,5 @@ +_xml2po = $(shell pwd)/$(top_srcdir)/xml2po/xml2po + _db2omf = $(top_srcdir)/xslt/docbook/omf/db2omf.xsl _rngdoc = $(top_srcdir)/xslt/rngdoc/rngdoc.xsl _xsldoc = $(top_srcdir)/xslt/xsldoc/xsldoc.xsl diff --git a/configure.in b/configure.in index 063d10f..7fdd89a 100644 --- a/configure.in +++ b/configure.in @@ -12,15 +12,14 @@ AC_ARG_ENABLE([build-utils], enable_build_utils=yes) AM_CONDITIONAL(ENABLE_BUILD_UTILS, test x$enable_build_utils = xyes) -BUILD_REQS= if test x$enable_build_utils = xyes; then - BUILD_REQS="xml2po >= 1.0.7"; +AM_PATH_PYTHON([2.0]) fi PKG_CHECK_MODULES(GNOME_DOC_UTILS, [ - libxslt >= 1.1.8 - $BUILD_REQS + libxml-2.0 >= 2.6.0 + libxslt >= 1.1.8 ]) ALL_LINGUAS="ca cs en_CA en_GB es hu nl pt pt_BR sq sv uk wa" @@ -33,6 +32,10 @@ doc/gnome-doc-make/Makefile doc/xslt/Makefile po/Makefile.in xslt/Makefile +xml2po/Makefile +xml2po/xml2po.pc +xml2po/modes/Makefile +xml2po/examples/Makefile xslt/docbook/Makefile xslt/docbook/common/Makefile xslt/docbook/html/Makefile diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make index 5f36675..7f6667a 100644 --- a/gnome-doc-utils.make +++ b/gnome-doc-utils.make @@ -85,7 +85,7 @@ XSLDOC_DIRS ?= ################################################################################ ## For bootstrapping gnome-doc-utils only -xml2po ?= xml2po +_xml2po ?= `which xml2po` _db2omf ?= `pkg-config --variable db2omf gnome-doc-utils` _rngdoc ?= `pkg-config --variable rngdoc gnome-doc-utils` @@ -310,9 +310,9 @@ _DOC_LC_DOCS = \ $(_DOC_POFILES): $(_DOC_C_DOCS) if ! test -d $(dir $@); then mkdir $(dir $@); fi if ! test -f $@; then \ - (cd $(dir $@) && $(xml2po) -e $(_DOC_C_DOCS_NOENT:%=../%) > $(notdir $@)); \ + (cd $(dir $@) && $(_xml2po) -e $(_DOC_C_DOCS_NOENT:%=../%) > $(notdir $@)); \ else \ - (cd $(dir $@) && $(xml2po) -e -u $(basename $(notdir $@)) $(_DOC_C_DOCS_NOENT:%=../%)); \ + (cd $(dir $@) && $(_xml2po) -e -u $(basename $(notdir $@)) $(_DOC_C_DOCS_NOENT:%=../%)); \ fi # FIXME: fix the dependancy diff --git a/xml2po/Makefile.am b/xml2po/Makefile.am index fdb9eff..470f2cc 100644 --- a/xml2po/Makefile.am +++ b/xml2po/Makefile.am @@ -12,7 +12,7 @@ xml2po: xml2po.py configure.ac sed -e "s/^VERSION =.*/VERSION = \"@VERSION@\"/" \ -e "s+^submodes_path =.*+submodes_path = \"$(commondir)\"+" \ -e "s+^#!.*python.*+#!$(PYTHON)+" \ - < $(top_srcdir)/xml2po.py >xml2po + < xml2po.py >xml2po chmod +x xml2po README: README.in |