From f52a4bb014809f697a2c27784652575ce01badfb Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Tue, 30 Mar 2004 22:32:46 +0000 Subject: [PATCH] 2004-03-30 John Luke [Reworked a bit by MK] * Makefile.am : add doc dir * configure.in : test for monodoc, expand doc/Makefile * doc/Makefile.am : build and dist docs * doc/makefile : kill svn path=/trunk/gtk-sharp/; revision=24805 --- ChangeLog | 8 ++++++ Makefile.am | 2 +- configure.in | 14 ++++++++++ doc/.cvsignore | 2 ++ doc/Makefile.am | 68 +++++++++++++++++++++++++++++++++++++++++++++++++ doc/makefile | 26 ------------------- 6 files changed, 93 insertions(+), 27 deletions(-) create mode 100644 doc/Makefile.am delete mode 100644 doc/makefile diff --git a/ChangeLog b/ChangeLog index 4aae6b3d4..12d8c7897 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-03-30 John Luke + + [Reworked a bit by MK] + * Makefile.am : add doc dir + * configure.in : test for monodoc, expand doc/Makefile + * doc/Makefile.am : build and dist docs + * doc/makefile : kill + 2004-03-30 Mike Kestner * gtk/Makefile.am : add the customs that miggie didn't add. diff --git a/Makefile.am b/Makefile.am index 0808583b8..ef778f2a1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = sources generator parser glib pango atk gdk gtk glade art gnome gda gnomedb gtkhtml gconf rsvg vte sample +SUBDIRS = sources generator parser glib pango atk gdk gtk glade art gnome gda gnomedb gtkhtml gconf rsvg vte sample doc pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gtk-sharp.pc diff --git a/configure.in b/configure.in index 7751968a5..5d339e631 100644 --- a/configure.in +++ b/configure.in @@ -83,6 +83,17 @@ fi AC_SUBST(RUNTIME) AC_SUBST(CSC) +MONODOC_REQUIRED_VERSION=0.12 +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) +else + MONODOC= +fi + +AC_SUBST(MONODOC) + PKG_CHECK_MODULES(GLIB, glib-2.0) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) @@ -158,6 +169,7 @@ AM_CONDITIONAL(ENABLE_GNOMEDB, test "x$enable_gnomedb" = "xyes") AM_CONDITIONAL(ENABLE_RSVG, test "x$enable_rsvg" = "xyes") AM_CONDITIONAL(ENABLE_GTKHTML, test "x$enable_gtkhtml" = "xyes") AM_CONDITIONAL(ENABLE_VTE, test "x$enable_vte" = "xyes") +AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_monodoc" = "xyes") AC_SUBST(CFLAGS) @@ -193,6 +205,7 @@ gconf/tools/gconfsharp-schemagen gtkhtml/Makefile rsvg/Makefile vte/Makefile +doc/Makefile sample/GtkDemo/Makefile sample/Makefile sample/gconf/Makefile @@ -210,6 +223,7 @@ echo "Configuration summary" echo "" echo " * Installation prefix = $prefix" echo " * $CS compiler: $CSC" +echo " * Documentation: $enable_monodoc ($MONODOC)" echo "" echo " Optional assemblies included in the build:" echo "" diff --git a/doc/.cvsignore b/doc/.cvsignore index bedf597ca..aff61a2a9 100644 --- a/doc/.cvsignore +++ b/doc/.cvsignore @@ -1,3 +1,5 @@ +Makefile +Makefile.in gtk-sharp-docs.zip gtk-sharp-docs.tree tmp diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 000000000..730e1e160 --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1,68 @@ +if ENABLE_MONODOC +TARGETS = gtk-sharp-docs.zip gtk-sharp-docs.tree gtk-sharp-docs.source +DOCDIR = `$(MONODOC) --get-sourcesdir` +else +TARGETS = +DOCDIR = $(datadir) +endif + +noinst_DATA = $(TARGETS) + +ASSEMBLER = $(MONODOC) --assemble +UPDATER = $(MONODOC) --update + +DIRS=glib pango atk gdk gtk glade art gnome gda gnomedb gconf/GConf gconf/GConf.PropertyEditors rsvg gtkhtml + +gtk-sharp-docs.zip gtk-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml + $(ASSEMBLER) --ecma $(srcdir)/en -o gtk-sharp-docs + +update: + for i in $(DIRS); do \ + $(UPDATER) ../$$i/*.dll -o ./en -f || exit 1; \ + done + +sources = \ + Tool.cs + +build_sources = $(addprefix $(srcdir)/, $(sources)) + +CLEANFILES = gtk-sharp-docs.zip gtk-sharp-docs.tree + +EXTRA_DIST = \ + gtk-sharp-docs.source + +dist-hook: + mkdir -p $(distdir)/en + cp $(srcdir)/en/*.xml $(distdir)/en/ + mkdir -p $(distdir)/en/GLib + cp $(srcdir)/en/GLib/*.xml $(distdir)/en/GLib/ + mkdir -p $(distdir)/en/Pango + cp $(srcdir)/en/Pango/*.xml $(distdir)/en/Pango/ + mkdir -p $(distdir)/en/Atk + cp $(srcdir)/en/Atk/*.xml $(distdir)/en/Atk/ + mkdir -p $(distdir)/en/Gdk + cp $(srcdir)/en/Gdk/*.xml $(distdir)/en/Gdk/ + mkdir -p $(distdir)/en/Gtk + cp $(srcdir)/en/Gtk/*.xml $(distdir)/en/Gtk/ + mkdir -p $(distdir)/en/Glade + cp $(srcdir)/en/Glade/*.xml $(distdir)/en/Glade/ + mkdir -p $(distdir)/en/Art + cp $(srcdir)/en/Art/*.xml $(distdir)/en/Art/ + mkdir -p $(distdir)/en/Gnome + cp $(srcdir)/en/Gnome/*.xml $(distdir)/en/Gnome/ + mkdir -p $(distdir)/en/Gda + cp $(srcdir)/en/Gda/*.xml $(distdir)/en/Gda/ + mkdir -p $(distdir)/en/GnomeDb + cp $(srcdir)/en/GnomeDb/*.xml $(distdir)/en/GnomeDb/ + mkdir -p $(distdir)/en/Rsvg + cp $(srcdir)/en/Rsvg/*.xml $(distdir)/en/Rsvg/ + mkdir -p $(distdir)/en/Vte + cp $(srcdir)/en/Vte/*.xml $(distdir)/en/Vte/ + mkdir -p $(distdir)/en/GConf + cp $(srcdir)/en/GConf/*.xml $(distdir)/en/GConf/ + mkdir -p $(distdir)/en/GConf.PropertyEditors + cp $(srcdir)/en/GConf.PropertyEditors/*.xml $(distdir)/en/GConf.PropertyEditors/ + mkdir -p $(distdir)/en/GLibSharp + cp $(srcdir)/en/GLibSharp/*.xml $(distdir)/en/GLibSharp/ + mkdir -p $(distdir)/en/GtkSharp + cp $(srcdir)/en/GtkSharp/*.xml $(distdir)/en/GtkSharp/ diff --git a/doc/makefile b/doc/makefile deleted file mode 100644 index 8dac0b6df..000000000 --- a/doc/makefile +++ /dev/null @@ -1,26 +0,0 @@ -prefix=/usr -BROWSER=../../monodoc/browser/browser.exe -ASSEMBLER=../../monodoc/browser/assembler.exe -UPDATER=../../monodoc/generator/updater.exe -DIRS=glib pango atk gdk gtk glade art gnome gda gnomedb gconf/GConf gconf/GConf.PropertyEditors rsvg gtkhtml - -all: gtk-sharp-docs.zip gtk-sharp-docs.tree - -b: - mono --debug $(BROWSER) - -gtk-sharp-docs.zip gtk-sharp-docs.tree: en/*/*.xml en/*.xml - mono $(ASSEMBLER) --ecma en -o gtk-sharp-docs - -update: - for i in $(DIRS); do \ - mono --debug $(UPDATER) ../$$i/*.dll -o ./en -f || exit 1; \ - done - -install: gtk-sharp-docs.zip gtk-sharp-docs.tree - install -m 644 gtk-sharp-docs.zip gtk-sharp-docs.tree `monodoc --get-sourcesdir` - install -m 644 gtk-sharp-docs.source `monodoc --get-sourcesdir` - -clean: - rm -f *.tree - rm -f *zip