Author: crichton
Date: 2005-05-01 19:16:40 -0400 (Sun, 01 May 2005)
New Revision: 43858
Modified:
trunk/gtkmozembed-sharp/ChangeLog
trunk/gtkmozembed-sharp/Makefile.am
trunk/gtkmozembed-sharp/configure.in
trunk/gtkmozembed-sharp/doc/ChangeLog
trunk/gtkmozembed-sharp/doc/Makefile
Log:
More changes to help support monodoc.
Modified: trunk/gtkmozembed-sharp/ChangeLog
===================================================================
--- trunk/gtkmozembed-sharp/ChangeLog 2005-05-01 22:54:42 UTC (rev 43857)
+++ trunk/gtkmozembed-sharp/ChangeLog 2005-05-01 23:16:40 UTC (rev 43858)
@@ -1,3 +1,8 @@
+2005-05-01 Mark Crichton <[EMAIL PROTECTED]>
+
+ * Makefile.am:
+ * configure.in: Added code to support using monodoc
+
2005-04-20 John Luke <[EMAIL PROTECTED]>
* gtkmozembed/Makefile.am:
Modified: trunk/gtkmozembed-sharp/Makefile.am
===================================================================
--- trunk/gtkmozembed-sharp/Makefile.am 2005-05-01 22:54:42 UTC (rev 43857)
+++ trunk/gtkmozembed-sharp/Makefile.am 2005-05-01 23:16:40 UTC (rev 43858)
@@ -1,4 +1,4 @@
-SUBDIRS = sources gtkmozembed sample
+SUBDIRS = sources gtkmozembed doc sample
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gecko-sharp-2.0.pc
Modified: trunk/gtkmozembed-sharp/configure.in
===================================================================
--- trunk/gtkmozembed-sharp/configure.in 2005-05-01 22:54:42 UTC (rev
43857)
+++ trunk/gtkmozembed-sharp/configure.in 2005-05-01 23:16:40 UTC (rev
43858)
@@ -1,6 +1,6 @@
AC_INIT(README)
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(gecko-sharp-2.0, 0.8)
+AM_INIT_AUTOMAKE(gecko-sharp-2.0, 0.9)
AM_MAINTAINER_MODE
API_VERSION=2.0.0.0
@@ -102,6 +102,24 @@
dnl AC_SUBST(MOZ_LIBS)
dnl AC_SUBST(MOZ_CFLAGS)
+dnl Find monodoc
+MONODOC_REQUIRED_VERSION=1.0
+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
+ enable_monodoc=no
+ fi
+else
+ MONODOC=
+fi
+
+AC_SUBST(MONODOC)
+AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_monodoc" = "xyes")
+
+
AC_PATH_PROG(GACUTIL, gacutil, no)
if test "x$GACUTIL" = "xno" ; then
AC_MSG_ERROR([No gacutil tool found])
@@ -122,7 +140,18 @@
gtkmozembed/gecko-sharp.dll.config
gtkmozembed/Makefile
gtkmozembed/AssemblyInfo.cs
+doc/Makefile
sample/Makefile
sources/Makefile
gecko-sharp-2.0.pc
])
+
+echo "---"
+echo "Configuration summary"
+echo ""
+echo " * Installation prefix: $prefix"
+echo " * compiler: $CSC"
+echo " * Documentation: $enable_monodoc ($MONODOC)"
+echo ""
+echo "---"
+
Modified: trunk/gtkmozembed-sharp/doc/ChangeLog
===================================================================
--- trunk/gtkmozembed-sharp/doc/ChangeLog 2005-05-01 22:54:42 UTC (rev
43857)
+++ trunk/gtkmozembed-sharp/doc/ChangeLog 2005-05-01 23:16:40 UTC (rev
43858)
@@ -1,6 +1,7 @@
2005-05-01 Mark Crichton <[EMAIL PROTECTED]>
* en/GtkSharp.GeckoSharp: Removed, for it is worthless.
+ * Makefile.am: Cleaned up
2004-06-28 John Luke <[EMAIL PROTECTED]>
Modified: trunk/gtkmozembed-sharp/doc/Makefile
===================================================================
--- trunk/gtkmozembed-sharp/doc/Makefile 2005-05-01 22:54:42 UTC (rev
43857)
+++ trunk/gtkmozembed-sharp/doc/Makefile 2005-05-01 23:16:40 UTC (rev
43858)
@@ -1,21 +1,334 @@
-prefix=/usr
-BROWSER=../../monodoc/browser/browser.exe
-ASSEMBLER=../../monodoc/browser/assembler.exe
-GENERATOR=../../monodoc/generator/generator.exe
-UPDATER=../../monodoc/generator/updater.exe
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
+# doc/Makefile. Generated from Makefile.in by configure.
-all: gecko-sharp-docs.zip gecko-sharp-docs.tree
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
-gecko-sharp-docs.zip gecko-sharp-docs.tree: en/*/*.xml
- mono $(ASSEMBLER) --ecma en -o gecko-sharp-docs
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
-install: gecko-sharp-docs.zip gecko-sharp-docs.tree
- install -m 644 gecko-sharp-docs.zip gecko-sharp-docs.tree `monodoc
--get-sourcesdir`
- install -m 644 gecko-sharp-docs.source `monodoc --get-sourcesdir`
-update: ../gtkmozembed/gecko-sharp.dll
- mono $(UPDATER) ../gtkmozembed/gecko-sharp.dll -o en/
-clean:
- -rm *.tree
- -rm *zip
+srcdir = .
+top_srcdir = ..
+
+pkgdatadir = $(datadir)/gecko-sharp-2.0
+pkglibdir = $(libdir)/gecko-sharp-2.0
+pkgincludedir = $(includedir)/gecko-sharp-2.0
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = /usr/bin/install -c
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+target_triplet = x86_64-unknown-linux-gnu
+subdir = doc
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ ChangeLog
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+DATA = $(noinst_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = ${SHELL} /home/crichton/cvs/mono/gtkmozembed-sharp/missing --run
aclocal-1.9
+AMTAR = ${SHELL} /home/crichton/cvs/mono/gtkmozembed-sharp/missing --run tar
+API_VERSION = 2.0.0.0
+AUTOCONF = ${SHELL} /home/crichton/cvs/mono/gtkmozembed-sharp/missing --run
autoconf
+AUTOHEADER = ${SHELL} /home/crichton/cvs/mono/gtkmozembed-sharp/missing --run
autoheader
+AUTOMAKE = ${SHELL} /home/crichton/cvs/mono/gtkmozembed-sharp/missing --run
automake-1.9
+AWK = mawk
+BASE_DEPENDENCIES_CFLAGS = -DXTHREADS -I/usr/include/gtk-2.0
-I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0
-I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0
-I/usr/lib/glib-2.0/include
+BASE_DEPENDENCIES_LIBS = -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0
-latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0
-lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0
+BUILD_GTK_CFLAGS = -DXTHREADS -I/usr/include/gtk-2.0
-I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0
-I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0
-I/usr/lib/glib-2.0/include
+BUILD_GTK_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm
-lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl
-lglib-2.0
+CSC = /opt/stuff/bin/mcs
+CYGPATH_W = echo
+DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\"
-DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE=\"gecko-sharp-2.0\"
-DVERSION=\"0.9\"
+ECHO_C =
+ECHO_N = -n
+ECHO_T =
+ENABLE_MONODOC_FALSE = #
+ENABLE_MONODOC_TRUE =
+GACUTIL = /opt/stuff/bin/gacutil
+GAPI_CFLAGS =
+GAPI_LIBS =
+GTK_SHARP_CFLAGS = -I:/opt/stuff/share/gapi-2.0/pango-api.xml
-I:/opt/stuff/share/gapi-2.0/atk-api.xml
-I:/opt/stuff/share/gapi-2.0/gdk-api.xml
-I:/opt/stuff/share/gapi-2.0/gtk-api.xml
+GTK_SHARP_LIBS = -r:/opt/stuff/lib/mono/gtk-sharp-2.0/glib-sharp.dll
-r:/opt/stuff/lib/mono/gtk-sharp-2.0/pango-sharp.dll
-r:/opt/stuff/lib/mono/gtk-sharp-2.0/atk-sharp.dll
-r:/opt/stuff/lib/mono/gtk-sharp-2.0/gdk-sharp.dll
-r:/opt/stuff/lib/mono/gtk-sharp-2.0/gtk-sharp.dll
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
+LD_LIBRARY_PATH = /opt/stuff/lib
+LIBOBJS =
+LIBS =
+LIB_PREFIX = .so
+LIB_SUFFIX =
+LTLIBOBJS =
+MAINT = #
+MAINTAINER_MODE_FALSE =
+MAINTAINER_MODE_TRUE = #
+MAKEINFO = ${SHELL} /home/crichton/cvs/mono/gtkmozembed-sharp/missing --run
makeinfo
+MCS = /opt/stuff/bin/mcs
+MONO = /opt/stuff/bin/mono
+MONODOC = /opt/stuff/bin/monodoc
+MONODOC_DEPENDENCY_CFLAGS =
+MONODOC_DEPENDENCY_LIBS = /r:/opt/stuff/lib/mono/monodoc/monodoc.dll
+MONODOC_REQUIRED_VERSION = 1.0
+MONO_DEPENDENCY_CFLAGS = -D_REENTRANT -pthread -I/opt/stuff/include
-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
+MONO_DEPENDENCY_LIBS = -Wl,--export-dynamic -pthread -L/opt/stuff/lib -lmono
-lpthread -lm -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0
+PACKAGE = gecko-sharp-2.0
+PACKAGE_BUGREPORT =
+PACKAGE_NAME =
+PACKAGE_STRING =
+PACKAGE_TARNAME =
+PACKAGE_VERSION =
+PATH =
/opt/stuff/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11:/usr/games
+PATH_SEPARATOR = :
+PKG_CONFIG = /usr/bin/pkg-config
+RUNTIME = /opt/stuff/bin/mono
+SET_MAKE =
+SHELL = /bin/sh
+STRIP =
+VERSION = 0.9
+WINBUILD_FALSE =
+WINBUILD_TRUE = #
+ac_ct_STRIP =
+am__leading_dot = .
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+bindir = ${exec_prefix}/bin
+build = x86_64-unknown-linux-gnu
+build_alias =
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+datadir = ${prefix}/share
+exec_prefix = ${prefix}
+host = x86_64-unknown-linux-gnu
+host_alias =
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+includedir = ${prefix}/include
+infodir = ${prefix}/info
+install_sh = /home/crichton/cvs/mono/gtkmozembed-sharp/install-sh
+libdir = ${exec_prefix}/lib
+libexecdir = ${exec_prefix}/libexec
+localstatedir = ${prefix}/var
+mandir = ${prefix}/man
+mkdir_p = mkdir -p --
+oldincludedir = /usr/include
+prefix = /opt/stuff
+program_transform_name = s,x,x,
+sbindir = ${exec_prefix}/sbin
+sharedstatedir = ${prefix}/com
+sysconfdir = ${prefix}/etc
+target = x86_64-unknown-linux-gnu
+target_alias =
+target_cpu = x86_64
+target_os = linux-gnu
+target_vendor = unknown
+#TARGETS =
+TARGETS = gecko-sharp-docs.zip gecko-sharp-docs.tree gecko-sharp-docs.source
+#DOCDIR = $(datadir)
+DOCDIR = `$(MONODOC) --get-sourcesdir`
+noinst_DATA = $(TARGETS)
+ASSEMBLER = $(MONODOC) --assemble
+UPDATER = $(MONODOC) --update
+CLEANFILES = gecko-sharp-docs.zip gecko-sharp-docs.tree
+EXTRA_DIST = gecko-sharp-docs.source gecko-sharp-docs.tree gecko-sharp-docs.zip
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu doc/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure
$(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: # $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed
"s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+ if test -d $$d/$$file; then \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$(top_distdir)" distdir="$(distdir)" \
+ dist-hook
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+#install-data-local:
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-data-local
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic dist-hook \
+ distclean distclean-generic distdir dvi dvi-am html html-am \
+ info info-am install install-am install-data install-data-am \
+ install-data-local install-exec install-exec-am install-info \
+ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am uninstall uninstall-am uninstall-info-am
+
+
+install-data-local:
+ install -m 644 $(srcdir)/gecko-sharp-docs.source `monodoc
--get-sourcesdir`
+ install -m 644 $(srcdir)/gecko-sharp-docs.tree `monodoc
--get-sourcesdir`
+ install -m 644 $(srcdir)/gecko-sharp-docs.zip `monodoc --get-sourcesdir`
+
+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
+
+dist-hook:
+ mkdir -p $(distdir)/en
+ cp $(srcdir)/en/*.xml $(distdir)/en/
+ mkdir -p $(distdir)/en/Gecko
+ cp $(srcdir)/en/Gecko/*.xml $(distdir)/en/Gecko/
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches