- 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

6 files changed, 21 insertions, 14 deletions

diff --git a/Makefile.am b/Makefile.am
index 2e572d6..1da9bc2 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 7953500..75de588 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 0e09629..cb1a0a6 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 b6bf3a2..b6bf3a2 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 0777178..0777178 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 37ac592..37ac592 100644
--- a/gnome-doc-utils.pc.in
+++ b/tools/gnome-doc-utils.pc.in