From 88f178a481d81cf8ca08b33f3d7727c0a49b6ad2 Mon Sep 17 00:00:00 2001 From: Ben Maurer Date: Mon, 29 Aug 2005 00:02:37 +0000 Subject: [PATCH] In doc: * Makefile.am (gtk-sharp-docs.zip gtk-sharp-docs.tree): Use mdassembler. In .: * configure.in.in: Enable doc building without mono-tools being built. svn path=/trunk/gtk-sharp/; revision=49048 --- ChangeLog | 3 +++ configure.in.in | 10 +++++----- doc/ChangeLog | 3 +++ doc/Makefile.am | 4 +--- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index d8c75cab8..ebde1c587 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-08-28 Ben Maurer + * configure.in.in: Enable doc building without mono-tools being + built. + * gtk/NodeSelection.cs: helper api 2005-08-27 Peter Williams diff --git a/configure.in.in b/configure.in.in index 422dad31b..78d4606f3 100644 --- a/configure.in.in +++ b/configure.in.in @@ -221,14 +221,14 @@ else enable_vte=no fi -MONODOC_REQUIRED_VERSION=1.0.6.99 -PKG_CHECK_MODULES(MONODOC_DEPS, monodoc >= $MONODOC_REQUIRED_VERSION, enable_monodoc=yes, enable_monodoc=no) -AC_PATH_PROG(MONODOC, monodoc, no) +AC_PATH_PROG(MDASSEMBLER, mdassembler, no) AC_PATH_PROG(MONODOCER, monodocer, no) -if test "x$MONODOCER" = "xno" -o "x$MONODOC" = "xno"; then +if test "x$MONODOCER" = "xno" -o "x$MDASSEMBLER" = "xno"; then enable_monodoc=no +else + enable_monodoc=yes fi -AC_SUBST(MONODOC) +AC_SUBST(MDASSEMBLER) AC_SUBST(MONODOCER) AM_CONDITIONAL(ENABLE_LIBART, test "x$enable_libart" = "xyes") diff --git a/doc/ChangeLog b/doc/ChangeLog index f93d964e5..2afa30bf4 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,8 @@ 2005-08-28 Ben Maurer + * Makefile.am (gtk-sharp-docs.zip gtk-sharp-docs.tree): Use + mdassembler. + * en/Gtk/NodeSelection.xml: Docs 2005-08-14 John Luke diff --git a/doc/Makefile.am b/doc/Makefile.am index acef2a976..905ea5ea2 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,5 +1,3 @@ -ASSEMBLER = $(MONODOC) --assemble - ASSEMBLIES = \ glib-sharp.dll \ pango-sharp.dll \ @@ -28,7 +26,7 @@ endif assemble: gtk-sharp-docs.zip gtk-sharp-docs.tree gtk-sharp-docs.zip gtk-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml - $(ASSEMBLER) --ecma $(srcdir)/en -o gtk-sharp-docs + $(MDASSEMBLER) --ecma $(srcdir)/en -o gtk-sharp-docs get-assemblies: mkdir -p lib