[gnome-doc-utils: 163/165] Getting relevant Mallard files into the build

[Shaun McCance <shaunm src gnome org>]

commit c5cce0b987f5e463619608a3c46cd61a70d4ccaf
Author: Shaun McCance <shaunm shaunmlxlap localdomain>
Date:   Sun Jun 14 22:05:57 2009 -0500

    Getting relevant Mallard files into the build

 configure.in                      |    3 ++
 doc/Makefile.am                   |    2 +-
 doc/mallard/C/Makefile            |   57 -----------------------------
 doc/mallard/C/Makefile.am         |   72 +++++++++++++++++++++++++++++++++++++
 doc/mallard/C/figures/Makefile.am |    1 +
 doc/mallard/Makefile.am           |    8 +----
 rng/mallard/Makefile.am           |    4 ++-
 7 files changed, 81 insertions(+), 66 deletions(-)
---
diff --git a/configure.in b/configure.in
index 92853e2..ebb78bd 100644
--- a/configure.in
+++ b/configure.in
@@ -55,6 +55,9 @@ data/templates/Makefile
 data/watermarks/Makefile
 doc/Makefile
 doc/gnome-doc-make/Makefile
+doc/mallard/Makefile
+doc/mallard/C/Makefile
+doc/mallard/C/figures/Makefile
 doc/xslt/Makefile
 po/Makefile.in
 rng/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8ab2702..b95586d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1 +1 @@
-SUBDIRS = gnome-doc-make xslt #mallard
+SUBDIRS = gnome-doc-make xslt mallard
diff --git a/doc/mallard/C/Makefile.am b/doc/mallard/C/Makefile.am
new file mode 100644
index 0000000..d238901
--- /dev/null
+++ b/doc/mallard/C/Makefile.am
@@ -0,0 +1,72 @@
+SUBDIRS = figures
+
+EXTRA_DIST = \
+	details.page \
+	explore.page \
+	i18n.page \
+	index.page \
+	its.page \
+	l10n.page \
+	legal.xml \
+	links.page \
+	mal_attr_link.page \
+	mal_block_cite.page \
+	mal_block_code.page \
+	mal_block_comment.page \
+	mal_block_desc.page \
+	mal_block_example.page \
+	mal_block_figure.page \
+	mal_block_listing.page \
+	mal_block_list.page \
+	mal_block_media.page \
+	mal_block_note.page \
+	mal_block.page \
+	mal_block_p.page \
+	mal_block_quote.page \
+	mal_block_screen.page \
+	mal_block_steps.page \
+	mal_block_subtitle.page \
+	mal_block_synopsis.page \
+	mal_block_terms.page \
+	mal_block_title.page \
+	mal_block_tree.page \
+	mal_external.page \
+	mal_info_copyright.page \
+	mal_info_credit.page \
+	mal_info_desc.page \
+	mal_info_license.page \
+	mal_info_link.page \
+	mal_info.page \
+	mal_info_revision.page \
+	mal_info_title.page \
+	mal_inline_app.page \
+	mal_inline_cmd.page \
+	mal_inline_code.page \
+	mal_inline_em.page \
+	mal_inline_file.page \
+	mal_inline_gui.page \
+	mal_inline_guiseq.page \
+	mal_inline_input.page \
+	mal_inline_key.page \
+	mal_inline_keyseq.page \
+	mal_inline_link.page \
+	mal_inline_media.page \
+	mal_inline_output.page \
+	mal_inline.page \
+	mal_inline_span.page \
+	mal_inline_sys.page \
+	mal_inline_var.page \
+	mal_page.page \
+	mal_section.page \
+	mal_table_col.page \
+	mal_table.page \
+	mal_table_td.page \
+	mal_table_tr.page \
+	mal_TODO.page \
+	principle-guide.page \
+	principle-justenough.page \
+	principle-redundancy.page \
+	principles.page \
+	spec.page \
+	tenminutes.page
+	
\ No newline at end of file
diff --git a/doc/mallard/C/figures/Makefile.am b/doc/mallard/C/figures/Makefile.am
new file mode 100644
index 0000000..aa2c155
--- /dev/null
+++ b/doc/mallard/C/figures/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = mallard.png
diff --git a/doc/mallard/Makefile.am b/doc/mallard/Makefile.am
index cb7c8bd..1487d19 100644
--- a/doc/mallard/Makefile.am
+++ b/doc/mallard/Makefile.am
@@ -1,8 +1,2 @@
-include $(top_srcdir)/tools/gnome-doc-utils.make
-include $(top_srcdir)/bootstrap.make
-dist-hook: doc-dist-hook
-
-DOC_MODULE = mallard
-DOC_INCLUDES =
-DOC_ENTITIES =
+SUBDIRS = C
 
diff --git a/rng/mallard/Makefile.am b/rng/mallard/Makefile.am
index d0006f1..d5613e1 100644
--- a/rng/mallard/Makefile.am
+++ b/rng/mallard/Makefile.am
@@ -18,5 +18,7 @@ mallard.rng: mallard.rnc rnc2rng.awk
 	      -e 's/" ns=/"\n    ns=/' \
 	      -e 's/^<s/\n<s/' \
 	      -e 's/^<d/\n<d/' \
-	  > $@ || ( rm -f $  tmp && exit 1 )
+	  > $@ || ( rm -f $  tmp && exit 1 ) && rm -f $  tmp
+
+EXTRA_DIST = mal2rnc.xsl rnc2rng.awk mallard.rnc mallard.rng