Permalink
Browse files

* doc/Makefile.am:

* configure.in: use monodocer instead of monodoc to break
cyclic dep on mono-tools


svn path=/trunk/gtkmozembed-sharp/; revision=69353
  • Loading branch information...
1 parent 137c2fc commit cc07c803f19cf637c0e21fd352a36420f3c9e8ea Wade Berrier committed Dec 11, 2006
Showing with 17 additions and 7 deletions.
  1. +5 −0 ChangeLog
  2. +5 −5 configure.in
  3. +5 −0 doc/ChangeLog
  4. +2 −2 doc/Makefile.am
View
@@ -1,3 +1,8 @@
+2006-12-11 Wade Berrier <wberrier@novell.com>
+
+ * configure.in: use monodocer instead of monodoc to break
+ cyclic dep on mono-tools
+
2006-04-13 Zac Bowling <zac@zacbowling.com>
* sample/Makefile.am: added Glib to WebThumbnailer
View
@@ -108,15 +108,15 @@ AC_SUBST(MONODOC_REQUIRED_VERSION)
PKG_CHECK_MODULES(MONODOC_DEPENDENCY, monodoc >= $MONODOC_REQUIRED_VERSION, enable_monodoc=yes, enable_monodoc=no)
if test "x$enable_monodoc" = "xyes"; then
- AC_PATH_PROG(MONODOC, monodoc, no)
- if test x$MONODOC = xno; then
+ AC_PATH_PROG(MONODOCER, monodocer, no)
+ if test x$MONODOCER = xno; then
enable_monodoc=no
fi
else
- MONODOC=
+ MONODOCER=
fi
-AC_SUBST(MONODOC)
+AC_SUBST(MONODOCER)
AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_monodoc" = "xyes")
@@ -154,7 +154,7 @@ echo "Configuration summary"
echo ""
echo " * Installation prefix: $prefix"
echo " * compiler: $CSC"
-echo " * Documentation: $enable_monodoc ($MONODOC)"
+echo " * Documentation: $enable_monodoc ($MONODOCER)"
echo ""
echo "---"
View
@@ -1,3 +1,8 @@
+2006-12-11 Wade Berrier <wberrier@novell.com>
+
+ * Makefile.am: use monodocer instead of monodoc to break
+ cyclic dep on mono-tools
+
2005-09-08 Wade Berrier <wberrier@novell.com>
* Makefile.am: don't use pkgconfig for monodoc location
View
@@ -7,13 +7,13 @@ endif
noinst_DATA = $(TARGETS)
ASSEMBLER = mdassembler
-UPDATER = $(MONODOC) --update
gecko-sharp-docs.zip gecko-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
$(ASSEMBLER) --ecma $(srcdir)/en -o gecko-sharp-docs
update:
- $(UPDATER) ../gtkmozembed-sharp/gecko-sharp.dll -o ./en -f
+ rm -Rf ./en/Gecko/* ./en/GtkSharp.GeckoSharp/*
+ $(MONODOCER) -updateto:./en -path:. -assembly:../gtkmozembed/gecko-sharp.dll
CLEANFILES = gecko-sharp-docs.zip gecko-sharp-docs.tree

0 comments on commit cc07c80

Please sign in to comment.