small details

diff --git a/champlain-gtk/champlain-gtk-sources.xml b/champlain-gtk/champlain-gtk-sources.xml
index eec48257a683e833a7900c92dc6f6ecc7d578d9b..fbf52ec954c67a08aa933435e719b9f9f0ffba6d 100644 (file)
--- a/champlain-gtk/champlain-gtk-sources.xml
+++ b/champlain-gtk/champlain-gtk-sources.xml
@@ -2,7 +2,7 @@
        <api filename="champlain-gtk-api.raw">
                <library name="champlain-gtk">
                        <namespace name="Champlain">
-                               <dir>../../champlain-gtk-bleeding/champlain-gtk</dir>
+                               <dir>../../champlain-gtk/champlain-gtk</dir>
                        </namespace>
                </library>
        </api>

diff --git a/champlain/champlain-sources.xml b/champlain/champlain-sources.xml
index c7e38ebf30e4b7f4183d5434a73865238890629e..a6b12e82e04b4884389cdb1109c81aa0d2256698 100644 (file)
--- a/champlain/champlain-sources.xml
+++ b/champlain/champlain-sources.xml
@@ -2,30 +2,30 @@
        <api filename="champlain-api.raw">
                <library name="champlain">
                        <namespace name="Champlain">
-                               <file>../../champlain-bleeding/champlain/champlain.h</file>
-                               <file>../../champlain-bleeding/champlain/champlain-view.h</file>
-                               <file>../../champlain-bleeding/champlain/champlain-defines.h</file>
-                               <file>../../champlain-bleeding/champlain/champlain-layer.h</file>
-                               <file>../../champlain-bleeding/champlain/champlain-marker.h</file>
-                               <file>../../champlain-bleeding/champlain/champlain-debug.c</file>
-                               <file>../../champlain-bleeding/champlain/champlain-view.c</file>
-                               <file>../../champlain-bleeding/champlain/champlain-layer.c</file>
-                               <file>../../champlain-bleeding/champlain/champlain-marker.c</file>
-                               <file>../../champlain-bleeding/champlain/champlain-map.c</file>
-                               <file>../../champlain-bleeding/champlain/champlain-zoom-level.c</file>
-                               <file>../../champlain-bleeding/champlain/champlain-tile.c</file>
-                               <file>../../champlain-bleeding/champlain/sources/oam.c</file>
-                               <file>../../champlain-bleeding/champlain/sources/osmmapnik.c</file>
-                               <file>../../champlain-bleeding/champlain/sources/mffrelief.c</file>
-                               <file>../../champlain-bleeding/champlain/sources/googlemap.c</file>
-                               <file>../../champlain-bleeding/champlain/sources/googlesat.c</file>
-                               <file>../../champlain-bleeding/champlain/sources/googleterrain.c</file>
-                               <file>../../champlain-bleeding/champlain/sources/debugmap.c</file>
-                               <file>../../champlain-bleeding/champlain/champlain-marshal.h</file>
-                               <file>../../champlain-bleeding/champlain/champlain-marshal.c</file>
-                               <file>../../champlain-bleeding/champlain/champlain-enum-types.h</file>
-                               <file>../../champlain-bleeding/champlain/champlain-enum-types.c</file>
-                               <file>../../champlain-bleeding/champlain/stamp-enum-types</file>
+                               <file>../../champlain/champlain/champlain.h</file>
+                               <file>../../champlain/champlain/champlain-view.h</file>
+                               <file>../../champlain/champlain/champlain-defines.h</file>
+                               <file>../../champlain/champlain/champlain-layer.h</file>
+                               <file>../../champlain/champlain/champlain-marker.h</file>
+                               <file>../../champlain/champlain/champlain-debug.c</file>
+                               <file>../../champlain/champlain/champlain-view.c</file>
+                               <file>../../champlain/champlain/champlain-layer.c</file>
+                               <file>../../champlain/champlain/champlain-marker.c</file>
+                               <file>../../champlain/champlain/champlain-map.c</file>
+                               <file>../../champlain/champlain/champlain-zoom-level.c</file>
+                               <file>../../champlain/champlain/champlain-tile.c</file>
+                               <file>../../champlain/champlain/sources/oam.c</file>
+                               <file>../../champlain/champlain/sources/osmmapnik.c</file>
+                               <file>../../champlain/champlain/sources/mffrelief.c</file>
+                               <file>../../champlain/champlain/sources/googlemap.c</file>
+                               <file>../../champlain/champlain/sources/googlesat.c</file>
+                               <file>../../champlain/champlain/sources/googleterrain.c</file>
+                               <file>../../champlain/champlain/sources/debugmap.c</file>
+                               <file>../../champlain/champlain/champlain-marshal.h</file>
+                               <file>../../champlain/champlain/champlain-marshal.c</file>
+                               <file>../../champlain/champlain/champlain-enum-types.h</file>
+                               <file>../../champlain/champlain/champlain-enum-types.c</file>
+                               <file>../../champlain/champlain/stamp-enum-types</file>
                        </namespace>
                </library>
        </api>

diff --git a/examples/Makefile.in b/examples/Makefile.in
deleted file mode 100644 (file)
index 16fbcca..0000000
--- a/examples/Makefile.in
+++ /dev/null
@@ -1,337 +0,0 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
-
-# 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.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-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 = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = examples
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-       $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES =
-SCRIPTS = $(noinst_SCRIPTS)
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CHAMPLAIN_APIVERSION = @CHAMPLAIN_APIVERSION@
-CHAMPLAIN_CFLAGS = @CHAMPLAIN_CFLAGS@
-CHAMPLAIN_GTK_CFLAGS = @CHAMPLAIN_GTK_CFLAGS@
-CHAMPLAIN_GTK_LIBS = @CHAMPLAIN_GTK_LIBS@
-CHAMPLAIN_LIBS = @CHAMPLAIN_LIBS@
-CLUTTERSHARP_CFLAGS = @CLUTTERSHARP_CFLAGS@
-CLUTTERSHARP_LIBS = @CLUTTERSHARP_LIBS@
-CLUTTER_GTK_SHARP_CFLAGS = @CLUTTER_GTK_SHARP_CFLAGS@
-CLUTTER_GTK_SHARP_LIBS = @CLUTTER_GTK_SHARP_LIBS@
-CLUTTER_SHARP_LIBS = @CLUTTER_SHARP_LIBS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DOCDIR = @DOCDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-GACUTIL = @GACUTIL@
-GAPI_CFLAGS = @GAPI_CFLAGS@
-GAPI_CODEGEN = @GAPI_CODEGEN@
-GAPI_FIXUP = @GAPI_FIXUP@
-GAPI_LIBS = @GAPI_LIBS@
-GAPI_PARSER = @GAPI_PARSER@
-GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
-GTKSHARP_LIBS = @GTKSHARP_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCS = @MCS@
-MDASSEMBLER = @MDASSEMBLER@
-MKDIR_P = @MKDIR_P@
-MONO = @MONO@
-MONODOCER = @MONODOCER@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-am__leading_dot = @am__leading_dot@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-@ENABLE_GTK_FALSE@GTK_ASSEMBLY = 
-@ENABLE_GTK_TRUE@GTK_ASSEMBLY = champlain-gtk-sharp.dll
-@ENABLE_GTK_FALSE@GTK_REF = 
-@ENABLE_GTK_TRUE@GTK_REF = -r:champlain-gtk-sharp.dll
-@ENABLE_GTK_FALSE@GTK_EXAMPLES = 
-@ENABLE_GTK_TRUE@GTK_EXAMPLES = gtk-test.cs
-SAMPLES = $(GTK_EXAMPLES)
-MCSFLAGS = -debug -nologo -pkg:clutter-sharp -pkg:clutter-gtk-sharp -r:champlain-sharp.dll $(GTK_REF)
-assemblies = champlain-sharp.dll $(GTK_ASSEMBLY)
-noinst_SCRIPTS = $(SAMPLES:.cs=.exe)
-EXTRA_DIST = $(SAMPLES)
-CLEANFILES = *.exe *.mdb *.pdb *.dll
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(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  examples/Makefile'; \
-       cd $(top_srcdir) && \
-         $(AUTOMAKE) --gnu  examples/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: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       list='$(DISTFILES)'; \
-         dist_files=`for file in $$list; do echo $$file; done | \
-         sed -e "s|^$$srcdirstrip/||;t" \
-             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-       case $$dist_files in \
-         */*) $(MKDIR_P) `echo "$$dist_files" | \
-                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                          sort -u` ;; \
-       esac; \
-       for file in $$dist_files; do \
-         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-         if test -d $$d/$$file; then \
-           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-           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
-check-am: all-am
-check: check-am
-all-am: Makefile $(SCRIPTS)
-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."
-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-dvi: install-dvi-am
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-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:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-       distclean-generic distdir dvi dvi-am html html-am info info-am \
-       install install-am install-data install-data-am install-dvi \
-       install-dvi-am install-exec install-exec-am install-html \
-       install-html-am install-info install-info-am install-man \
-       install-pdf install-pdf-am install-ps install-ps-am \
-       install-strip installcheck installcheck-am installdirs \
-       maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
-
-%.exe: %.cs $(assemblies)
-       $(MCS) $(MCSFLAGS) $(GTKSHARP_LIBS) -out:$@ $<
-
-champlain-sharp.dll: $(top_builddir)/champlain/champlain-sharp.dll
-       cp $(top_builddir)/champlain/champlain-sharp.dll* .
-
-champlain-gtk-sharp.dll: $(top_builddir)/champlain-gtk/champlain-gtk-sharp.dll
-       cp $(top_builddir)/champlain-gtk/champlain-gtk-sharp.dll* .
-# 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: