[gtkmm-documentation] Convert examples to non-recursive build

From: Daniel Elstner <daniel src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [gtkmm-documentation] Convert examples to non-recursive build
Date: Thu, 20 Aug 2009 20:39:41 +0000 (UTC)
commit 9b5c0303a878886e500776e21eafeda3e254109f
Author: Daniel Elstner <danielk openismus com>
Date:   Thu Aug 20 21:26:27 2009 +0200

    Convert examples to non-recursive build
    
    * autogen.sh: Replace with minimal version from the glom module.
    * Makefile.am: Clean up and remove old cruft.
    * configure.ac: Rename file from configure.in and downsize it.
    * examples/**/Makefile.am: Remove obsolete non-recursive build files.
    * examples/Makefile.am_fragment: ditto.
    * examples/Makefile.am: Rewrite to non-recursive build.
    * examples/**/*.{cc,h}: Fix #include statements to use double quotes
    when including from the same directory as the source file.
    * scripts/: Delete directory and all files in it.
    * docs/tutorial/Makefile.am: Include gnome-doc-utils.make from the
    build/ subdirectory.

 .gitignore                                         |   17 +
 ChangeLog                                          |   16 +
 Makefile.am                                        |   66 +--
 autogen.sh                                         |  123 +----
 build/.gitignore                                   |   13 +
 configure.ac                                       |   40 ++
 configure.in                                       |  421 -------------
 docs/tutorial/Makefile.am                          |    2 +-
 examples/.gitignore                                |   41 ++
 examples/Makefile.am                               |  618 +++++++++++++++++++-
 examples/Makefile.am_fragment                      |   38 --
 examples/book/Makefile.am                          |   12 -
 examples/book/alignment/Makefile.am                |    6 -
 examples/book/aspectframe/Makefile.am              |    6 -
 examples/book/box/Makefile.am                      |    6 -
 examples/book/box/examplewindow.h                  |    2 +-
 examples/book/builder/Makefile.am                  |    2 -
 examples/book/builder/basic/Makefile.am            |    9 -
 examples/book/builder/derived/Makefile.am          |    8 -
 examples/book/buttonbox/Makefile.am                |    6 -
 examples/book/buttons/Makefile.am                  |    2 -
 examples/book/buttons/button/Makefile.am           |    7 -
 examples/book/buttons/checkbutton/Makefile.am      |    6 -
 .../book/buttons/filechooserbutton/Makefile.am     |    6 -
 examples/book/buttons/radiobutton/Makefile.am      |    6 -
 examples/book/buttons/togglebutton/Makefile.am     |    6 -
 examples/book/clipboard/Makefile.am                |    1 -
 examples/book/clipboard/ideal/Makefile.am          |    6 -
 examples/book/clipboard/simple/Makefile.am         |    6 -
 examples/book/combo/Makefile.am                    |    6 -
 examples/book/combobox/Makefile.am                 |    1 -
 examples/book/combobox/complex/Makefile.am         |    6 -
 examples/book/combobox/text/Makefile.am            |    6 -
 examples/book/comboboxentry/Makefile.am            |    1 -
 examples/book/comboboxentry/complex/Makefile.am    |    6 -
 examples/book/comboboxentry/text/Makefile.am       |    6 -
 examples/book/custom/Makefile.am                   |    3 -
 examples/book/custom/custom_container/Makefile.am  |    8 -
 examples/book/custom/custom_widget/Makefile.am     |    8 -
 examples/book/dialogs/Makefile.am                  |    2 -
 examples/book/dialogs/aboutdialog/Makefile.am      |    6 -
 .../book/dialogs/colorselectiondialog/Makefile.am  |    6 -
 .../book/dialogs/filechooserdialog/Makefile.am     |    6 -
 examples/book/dialogs/fileselection/Makefile.am    |    6 -
 .../book/dialogs/fontselectiondialog/Makefile.am   |    6 -
 examples/book/dialogs/messagedialog/Makefile.am    |    6 -
 examples/book/dialogs/simple/Makefile.am           |    6 -
 examples/book/drag_and_drop/Makefile.am            |    5 -
 examples/book/drawingarea/Makefile.am              |    1 -
 examples/book/drawingarea/arcs/Makefile.am         |    5 -
 examples/book/drawingarea/arcs/myarea.cc           |    2 +-
 examples/book/drawingarea/clock/Makefile.am        |    5 -
 examples/book/drawingarea/clock/clock.cc           |    2 +-
 examples/book/drawingarea/curve/Makefile.am        |    5 -
 examples/book/drawingarea/joins/Makefile.am        |    5 -
 examples/book/drawingarea/simple/Makefile.am       |    5 -
 examples/book/entry/Makefile.am                    |    1 -
 examples/book/entry/completion/Makefile.am         |    6 -
 examples/book/entry/icon/Makefile.am               |    6 -
 examples/book/entry/progress/Makefile.am           |    6 -
 examples/book/entry/simple/Makefile.am             |    6 -
 examples/book/eventbox/Makefile.am                 |    6 -
 examples/book/expander/Makefile.am                 |    6 -
 examples/book/frame/Makefile.am                    |    6 -
 examples/book/giomm/Makefile.am                    |    1 -
 examples/book/giomm/directory_list/Makefile.am     |    6 -
 examples/book/giomm/getline/Makefile.am            |    6 -
 examples/book/giomm/monitor_directory/Makefile.am  |    6 -
 examples/book/giomm/read_file/Makefile.am          |    6 -
 examples/book/giomm/read_file_async/Makefile.am    |    6 -
 examples/book/giomm/usage/Makefile.am              |    6 -
 examples/book/giomm/volumes/Makefile.am            |    6 -
 examples/book/giomm/write_file/Makefile.am         |    6 -
 examples/book/helloworld/Makefile.am               |    5 -
 examples/book/helloworld2/Makefile.am              |    5 -
 examples/book/iconview/Makefile.am                 |    9 -
 examples/book/idle/Makefile.am                     |    6 -
 examples/book/input/Makefile.am                    |    6 -
 examples/book/input/main.cc                        |    2 +-
 examples/book/label/Makefile.am                    |    6 -
 examples/book/libglademm/Makefile.am               |    3 -
 examples/book/libglademm/derived/Makefile.am       |    7 -
 examples/book/libglademm/simple/Makefile.am        |    8 -
 examples/book/menus/Makefile.am                    |    2 -
 examples/book/menus/main_menu/Makefile.am          |    6 -
 examples/book/menus/popup/Makefile.am              |    6 -
 examples/book/menus_and_toolbars/Makefile.am       |    9 -
 examples/book/notebook/Makefile.am                 |    6 -
 examples/book/paned/Makefile.am                    |    8 -
 examples/book/printing/Makefile.am                 |    1 -
 examples/book/printing/advanced/Makefile.am        |    7 -
 examples/book/printing/advanced/previewdialog.cc   |    2 +-
 examples/book/printing/simple/Makefile.am          |    6 -
 examples/book/progressbar/Makefile.am              |    6 -
 examples/book/range_widgets/Makefile.am            |    6 -
 examples/book/recent_files/Makefile.am             |    6 -
 examples/book/scrolledwindow/Makefile.am           |    6 -
 examples/book/scrolledwindow/examplewindow.cc      |    2 +-
 examples/book/signals/Makefile.am                  |    3 -
 examples/book/signals/custom/Makefile.am           |    6 -
 examples/book/socket/Makefile.am                   |    7 -
 examples/book/spinbutton/Makefile.am               |    6 -
 examples/book/spinbutton/examplewindow.cc          |    2 +-
 examples/book/statusicon/Makefile.am               |    6 -
 examples/book/table/Makefile.am                    |    6 -
 examples/book/textview/Makefile.am                 |    6 -
 examples/book/timeout/Makefile.am                  |    6 -
 examples/book/toolbar/Makefile.am                  |    6 -
 examples/book/tooltips/Makefile.am                 |    7 -
 examples/book/treeview/Makefile.am                 |    3 -
 examples/book/treeview/combo_renderer/Makefile.am  |    6 -
 examples/book/treeview/drag_and_drop/Makefile.am   |    8 -
 examples/book/treeview/editable_cells/Makefile.am  |    6 -
 examples/book/treeview/filter/Makefile.am          |    6 -
 examples/book/treeview/filter_modify/Makefile.am   |    6 -
 examples/book/treeview/list/Makefile.am            |    6 -
 examples/book/treeview/listviewtext/Makefile.am    |    6 -
 examples/book/treeview/modelsort/Makefile.am       |    6 -
 examples/book/treeview/popup/Makefile.am           |    6 -
 examples/book/treeview/tree/Makefile.am            |    6 -
 examples/book/update_ui/Makefile.am                |    6 -
 examples/others/Makefile.am                        |   13 -
 examples/others/arrow/Makefile.am                  |    7 -
 examples/others/calendar/Makefile.am               |    6 -
 examples/others/cellrenderercustom/Makefile.am     |    8 -
 examples/others/dnd/Makefile.am                    |    5 -
 examples/others/exception/Makefile.am              |    5 -
 examples/others/gdk/Makefile.am                    |    7 -
 examples/others/gdk/radar.cc                       |    2 +-
 examples/others/idle/Makefile.am                   |    5 -
 examples/others/rulers/Makefile.am                 |    6 -
 examples/others/statusbar/Makefile.am              |    6 -
 examples/others/stock/Makefile.am                  |    6 -
 examples/others/stock/stock.cc                     |    2 +-
 examples/others/tictactoe/Makefile.am              |    6 -
 examples/others/treemodelcustom/Makefile.am        |    6 -
 examples/others/window/Makefile.am                 |    6 -
 scripts/Makefile.am                                |    4 -
 scripts/README                                     |    2 -
 scripts/cxx.m4                                     |  140 -----
 scripts/cxx_std.m4                                 |  153 -----
 scripts/macros.m4                                  |  113 ----
 142 files changed, 764 insertions(+), 1732 deletions(-)
---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5d67712
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,17 @@
+Makefile
+Makefile.in
+stamp-h?
+/INSTALL
+/aclocal.m4
+/autom4te.cache/
+/config.log
+/config.status
+/config.status.lineno
+/configure
+/configure.lineno
+/omf.make
+/xmldocs.make
+/docs/FAQ/html/
+/docs/tutorial/html/
+/docs/tutorial/*/gtkmm-tut-with-examples.xml
+/docs/tutorial/*/*.[mp]o
diff --git a/ChangeLog b/ChangeLog
index 5810ec9..5135a76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2009-08-20  Daniel Elstner  <danielk openismus com>
+
+	Convert examples to non-recursive build
+
+	* autogen.sh: Replace with minimal version from the glom module.
+	* Makefile.am: Clean up and remove old cruft.
+	* configure.ac: Rename file from configure.in and downsize it.
+	* examples/**/Makefile.am: Remove obsolete non-recursive build files.
+	* examples/Makefile.am_fragment: ditto.
+	* examples/Makefile.am: Rewrite to non-recursive build.
+	* examples/**/*.{cc,h}: Fix #include statements to use double quotes
+	when including from the same directory as the source file.
+	* scripts/: Delete directory and all files in it.
+	* docs/tutorial/Makefile.am: Include gnome-doc-utils.make from the
+	build/ subdirectory.
+
 2009-06-25   Stas Sergeev  <stsp aknet ru>
 
 	* configure.in: Add AC_PROG_CXX to avoid circular dependency aclocal error.
diff --git a/Makefile.am b/Makefile.am
index 55f6b71..08350d8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,58 +1,14 @@
-SUBDIRS		= @EXAMPLE_SUBDIR@ @DOCS_SUBDIR@
-DIST_SUBDIRS	= $(SUBDIRS) scripts
+## This file is part of gtkmm-documentation.
 
-EXTRA_DIST	= autogen.sh
+ACLOCAL_AMFLAGS	= -I build ${ACLOCAL_FLAGS}
+DISTCHECK_CONFIGURE_FLAGS = --enable-warnings=max
 
+if HAVE_GNOME_DOC_UTILS
+doc_subdirs = docs
+else
+doc_subdirs =
+endif
+SUBDIRS = examples $(doc_subdirs)
 
-all-local:
-	@echo "*** Everything completed ***"
-
-dist-hook:
-	@echo; echo; \
-	echo "**********************************************************"; \
-	echo "* IMPORTANT NOTICE:                                      *"; \
-	echo "*                                                        *"; \
-	echo "* Be sure you have done a complete build before running  *"; \
-	echo "* 'make dist' or 'make distcheck', because otherwise     *"; \
-	echo "* the tarball will _not_ contain the dependency rules    *"; \
-	echo "* generated by the compiler.                             *"; \
-	echo "**********************************************************"; \
-	echo; echo
-
-
-include $(top_srcdir)/docs/Makefile_web.am_fragment
-
-doc_tarball_files = \
-	docs/index.html docs/FAQ/html docs/images/*.gif \
-	docs/reference/html \
-	docs/tutorial/figures/*.png docs/tutorial/html
-
-# This doesn't work very well in a $(srcdir) != $(builddir) setup,
-# but this target is for maintainer use only anyway.
-
-gtkmm-2-4-docs.tar.gz:
-	find examples -name '*.cc' -o -name '*.h' -o -name '*.xpm' -o -name '*.xml' | \
-	tar cf - --files-from - $(doc_tarball_files) | gzip -c --best >$@
-
-# Upload documentation and examples:
-
-post-html-recursive:
-	list='docs examples'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) post-html); \
-	done
-
-post-html-local: gtkmm-2-4-docs.tar.gz
-	rsync $(rsync_args) gtkmm-2-4-docs.tar.gz $$USER $(web_host):$(web_path_gtkmm)
-
-post-html: post-html-recursive post-html-local
-
-doc-clean-recursive:
-	(cd docs && $(MAKE) $(AM_MAKEFLAGS) doc-clean)
-
-doc-clean: doc-clean-recursive
-
-doc-rebuild:
-	(cd docs && $(MAKE) $(AM_MAKEFLAGS) doc-rebuild)
-
-.PHONY: post-html post-html-local post-html-recursive doc-clean doc-clean-recursive doc-rebuild
-
+dist_noinst_DATA = COPYING.examples README.SUN
+dist_noinst_SCRIPTS = autogen.sh
diff --git a/autogen.sh b/autogen.sh
index d427a48..7999f48 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,115 +1,10 @@
-#! /bin/sh
-
-# Copyright (c) 2006, The gtkmm Development Team
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-# Be Bourne compatible. (stolen from autoconf)
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-
-PROJECT=gtkmm
-MIN_AUTOMAKE_VERSION=1.9
-
-srcdir=`dirname "$0"`
+#! /bin/sh -e
+test -n "$srcdir" || srcdir=`dirname "$0"`
 test -n "$srcdir" || srcdir=.
-
-origdir=`pwd`
-cd "$srcdir"
-
-LIBTOOLIZE_FLAGS="--automake $LIBTOOLIZE_FLAGS"
-ACLOCAL_FLAGS="-I scripts $ACLOCAL_FLAGS"
-AUTOMAKE_FLAGS="--add-missing $AUTOMAKE_FLAGS"
-
-if test "x$*$AUTOGEN_SUBDIR_MODE" = x
-then
-  echo "I am going to run ./configure with no arguments -- if you wish"
-  echo "to pass any to it, please specify them on the $0 command line."
-fi
-
-libtoolize=libtoolize
-autoconf=autoconf
-autoheader=autoheader
-aclocal=
-automake=
-auto_version=0
-
-# awk program to transform the output of automake --version
-# into an integer value suitable for numeric comparison.
-extract_version='{ printf "%.0f", 1000000 * v[split($1, v, " ")] + 1000 * $2 + $3; exit }'
-
-for suffix in -1.7 -1.8 -1.9 ""
-do
-  aclocal_version=`aclocal$suffix --version </dev/null 2>/dev/null | awk -F. "$extract_version"`
-  automake_version=`automake$suffix --version </dev/null 2>/dev/null | awk -F. "$extract_version"`
-
-  if test "$aclocal_version" -eq "$automake_version" 2>/dev/null \
-     && test "$automake_version" -ge "$auto_version" 2>/dev/null
-  then
-    auto_version=$automake_version
-    aclocal=aclocal$suffix
-    automake=automake$suffix
-  fi
-done
-
-min_version=`echo "$MIN_AUTOMAKE_VERSION" | awk -F. "$extract_version"`
-
-if test "$auto_version" -ge "$min_version" 2>/dev/null
-then :; else
-  echo "Sorry, at least automake $MIN_AUTOMAKE_VERSION is required to configure $PROJECT."
-  exit 1
-fi
-
-rm -f config.guess config.sub depcomp install-sh missing mkinstalldirs
-rm -f config.cache acconfig.h
-rm -rf autom4te.cache
-
-#WARNINGS=all
-#export WARNINGS
-
-if (set -x && set +x) >/dev/null 2>&1
-then
-  set_xtrace=set
-else
-  set_xtrace=:
-fi
-
-$set_xtrace -x
-
-"$libtoolize" $LIBTOOLIZE_FLAGS	|| exit 1
-gnome-doc-prepare --force --copy || exit 1
-"$aclocal" $ACLOCAL_FLAGS	|| exit 1
-#"$autoheader"			|| exit 1
-"$automake" $AUTOMAKE_FLAGS	|| exit 1
-"$autoconf"			|| exit 1
-cd "$origdir"			|| exit 1
-
-if test -z "$AUTOGEN_SUBDIR_MODE"
-then
-  "$srcdir/configure" --enable-maintainer-mode ${1+"$@"} || exit 1
-  $set_xtrace +x
-  echo
-  echo "Now type 'make' to compile $PROJECT."
-fi
-
-exit 0
+(
+  cd "$srcdir" &&
+  gnome-doc-common --copy &&
+  gnome-doc-prepare --automake --copy --force &&
+  autoreconf --force --install
+) || exit
+test -n "$NOCONFIGURE" || "$srcdir/configure" --enable-maintainer-mode "$@"
diff --git a/build/.gitignore b/build/.gitignore
new file mode 100644
index 0000000..2d993ed
--- /dev/null
+++ b/build/.gitignore
@@ -0,0 +1,13 @@
+/compile-binding.am
+/config.*
+/depcomp
+/dist-changelog.am
+/doc-reference.am
+/generate-binding.am
+/gnome-doc-utils.m4
+/gnome-doc-utils.make
+/install-sh
+/libtool.m4
+/lt*.m4
+/ltmain.sh
+/missing
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..6a264a2
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,40 @@
+## This file is part of gtkmm-documentation.
+
+AC_PREREQ([2.59])
+AC_INIT([gtkmm-documentation], [2.16.0], [http://bugzilla.gnome.org/enter_bug.cgi?product=gtkmm],
+        [gtkmm-documentation], [http://www.gtkmm.org/])
+
+AC_CONFIG_SRCDIR([examples/book/box/packbox.cc])
+AC_CONFIG_AUX_DIR([build])
+AC_CONFIG_MACRO_DIR([build])
+AC_CONFIG_HEADERS([build/config.h])
+
+AM_INIT_AUTOMAKE([1.9 -Wno-portability dist-bzip2 no-define nostdinc tar-pax])
+AM_MAINTAINER_MODE
+AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
+
+AC_PROG_CXX
+AC_PATH_PROG([PERL], [perl], [perl])
+
+PKG_CHECK_MODULES([EXAMPLES], [giomm-2.4 >= 2.16.0 gtkmm-2.4 >= 2.16.0 libglademm-2.4 >= 2.6.0])
+MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])
+
+AC_LANG([C++])
+AC_CHECK_FUNCS([mkfifo flockfile funlockfile getc_unlocked])
+
+MM_ARG_ENABLE_WARNINGS([EXAMPLES_WXXFLAGS],
+                       [-Wall],
+                       [-pedantic -Wall -Wextra]
+                       [G PANGO ATK GDK GDK_PIXBUF GTK])
+
+GNOME_DOC_INIT([0.9.0],,
+  [AC_MSG_WARN([[gnome-doc-utils not found: tutorial will not be built.]])])
+
+AC_CONFIG_FILES([Makefile
+                 examples/Makefile
+                 docs/Makefile
+                 docs/FAQ/Makefile
+                 docs/images/Makefile
+                 docs/tutorial/Makefile
+                 docs/tutorial/icons/Makefile])
+AC_OUTPUT
diff --git a/docs/tutorial/Makefile.am b/docs/tutorial/Makefile.am
index 16d7239..d7b2a76 100644
--- a/docs/tutorial/Makefile.am
+++ b/docs/tutorial/Makefile.am
@@ -18,7 +18,7 @@ C/gtkmm-tut-with-examples.xml: C/gtkmm-tut.xml insert_example_code.pl
 	$(PERL_PATH) $(srcdir)/insert_example_code.pl $(top_srcdir)/examples/book $< >$@
 
 
-include $(top_srcdir)/scripts/gnome-doc-utils.make
+include $(top_srcdir)/build/gnome-doc-utils.make
 dist-hook: doc-dist-hook
 
 DOC_MODULE = gtkmm-tut-with-examples
diff --git a/examples/.gitignore b/examples/.gitignore
new file mode 100644
index 0000000..ced36f8
--- /dev/null
+++ b/examples/.gitignore
@@ -0,0 +1,41 @@
+*.o
+*.lo
+.deps/
+.dirstamp
+.libs/
+example
+!example/
+/book/buttons/button/buttons
+/book/buttons/radiobutton/radiobuttons
+/book/drag_and_drop/drag_and_drop
+/book/drawingarea/arcs/drawingareaarcs
+/book/drawingarea/clock/cairoclock
+/book/drawingarea/curve/drawingareacurve
+/book/drawingarea/joins/cairojoins
+/book/drawingarea/simple/drawingarea
+/book/giomm/getline/getline
+/book/giomm/monitor_directory/monitor_directory
+/book/giomm/usage/usage
+/book/helloworld/helloworld
+/book/helloworld2/helloworld2
+/book/idle/idle
+/book/menus/main_menu/main_menu
+/book/menus/popup/popup
+/book/socket/plug
+/book/socket/socket
+/book/timeout/timeout
+/others/arrow/arrow
+/others/arrow/direction
+/others/base/base
+/others/calendar/calendar
+/others/cellrenderercustom/cellrenderertoggle
+/others/cellrenderercustom/testpopup
+/others/dnd/testdnd
+/others/exception/exceptiontest
+/others/gdk/radar
+/others/idle/idle
+/others/rulers/rulers
+/others/statusbar/statusbar
+/others/stock/stock
+/others/tictactoe/ttt_test
+/others/window/wheelbarrow
diff --git a/examples/Makefile.am b/examples/Makefile.am
index a7c3d0b..2fa5ded 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,18 +1,614 @@
-example_dirs = book others
+## This file is part of gtkmm-documentation.
 
-SUBDIRS = $(example_dirs)
-EXTRA_DIST = README Makefile.am_fragment
+AUTOMAKE_OPTIONS = subdir-objects
 
-#Web upload:
-include $(top_srcdir)/docs/Makefile_web.am_fragment
+AM_CPPFLAGS = -I$(top_builddir) $(GTHREAD_CFLAGS) $(EXAMPLES_CFLAGS)
+AM_CXXFLAGS = $(EXAMPLES_WXXFLAGS)
+LDADD       = $(EXAMPLES_LIBS)
 
-web_path = $(web_path_gtkmm)examples
+noinst_PROGRAMS =					\
+	book/alignment/example				\
+	book/aspectframe/example			\
+	book/box/example				\
+	book/builder/basic/example			\
+	book/builder/derived/example			\
+	book/buttonbox/example				\
+	book/buttons/button/buttons			\
+	book/buttons/checkbutton/example		\
+	book/buttons/filechooserbutton/example		\
+	book/buttons/radiobutton/radiobuttons		\
+	book/buttons/togglebutton/example		\
+	book/clipboard/ideal/example			\
+	book/clipboard/simple/example			\
+	book/combo/example				\
+	book/combobox/complex/example			\
+	book/combobox/text/example			\
+	book/comboboxentry/complex/example		\
+	book/comboboxentry/text/example			\
+	book/custom/custom_container/example		\
+	book/custom/custom_widget/example		\
+	book/dialogs/aboutdialog/example		\
+	book/dialogs/colorselectiondialog/example	\
+	book/dialogs/filechooserdialog/example		\
+	book/dialogs/fileselection/example		\
+	book/dialogs/fontselectiondialog/example	\
+	book/dialogs/messagedialog/example		\
+	book/dialogs/simple/example			\
+	book/drag_and_drop/drag_and_drop		\
+	book/drawingarea/arcs/drawingareaarcs		\
+	book/drawingarea/clock/cairoclock		\
+	book/drawingarea/curve/drawingareacurve		\
+	book/drawingarea/joins/cairojoins		\
+	book/drawingarea/simple/drawingarea		\
+	book/entry/completion/example			\
+	book/entry/icon/example				\
+	book/entry/progress/example			\
+	book/entry/simple/example			\
+	book/eventbox/example				\
+	book/expander/example				\
+	book/frame/example				\
+	book/giomm/directory_list/example		\
+	book/giomm/getline/getline			\
+	book/giomm/monitor_directory/monitor_directory	\
+	book/giomm/read_file/example			\
+	book/giomm/read_file_async/example		\
+	book/giomm/usage/usage				\
+	book/giomm/volumes/example			\
+	book/giomm/write_file/example			\
+	book/helloworld/helloworld			\
+	book/helloworld2/helloworld2			\
+	book/iconview/example				\
+	book/idle/idle					\
+	book/input/example				\
+	book/label/example				\
+	book/libglademm/derived/example			\
+	book/libglademm/simple/example			\
+	book/menus/main_menu/main_menu			\
+	book/menus/popup/popup				\
+	book/menus_and_toolbars/example			\
+	book/notebook/example				\
+	book/paned/example				\
+	book/printing/advanced/example			\
+	book/printing/simple/example			\
+	book/progressbar/example			\
+	book/range_widgets/example			\
+	book/recent_files/example			\
+	book/scrolledwindow/example			\
+	book/signals/custom/example			\
+	book/socket/plug				\
+	book/socket/socket				\
+	book/spinbutton/example				\
+	book/statusicon/example				\
+	book/table/example				\
+	book/textview/example				\
+	book/timeout/timeout				\
+	book/toolbar/example				\
+	book/tooltips/example				\
+	book/treeview/combo_renderer/example		\
+	book/treeview/drag_and_drop/example		\
+	book/treeview/editable_cells/example		\
+	book/treeview/filter/example			\
+	book/treeview/filter_modify/example		\
+	book/treeview/list/example			\
+	book/treeview/listviewtext/example		\
+	book/treeview/modelsort/example			\
+	book/treeview/popup/example			\
+	book/treeview/tree/example			\
+	book/update_ui/example				\
+	others/arrow/arrow				\
+	others/arrow/direction				\
+	others/base/base				\
+	others/calendar/calendar			\
+	others/cellrenderercustom/cellrenderertoggle	\
+	others/cellrenderercustom/testpopup		\
+	others/dnd/testdnd				\
+	others/exception/exceptiontest			\
+	others/gdk/radar				\
+	others/idle/idle				\
+	others/rulers/rulers				\
+	others/statusbar/statusbar			\
+	others/stock/stock				\
+	others/tictactoe/ttt_test			\
+	others/treemodelcustom/example			\
+	others/window/wheelbarrow
 
-#rsync --cvs-exclude ignores *.o and anything in .cvsignore and some more:
-rsync_options = -vzr --rsh ssh --cvs-exclude --delete-excluded --exclude=.libs --exclude=.deps --exclude=core --exclude=.cvsignore --exclude=a.out --exclude=Makefile --exclude=Makefile.in
+book_alignment_example_SOURCES =		\
+	book/alignment/examplewindow.cc		\
+	book/alignment/examplewindow.h		\
+	book/alignment/main.cc
 
-post-html:
-	rsync $(rsync_options) $(example_dirs) $$USER $(web_host):$(web_path)
+book_aspectframe_example_SOURCES =		\
+	book/aspectframe/examplewindow.cc	\
+	book/aspectframe/examplewindow.h	\
+	book/aspectframe/main.cc
 
-.PHONY: post-html
+book_box_example_SOURCES =			\
+	book/box/examplewindow.cc		\
+	book/box/examplewindow.h		\
+	book/box/main.cc			\
+	book/box/packbox.cc			\
+	book/box/packbox.h
 
+book_builder_basic_example_SOURCES =		\
+	book/builder/basic/main.cc
+
+book_builder_derived_example_SOURCES =		\
+	book/builder/derived/deriveddialog.cc	\
+	book/builder/derived/deriveddialog.h	\
+	book/builder/derived/main.cc
+
+book_buttonbox_example_SOURCES =		\
+	book/buttonbox/examplebuttonbox.cc	\
+	book/buttonbox/examplebuttonbox.h	\
+	book/buttonbox/examplewindow.cc		\
+	book/buttonbox/examplewindow.h		\
+	book/buttonbox/main.cc
+
+book_buttons_button_buttons_SOURCES =		\
+	book/buttons/button/buttons.cc		\
+	book/buttons/button/buttons.h		\
+	book/buttons/button/main.cc
+
+book_buttons_checkbutton_example_SOURCES =		\
+	book/buttons/checkbutton/examplewindow.cc	\
+	book/buttons/checkbutton/examplewindow.h	\
+	book/buttons/checkbutton/main.cc
+
+book_buttons_filechooserbutton_example_SOURCES =	\
+	book/buttons/filechooserbutton/examplewindow.cc	\
+	book/buttons/filechooserbutton/examplewindow.h	\
+	book/buttons/filechooserbutton/main.cc
+
+book_buttons_radiobutton_radiobuttons_SOURCES =		\
+	book/buttons/radiobutton/main.cc		\
+	book/buttons/radiobutton/radiobuttons.cc	\
+	book/buttons/radiobutton/radiobuttons.h
+
+book_buttons_togglebutton_example_SOURCES =		\
+	book/buttons/togglebutton/examplewindow.cc	\
+	book/buttons/togglebutton/examplewindow.h	\
+	book/buttons/togglebutton/main.cc
+
+book_clipboard_ideal_example_SOURCES =		\
+	book/clipboard/ideal/examplewindow.cc	\
+	book/clipboard/ideal/examplewindow.h	\
+	book/clipboard/ideal/main.cc
+
+book_clipboard_simple_example_SOURCES =		\
+	book/clipboard/simple/examplewindow.cc	\
+	book/clipboard/simple/examplewindow.h	\
+	book/clipboard/simple/main.cc
+
+book_combo_example_SOURCES =		\
+	book/combo/examplewindow.cc	\
+	book/combo/examplewindow.h	\
+	book/combo/main.cc
+
+book_combobox_complex_example_SOURCES =		\
+	book/combobox/complex/examplewindow.cc	\
+	book/combobox/complex/examplewindow.h	\
+	book/combobox/complex/main.cc
+
+book_combobox_text_example_SOURCES =		\
+	book/combobox/text/examplewindow.cc	\
+	book/combobox/text/examplewindow.h	\
+	book/combobox/text/main.cc
+
+book_comboboxentry_complex_example_SOURCES =		\
+	book/comboboxentry/complex/examplewindow.cc	\
+	book/comboboxentry/complex/examplewindow.h	\
+	book/comboboxentry/complex/main.cc
+
+book_comboboxentry_text_example_SOURCES =		\
+	book/comboboxentry/text/examplewindow.cc	\
+	book/comboboxentry/text/examplewindow.h		\
+	book/comboboxentry/text/main.cc
+
+book_custom_custom_container_example_SOURCES =		\
+	book/custom/custom_container/examplewindow.cc	\
+	book/custom/custom_container/examplewindow.h	\
+	book/custom/custom_container/main.cc		\
+	book/custom/custom_container/mycontainer.cc	\
+	book/custom/custom_container/mycontainer.h
+
+book_custom_custom_widget_example_SOURCES =		\
+	book/custom/custom_widget/examplewindow.cc	\
+	book/custom/custom_widget/examplewindow.h	\
+	book/custom/custom_widget/main.cc		\
+	book/custom/custom_widget/mywidget.cc		\
+	book/custom/custom_widget/mywidget.h
+
+book_dialogs_aboutdialog_example_SOURCES =		\
+	book/dialogs/aboutdialog/examplewindow.cc	\
+	book/dialogs/aboutdialog/examplewindow.h	\
+	book/dialogs/aboutdialog/main.cc
+
+book_dialogs_colorselectiondialog_example_SOURCES =		\
+	book/dialogs/colorselectiondialog/examplewindow.cc	\
+	book/dialogs/colorselectiondialog/examplewindow.h	\
+	book/dialogs/colorselectiondialog/main.cc
+
+book_dialogs_filechooserdialog_example_SOURCES =	\
+	book/dialogs/filechooserdialog/examplewindow.cc	\
+	book/dialogs/filechooserdialog/examplewindow.h	\
+	book/dialogs/filechooserdialog/main.cc
+
+book_dialogs_fileselection_example_SOURCES =		\
+	book/dialogs/fileselection/examplewindow.cc	\
+	book/dialogs/fileselection/examplewindow.h	\
+	book/dialogs/fileselection/main.cc
+
+book_dialogs_fontselectiondialog_example_SOURCES =		\
+	book/dialogs/fontselectiondialog/examplewindow.cc	\
+	book/dialogs/fontselectiondialog/examplewindow.h	\
+	book/dialogs/fontselectiondialog/main.cc
+
+book_dialogs_messagedialog_example_SOURCES =		\
+	book/dialogs/messagedialog/examplewindow.cc	\
+	book/dialogs/messagedialog/examplewindow.h	\
+	book/dialogs/messagedialog/main.cc
+
+book_dialogs_simple_example_SOURCES =		\
+	book/dialogs/simple/examplewindow.cc	\
+	book/dialogs/simple/examplewindow.h	\
+	book/dialogs/simple/main.cc
+
+book_drag_and_drop_drag_and_drop_SOURCES =	\
+	book/drag_and_drop/dndwindow.cc		\
+	book/drag_and_drop/dndwindow.h		\
+	book/drag_and_drop/main.cc
+
+book_drawingarea_arcs_drawingareaarcs_SOURCES =	\
+	book/drawingarea/arcs/main.cc		\
+	book/drawingarea/arcs/myarea.cc		\
+	book/drawingarea/arcs/myarea.h
+
+book_drawingarea_clock_cairoclock_SOURCES =	\
+	book/drawingarea/clock/clock.cc		\
+	book/drawingarea/clock/clock.h		\
+	book/drawingarea/clock/main.cc
+
+book_drawingarea_curve_drawingareacurve_SOURCES =	\
+	book/drawingarea/curve/main.cc			\
+	book/drawingarea/curve/myarea.cc		\
+	book/drawingarea/curve/myarea.h
+
+book_drawingarea_joins_cairojoins_SOURCES =	\
+	book/drawingarea/joins/main.cc		\
+	book/drawingarea/joins/myarea.cc	\
+	book/drawingarea/joins/myarea.h
+
+book_drawingarea_simple_drawingarea_SOURCES =	\
+	book/drawingarea/simple/main.cc		\
+	book/drawingarea/simple/myarea.cc	\
+	book/drawingarea/simple/myarea.h
+
+book_entry_completion_example_SOURCES =		\
+	book/entry/completion/examplewindow.cc	\
+	book/entry/completion/examplewindow.h	\
+	book/entry/completion/main.cc
+
+book_entry_icon_example_SOURCES =		\
+	book/entry/icon/examplewindow.cc	\
+	book/entry/icon/examplewindow.h		\
+	book/entry/icon/main.cc
+
+book_entry_progress_example_SOURCES =		\
+	book/entry/progress/examplewindow.cc	\
+	book/entry/progress/examplewindow.h	\
+	book/entry/progress/main.cc
+
+book_entry_simple_example_SOURCES =		\
+	book/entry/simple/examplewindow.cc	\
+	book/entry/simple/examplewindow.h	\
+	book/entry/simple/main.cc
+
+book_eventbox_example_SOURCES =		\
+	book/eventbox/examplewindow.cc	\
+	book/eventbox/examplewindow.h	\
+	book/eventbox/main.cc
+
+book_expander_example_SOURCES =		\
+	book/expander/examplewindow.cc	\
+	book/expander/examplewindow.h	\
+	book/expander/main.cc
+
+book_frame_example_SOURCES =		\
+	book/frame/examplewindow.cc	\
+	book/frame/examplewindow.h	\
+	book/frame/main.cc
+
+book_giomm_directory_list_example_SOURCES = \
+	book/giomm/directory_list/main.cc
+
+book_giomm_getline_getline_SOURCES = \
+	book/giomm/getline/getline.cc
+
+book_giomm_monitor_directory_monitor_directory_SOURCES = \
+	book/giomm/monitor_directory/monitor_directory.cc
+
+book_giomm_read_file_example_SOURCES = \
+	book/giomm/read_file/main.cc
+
+book_giomm_read_file_async_example_SOURCES = \
+	book/giomm/read_file_async/main.cc
+
+book_giomm_usage_usage_SOURCES = \
+	book/giomm/usage/usage.cc
+
+book_giomm_volumes_example_SOURCES = \
+	book/giomm/volumes/main.cc
+
+book_giomm_write_file_example_SOURCES = \
+	book/giomm/write_file/main.cc
+
+book_helloworld_helloworld_SOURCES =	\
+	book/helloworld/helloworld.cc	\
+	book/helloworld/helloworld.h	\
+	book/helloworld/main.cc
+
+book_helloworld2_helloworld2_SOURCES =	\
+	book/helloworld2/helloworld.cc	\
+	book/helloworld2/helloworld.h	\
+	book/helloworld2/main.cc
+
+book_iconview_example_SOURCES =		\
+	book/iconview/examplewindow.cc	\
+	book/iconview/examplewindow.h	\
+	book/iconview/main.cc
+
+book_idle_idle_SOURCES =		\
+	book/idle/idleexample.cc	\
+	book/idle/idleexample.h		\
+	book/idle/main.cc
+
+book_input_example_SOURCES = \
+	book/input/main.cc
+
+book_label_example_SOURCES =		\
+	book/label/examplewindow.cc	\
+	book/label/examplewindow.h	\
+	book/label/main.cc
+
+book_libglademm_derived_example_SOURCES =		\
+	book/libglademm/derived/deriveddialog.cc	\
+	book/libglademm/derived/deriveddialog.h		\
+	book/libglademm/derived/main.cc
+
+book_libglademm_simple_example_SOURCES = \
+	book/libglademm/simple/main.cc
+
+book_menus_main_menu_main_menu_SOURCES =	\
+	book/menus/main_menu/examplewindow.cc	\
+	book/menus/main_menu/examplewindow.h	\
+	book/menus/main_menu/main.cc
+
+book_menus_popup_popup_SOURCES =		\
+	book/menus/popup/examplewindow.cc	\
+	book/menus/popup/examplewindow.h	\
+	book/menus/popup/main.cc
+
+book_menus_and_toolbars_example_SOURCES =	\
+	book/menus_and_toolbars/examplewindow.cc\
+	book/menus_and_toolbars/examplewindow.h	\
+	book/menus_and_toolbars/main.cc
+
+book_notebook_example_SOURCES =		\
+	book/notebook/examplewindow.cc	\
+	book/notebook/examplewindow.h	\
+	book/notebook/main.cc
+
+book_paned_example_SOURCES =		\
+	book/paned/examplewindow.cc	\
+	book/paned/examplewindow.h	\
+	book/paned/main.cc		\
+	book/paned/messageslist.cc	\
+	book/paned/messageslist.h	\
+	book/paned/messagetext.cc	\
+	book/paned/messagetext.h
+
+book_printing_advanced_example_SOURCES =		\
+	book/printing/advanced/examplewindow.cc		\
+	book/printing/advanced/examplewindow.h		\
+	book/printing/advanced/main.cc			\
+	book/printing/advanced/previewdialog.cc		\
+	book/printing/advanced/previewdialog.h		\
+	book/printing/advanced/printformoperation.cc	\
+	book/printing/advanced/printformoperation.h
+
+book_printing_simple_example_SOURCES =			\
+	book/printing/simple/examplewindow.cc		\
+	book/printing/simple/examplewindow.h		\
+	book/printing/simple/main.cc			\
+	book/printing/simple/printformoperation.cc	\
+	book/printing/simple/printformoperation.h
+
+book_progressbar_example_SOURCES =		\
+	book/progressbar/examplewindow.cc	\
+	book/progressbar/examplewindow.h	\
+	book/progressbar/main.cc
+
+book_range_widgets_example_SOURCES =		\
+	book/range_widgets/examplewindow.cc	\
+	book/range_widgets/examplewindow.h	\
+	book/range_widgets/labeledoptionmenu.cc	\
+	book/range_widgets/labeledoptionmenu.h	\
+	book/range_widgets/main.cc
+
+book_recent_files_example_SOURCES =		\
+	book/recent_files/examplewindow.cc	\
+	book/recent_files/examplewindow.h	\
+	book/recent_files/main.cc
+
+book_scrolledwindow_example_SOURCES =		\
+	book/scrolledwindow/examplewindow.cc	\
+	book/scrolledwindow/examplewindow.h	\
+	book/scrolledwindow/main.cc
+
+book_signals_custom_example_SOURCES =	\
+	book/signals/custom/client.cc	\
+	book/signals/custom/client.h	\
+	book/signals/custom/main.cc	\
+	book/signals/custom/server.cc	\
+	book/signals/custom/server.h
+
+book_socket_plug_SOURCES = \
+	book/socket/plug.cc
+
+book_socket_socket_SOURCES = \
+	book/socket/socket.cc
+
+book_spinbutton_example_SOURCES =		\
+	book/spinbutton/examplewindow.cc	\
+	book/spinbutton/examplewindow.h		\
+	book/spinbutton/main.cc
+
+book_statusicon_example_SOURCES = \
+	book/statusicon/main.cc
+
+book_table_example_SOURCES =		\
+	book/table/examplewindow.cc	\
+	book/table/examplewindow.h	\
+	book/table/main.cc
+
+book_textview_example_SOURCES =		\
+	book/textview/examplewindow.cc	\
+	book/textview/examplewindow.h	\
+	book/textview/main.cc
+
+book_timeout_timeout_SOURCES =		\
+	book/timeout/main.cc		\
+	book/timeout/timerexample.cc	\
+	book/timeout/timerexample.h
+
+book_toolbar_example_SOURCES =		\
+	book/toolbar/examplewindow.cc	\
+	book/toolbar/examplewindow.h	\
+	book/toolbar/main.cc
+
+book_tooltips_example_SOURCES =		\
+	book/tooltips/examplewindow.cc	\
+	book/tooltips/examplewindow.h	\
+	book/tooltips/main.cc
+
+book_treeview_combo_renderer_example_SOURCES =		\
+	book/treeview/combo_renderer/examplewindow.cc	\
+	book/treeview/combo_renderer/examplewindow.h	\
+	book/treeview/combo_renderer/main.cc
+
+book_treeview_drag_and_drop_example_SOURCES =		\
+	book/treeview/drag_and_drop/examplewindow.cc	\
+	book/treeview/drag_and_drop/examplewindow.h	\
+	book/treeview/drag_and_drop/main.cc		\
+	book/treeview/drag_and_drop/treemodel_dnd.cc	\
+	book/treeview/drag_and_drop/treemodel_dnd.h
+
+book_treeview_editable_cells_example_SOURCES =		\
+	book/treeview/editable_cells/examplewindow.cc	\
+	book/treeview/editable_cells/examplewindow.h	\
+	book/treeview/editable_cells/main.cc
+
+book_treeview_filter_example_SOURCES =		\
+	book/treeview/filter/examplewindow.cc	\
+	book/treeview/filter/examplewindow.h	\
+	book/treeview/filter/main.cc
+
+book_treeview_filter_modify_example_SOURCES =		\
+	book/treeview/filter_modify/examplewindow.cc	\
+	book/treeview/filter_modify/examplewindow.h	\
+	book/treeview/filter_modify/main.cc
+
+book_treeview_list_example_SOURCES =		\
+	book/treeview/list/examplewindow.cc	\
+	book/treeview/list/examplewindow.h	\
+	book/treeview/list/main.cc
+
+book_treeview_listviewtext_example_SOURCES =		\
+	book/treeview/listviewtext/examplewindow.cc	\
+	book/treeview/listviewtext/examplewindow.h	\
+	book/treeview/listviewtext/main.cc
+
+book_treeview_modelsort_example_SOURCES =		\
+	book/treeview/modelsort/examplewindow.cc	\
+	book/treeview/modelsort/examplewindow.h		\
+	book/treeview/modelsort/main.cc
+
+book_treeview_popup_example_SOURCES =			\
+	book/treeview/popup/examplewindow.cc		\
+	book/treeview/popup/examplewindow.h		\
+	book/treeview/popup/main.cc			\
+	book/treeview/popup/treeview_withpopup.cc	\
+	book/treeview/popup/treeview_withpopup.h
+
+book_treeview_tree_example_SOURCES =		\
+	book/treeview/tree/examplewindow.cc	\
+	book/treeview/tree/examplewindow.h	\
+	book/treeview/tree/main.cc
+
+book_update_ui_example_SOURCES =	\
+	book/update_ui/examplewindow.cc	\
+	book/update_ui/examplewindow.h	\
+	book/update_ui/main.cc
+
+others_arrow_arrow_SOURCES = \
+	others/arrow/arrow.cc
+
+others_arrow_direction_SOURCES = \
+	others/arrow/direction.cc
+
+others_base_base_SOURCES = \
+	others/base/base.cc
+
+others_calendar_calendar_SOURCES = \
+	others/calendar/calendar.cc
+
+others_cellrenderercustom_cellrenderertoggle_SOURCES = \
+	others/cellrenderercustom/cellrenderertoggle.cc
+
+others_cellrenderercustom_testpopup_SOURCES =		\
+	others/cellrenderercustom/cellrendererlist.cc	\
+	others/cellrenderercustom/cellrendererlist.h	\
+	others/cellrenderercustom/cellrendererpopup.cc	\
+	others/cellrenderercustom/cellrendererpopup.h	\
+	others/cellrenderercustom/popupentry.cc		\
+	others/cellrenderercustom/popupentry.h		\
+	others/cellrenderercustom/testpopup.cc
+
+others_dnd_testdnd_SOURCES =	\
+	others/dnd/dnd_images.h	\
+	others/dnd/dndwindow.cc	\
+	others/dnd/dndwindow.h	\
+	others/dnd/main.cc
+
+others_exception_exceptiontest_SOURCES = \
+	others/exception/exceptiontest.cc
+
+others_gdk_radar_SOURCES = \
+	others/gdk/radar.cc
+
+others_idle_idle_SOURCES = \
+	others/idle/idle.cc
+
+others_rulers_rulers_SOURCES = \
+	others/rulers/rulers.cc
+
+others_statusbar_statusbar_SOURCES = \
+	others/statusbar/statusbar.cc
+
+others_stock_stock_SOURCES = \
+	others/stock/stock.cc
+
+others_tictactoe_ttt_test_SOURCES =	\
+	others/tictactoe/tictactoe.cc	\
+	others/tictactoe/tictactoe.h	\
+	others/tictactoe/ttt_test.cc
+
+others_treemodelcustom_example_SOURCES =		\
+	others/treemodelcustom/exampletreemodel.cc	\
+	others/treemodelcustom/exampletreemodel.h	\
+	others/treemodelcustom/examplewindow.cc		\
+	others/treemodelcustom/examplewindow.h		\
+	others/treemodelcustom/main.cc
+
+others_window_wheelbarrow_SOURCES = \
+	others/window/wheelbarrow.cc
diff --git a/examples/book/box/examplewindow.h b/examples/book/box/examplewindow.h
index 415a42f..d3981df 100644
--- a/examples/book/box/examplewindow.h
+++ b/examples/book/box/examplewindow.h
@@ -20,7 +20,7 @@
 #define GTKMM_EXAMPLEWINDOW_H
 
 #include <gtkmm.h>
-#include <packbox.h>
+#include "packbox.h"
 
 class ExampleWindow : public Gtk::Window
 {
diff --git a/examples/book/drawingarea/arcs/myarea.cc b/examples/book/drawingarea/arcs/myarea.cc
index dbe8f20..e2fc79f 100644
--- a/examples/book/drawingarea/arcs/myarea.cc
+++ b/examples/book/drawingarea/arcs/myarea.cc
@@ -18,7 +18,7 @@
 
 #include "myarea.h"
 #include <cairomm/context.h>
-#include <math.h>
+#include <cmath>
 
 MyArea::MyArea()
 {
diff --git a/examples/book/drawingarea/clock/clock.cc b/examples/book/drawingarea/clock/clock.cc
index 418870d..b0609d9 100644
--- a/examples/book/drawingarea/clock/clock.cc
+++ b/examples/book/drawingarea/clock/clock.cc
@@ -17,7 +17,7 @@
  */
 
 #include <ctime>
-#include <math.h>
+#include <cmath>
 #include <cairomm/context.h>
 #include "clock.h"
 
diff --git a/examples/book/input/main.cc b/examples/book/input/main.cc
index 0ecf766..539d039 100644
--- a/examples/book/input/main.cc
+++ b/examples/book/input/main.cc
@@ -1,5 +1,5 @@
+#include <build/config.h>
 #include <gtkmm/main.h>
-#include "gtkmmconfig.h" //For HAVE_MKFIFO
 #include <fcntl.h>
 #include <iostream>
 
diff --git a/examples/book/printing/advanced/previewdialog.cc b/examples/book/printing/advanced/previewdialog.cc
index e6fa767..027bbdf 100644
--- a/examples/book/printing/advanced/previewdialog.cc
+++ b/examples/book/printing/advanced/previewdialog.cc
@@ -17,7 +17,7 @@
 #include "previewdialog.h"
 #include "printformoperation.h"
 
-#include <math.h>
+#include <cmath>
 
 PreviewDialog::PreviewDialog(
                PrintFormOperation* pfo,
diff --git a/examples/book/scrolledwindow/examplewindow.cc b/examples/book/scrolledwindow/examplewindow.cc
index 3365cb9..02e6036 100644
--- a/examples/book/scrolledwindow/examplewindow.cc
+++ b/examples/book/scrolledwindow/examplewindow.cc
@@ -17,7 +17,7 @@
  */
 
 #include "examplewindow.h"
-#include <stdio.h> //For sprintf()
+#include <cstdio>
 
 ExampleWindow::ExampleWindow()
 : m_Table(10, 10),
diff --git a/examples/book/spinbutton/examplewindow.cc b/examples/book/spinbutton/examplewindow.cc
index 4eb4416..0e0a4ad 100644
--- a/examples/book/spinbutton/examplewindow.cc
+++ b/examples/book/spinbutton/examplewindow.cc
@@ -18,7 +18,7 @@
 
 #include "examplewindow.h"
 #include <iostream>
-#include <stdio.h>
+#include <cstdio>
 
 ExampleWindow::ExampleWindow()
 :
diff --git a/examples/others/gdk/radar.cc b/examples/others/gdk/radar.cc
index bdb7bcd..636ac80 100644
--- a/examples/others/gdk/radar.cc
+++ b/examples/others/gdk/radar.cc
@@ -32,7 +32,7 @@
 #include <gtkmm/main.h>
 
 #include <cmath>
-#include <math.h> //Needed by the IRIX MipsPro compiler, for sin().
+#include <cmath>
 #include <sstream>
 
 #include <vector>
diff --git a/examples/others/stock/stock.cc b/examples/others/stock/stock.cc
index b715444..4b09db2 100644
--- a/examples/others/stock/stock.cc
+++ b/examples/others/stock/stock.cc
@@ -9,7 +9,7 @@
 #include <gtkmm/toolbutton.h>
 #include <gtkmm/separatortoolitem.h>
 
-#include <stdio.h>
+#include <cstdio>
 //#include <glib.h>
 //#include <gdk/gdk.h>
 //#include <gtk/gtk.h>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]