diff options
author | Shaun McCance <shaunm@src.gnome.org> | 2006-12-01 17:10:57 +0000 |
---|---|---|
committer | Shaun McCance <shaunm@src.gnome.org> | 2006-12-01 17:10:57 +0000 |
commit | c5037bef7cc0f597d6fb6239564097ef6cfdb88a (patch) | |
tree | c6f85c337666ab8a13e9f6db46eea9ec6bb9183b | |
parent | 72b4797345262f0dfc5e34f71f0e31527dfb32c6 (diff) | |
download | yelp-xsl-c5037bef7cc0f597d6fb6239564097ef6cfdb88a.tar.gz |
- Moving files to tools
* Makefile.am:
* configure.in:
* gnome-doc-html.in:
* gnome-doc-prepare.in:
* gnome-doc-utils.pc.in:
* tools/Makefile.am:
* tools/gnome-doc-html.in:
* tools/gnome-doc-prepare.in:
* tools/gnome-doc-utils.pc.in:
- Moving files to tools
-rw-r--r-- | Makefile.am | 11 | ||||
-rw-r--r-- | configure.in | 6 | ||||
-rw-r--r-- | tools/Makefile.am | 18 | ||||
-rwxr-xr-x | tools/gnome-doc-html.in (renamed from gnome-doc-html.in) | 0 | ||||
-rw-r--r-- | tools/gnome-doc-prepare.in (renamed from gnome-doc-prepare.in) | 0 | ||||
-rw-r--r-- | tools/gnome-doc-utils.pc.in (renamed from gnome-doc-utils.pc.in) | 0 |
6 files changed, 21 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index 2e572d63..1da9bc2c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,29 +1,24 @@ if ENABLE_BUILD_UTILS -build_SUBDIRS = tools xml2po + +build_SUBDIRS = xml2po pkgdata_DATA=\ template.omf.in \ template.make \ template-document.xml -bin_SCRIPTS = gnome-doc-prepare gnome-doc-html endif -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = gnome-doc-utils.pc - # doc must go last -SUBDIRS = po xslt $(build_SUBDIRS) doc +SUBDIRS = po xslt tools $(build_SUBDIRS) doc ACLOCAL_AMFLAGS=-I . EXTRA_DIST = \ - $(pkgconfig_DATA) \ $(pkgdata_DATA) \ COPYING.GPL \ COPYING.LGPL \ bootstrap.make \ - gnome-doc-prepare.in \ gnome-doc-utils.m4 \ gnome-doc-utils.make \ intltool-extract.in \ diff --git a/configure.in b/configure.in index 7953500a..75de588c 100644 --- a/configure.in +++ b/configure.in @@ -33,14 +33,14 @@ AM_GLIB_GNU_GETTEXT AC_OUTPUT([ Makefile -gnome-doc-html -gnome-doc-prepare -gnome-doc-utils.pc doc/Makefile doc/gnome-doc-make/Makefile doc/xslt/Makefile po/Makefile.in tools/Makefile +tools/gnome-doc-html +tools/gnome-doc-prepare +tools/gnome-doc-utils.pc xslt/Makefile xml2po/Makefile xml2po/xml2po.pc diff --git a/tools/Makefile.am b/tools/Makefile.am index 0e09629a..cb1a0a63 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,9 +1,21 @@ +if ENABLE_BUILD_UTILS + aclocaldir = $(datadir)/aclocal aclocal_DATA = gnome-doc-utils.m4 sharedir = $(datadir)/gnome-doc-utils share_DATA = gnome-doc-utils.make -EXTRA_DIST = \ - $(aclocal_DATA) \ - $(share_DATA) +bin_SCRIPTS = gnome-doc-prepare gnome-doc-html + +endif + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = gnome-doc-utils.pc + +EXTRA_DIST = \ + gnome-doc-html.in \ + gnome-doc-prepare.in \ + gnome-doc-utils.m4 \ + gnome-doc-utils.make \ + gnome-doc-utils.pc.in diff --git a/gnome-doc-html.in b/tools/gnome-doc-html.in index b6bf3a24..b6bf3a24 100755 --- a/gnome-doc-html.in +++ b/tools/gnome-doc-html.in diff --git a/gnome-doc-prepare.in b/tools/gnome-doc-prepare.in index 07771786..07771786 100644 --- a/gnome-doc-prepare.in +++ b/tools/gnome-doc-prepare.in diff --git a/gnome-doc-utils.pc.in b/tools/gnome-doc-utils.pc.in index 37ac5922..37ac5922 100644 --- a/gnome-doc-utils.pc.in +++ b/tools/gnome-doc-utils.pc.in |