Author: wade
Date: 2006-12-11 14:46:00 -0500 (Mon, 11 Dec 2006)
New Revision: 69353
Modified:
trunk/gtkmozembed-sharp/ChangeLog
trunk/gtkmozembed-sharp/configure.in
trunk/gtkmozembed-sharp/doc/ChangeLog
trunk/gtkmozembed-sharp/doc/Makefile.am
Log:
* doc/Makefile.am:
* configure.in: use monodocer instead of monodoc to break
cyclic dep on mono-tools
Modified: trunk/gtkmozembed-sharp/ChangeLog
===================================================================
--- trunk/gtkmozembed-sharp/ChangeLog 2006-12-11 19:27:43 UTC (rev 69352)
+++ trunk/gtkmozembed-sharp/ChangeLog 2006-12-11 19:46:00 UTC (rev 69353)
@@ -1,3 +1,8 @@
+2006-12-11 Wade Berrier <[EMAIL PROTECTED]>
+
+ * configure.in: use monodocer instead of monodoc to break
+ cyclic dep on mono-tools
+
2006-04-13 Zac Bowling <[EMAIL PROTECTED]>
* sample/Makefile.am: added Glib to WebThumbnailer
Modified: trunk/gtkmozembed-sharp/configure.in
===================================================================
--- trunk/gtkmozembed-sharp/configure.in 2006-12-11 19:27:43 UTC (rev
69352)
+++ trunk/gtkmozembed-sharp/configure.in 2006-12-11 19:46:00 UTC (rev
69353)
@@ -108,15 +108,15 @@
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 ""
echo " * Installation prefix: $prefix"
echo " * compiler: $CSC"
-echo " * Documentation: $enable_monodoc ($MONODOC)"
+echo " * Documentation: $enable_monodoc ($MONODOCER)"
echo ""
echo "---"
Modified: trunk/gtkmozembed-sharp/doc/ChangeLog
===================================================================
--- trunk/gtkmozembed-sharp/doc/ChangeLog 2006-12-11 19:27:43 UTC (rev
69352)
+++ trunk/gtkmozembed-sharp/doc/ChangeLog 2006-12-11 19:46:00 UTC (rev
69353)
@@ -1,3 +1,8 @@
+2006-12-11 Wade Berrier <[EMAIL PROTECTED]>
+
+ * Makefile.am: use monodocer instead of monodoc to break
+ cyclic dep on mono-tools
+
2005-09-08 Wade Berrier <[EMAIL PROTECTED]>
* Makefile.am: don't use pkgconfig for monodoc location
Modified: trunk/gtkmozembed-sharp/doc/Makefile.am
===================================================================
--- trunk/gtkmozembed-sharp/doc/Makefile.am 2006-12-11 19:27:43 UTC (rev
69352)
+++ trunk/gtkmozembed-sharp/doc/Makefile.am 2006-12-11 19:46:00 UTC (rev
69353)
@@ -7,13 +7,13 @@
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
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
