- Switched the Makefile to use XInclude

* gnome2-user-guide/Makefile.am:
- Switched the Makefile to use XInclude

* gnome2-accessibility-guide/C/Makefile.am:
* gnome2-system-admin-guide/C/Makefile.am:
* gnome2-user-guide/C/Makefile.am:
- Removed extra Makefiles

5 files changed, 13 insertions, 47 deletions

diff --git a/ChangeLog b/ChangeLog
index 0784d87..dca9d92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-02-19  Shaun McCance  <shaunm@gnome.org>
+
+	* gnome2-user-guide/Makefile.am:
+	- Switched the Makefile to use XInclude
+
+	* gnome2-accessibility-guide/C/Makefile.am:
+	* gnome2-system-admin-guide/C/Makefile.am:
+	* gnome2-user-guide/C/Makefile.am:
+	- Removed extra Makefiles
+
 2006-02-18  Shaun McCance  <shaunm@gnome.org>
 
 	* glossary:
diff --git a/gnome2-accessibility-guide/C/Makefile.am b/gnome2-accessibility-guide/C/Makefile.am
deleted file mode 100644
index 8b5a3d7..0000000
--- a/gnome2-accessibility-guide/C/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-figdir = figures
-docname = gnome-access-guide
-lang = C
-omffile = gnome-access-guide-C.omf
-entities = legal.xml accessintro.xml dtconfig.xml keynav.xml preface.xml themes.xml ats.xml sysadmin.xml
-include $(top_srcdir)/xmldocs.make
-dist-hook: app-dist-hook
diff --git a/gnome2-system-admin-guide/C/Makefile.am b/gnome2-system-admin-guide/C/Makefile.am
deleted file mode 100644
index dea9dfe..0000000
--- a/gnome2-system-admin-guide/C/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-docname = system-admin-guide
-lang = C
-omffile = system-admin-guide-C.omf
-entities =			\
-	appendixa.xml		\
-	appendixb.xml		\
-	fontconfig.xml		\
-	gconf.xml		\
-	glossary.xml		\
-	help.xml		\
-	legal.xml		\
-	lockdown.xml		\
-	menustructure.xml	\
-	mimetypes.xml		\
-	performance.xml		\
-	screensavers.xml	\
-	sessions.xml		\
-	themes.xml
-
-include $(top_srcdir)/xmldocs.make
-dist-hook: app-dist-hook
-
diff --git a/gnome2-user-guide/C/Makefile.am b/gnome2-user-guide/C/Makefile.am
deleted file mode 100644
index 448627f..0000000
--- a/gnome2-user-guide/C/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-entities = legal.xml glossary.xml gosbasic.xml goscustaccess.xml goscustdesk.xml goscustlookandfeel.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gosoverview.xml gospanel.xml gosstartsession.xml plaingnomestartpreftools.xml gostools.xml
-
-figdir = figures
-docname = user-guide
-lang = C
-omffile = user-guide-C.omf
-
-include $(top_srcdir)/xmldocs.make
-
-omf_dest_dir=$(datadir)/omf/$(docname)
-
-dist-hook: app-dist-hook
-
-$(wgos_files):
-	ln -sf user-guide.xml $@
diff --git a/gnome2-user-guide/Makefile.am b/gnome2-user-guide/Makefile.am
index 96732b9..1000c92 100644
--- a/gnome2-user-guide/Makefile.am
+++ b/gnome2-user-guide/Makefile.am
@@ -2,8 +2,8 @@ include $(top_srcdir)/gnome-doc-utils.make
 dist-hook: doc-dist-hook
 
 DOC_MODULE = user-guide
-DOC_ENTITIES =			\
-	glossary.xml		\
+DOC_ENTITIES = legal.xml
+DOC_INCLUDES =			\
 	gosbasic.xml		\
 	goscustdesk.xml		\
 	goseditmainmenu.xml	\
@@ -12,6 +12,6 @@ DOC_ENTITIES =			\
 	gospanel.xml		\
 	gosstartsession.xml	\
 	gostools.xml		\
-	legal.xml
+	glossary.xml
 
 DOC_LINGUAS =