Index: Samples/Compositor/Makefile.in
===================================================================
--- Samples/Compositor/Makefile.in	(revision 5)
+++ Samples/Compositor/Makefile.in	(revision 6)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,13 +14,9 @@
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -51,8 +47,11 @@
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
@@ -60,6 +59,4 @@
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -68,12 +65,4 @@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_CGPLUGIN_FALSE = @BUILD_CGPLUGIN_FALSE@
-BUILD_CGPLUGIN_TRUE = @BUILD_CGPLUGIN_TRUE@
-BUILD_DX9RENDERSYSTEM_FALSE = @BUILD_DX9RENDERSYSTEM_FALSE@
-BUILD_DX9RENDERSYSTEM_TRUE = @BUILD_DX9RENDERSYSTEM_TRUE@
-BUILD_EXRPLUGIN_FALSE = @BUILD_EXRPLUGIN_FALSE@
-BUILD_EXRPLUGIN_TRUE = @BUILD_EXRPLUGIN_TRUE@
-BUILD_UNIT_TESTS_FALSE = @BUILD_UNIT_TESTS_FALSE@
-BUILD_UNIT_TESTS_TRUE = @BUILD_UNIT_TESTS_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -111,6 +100,5 @@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
-HAVE_CEGUI_FALSE = @HAVE_CEGUI_FALSE@
-HAVE_CEGUI_TRUE = @HAVE_CEGUI_TRUE@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -127,18 +115,9 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
-OGRE_BUILDING_DEMOS_FALSE = @OGRE_BUILDING_DEMOS_FALSE@
-OGRE_BUILDING_DEMOS_TRUE = @OGRE_BUILDING_DEMOS_TRUE@
-OGRE_BUILD_SSE_FALSE = @OGRE_BUILD_SSE_FALSE@
-OGRE_BUILD_SSE_TRUE = @OGRE_BUILD_SSE_TRUE@
 OGRE_CFLAGS = @OGRE_CFLAGS@
 OGRE_GLSUPPORT = @OGRE_GLSUPPORT@
 OGRE_GUI = @OGRE_GUI@
-OGRE_LINUX_FALSE = @OGRE_LINUX_FALSE@
-OGRE_LINUX_TRUE = @OGRE_LINUX_TRUE@
-OGRE_NT_FALSE = @OGRE_NT_FALSE@
-OGRE_NT_TRUE = @OGRE_NT_TRUE@
-OGRE_OSX_FALSE = @OGRE_OSX_FALSE@
-OGRE_OSX_TRUE = @OGRE_OSX_TRUE@
 OGRE_PLATFORM = @OGRE_PLATFORM@
 OGRE_THREAD_LIBS = @OGRE_THREAD_LIBS@
@@ -160,6 +139,5 @@
 RANLIB = @RANLIB@
 RC = @RC@
-SAME_PLATFORM_AND_GUI_FALSE = @SAME_PLATFORM_AND_GUI_FALSE@
-SAME_PLATFORM_AND_GUI_TRUE = @SAME_PLATFORM_AND_GUI_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHARED_FLAGS = @SHARED_FLAGS@
@@ -168,8 +146,4 @@
 STLPORT_LIBS = @STLPORT_LIBS@
 STRIP = @STRIP@
-USE_DEVIL_FALSE = @USE_DEVIL_FALSE@
-USE_DEVIL_TRUE = @USE_DEVIL_TRUE@
-USE_FREEIMAGE_FALSE = @USE_FREEIMAGE_FALSE@
-USE_FREEIMAGE_TRUE = @USE_FREEIMAGE_TRUE@
 VERSION = @VERSION@
 XMKMF = @XMKMF@
@@ -178,12 +152,11 @@
 ZZIPLIB_CFLAGS = @ZZIPLIB_CFLAGS@
 ZZIPLIB_LIBS = @ZZIPLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -197,4 +170,5 @@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -225,4 +199,5 @@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
@@ -231,4 +206,6 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 SUBDIRS = src include
 all: all-recursive
@@ -270,8 +247,4 @@
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
@@ -306,6 +279,5 @@
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
@@ -408,20 +380,19 @@
 
 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; \
+	@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; \
-	  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 \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
@@ -437,5 +408,5 @@
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
@@ -445,4 +416,6 @@
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
@@ -484,6 +457,5 @@
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
@@ -499,9 +471,17 @@
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
+
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
 
 installcheck-am:
@@ -523,20 +503,22 @@
 ps-am:
 
-uninstall-am: uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	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 installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: Samples/Compositor/include/Makefile.in
===================================================================
--- Samples/Compositor/include/Makefile.in	(revision 5)
+++ Samples/Compositor/include/Makefile.in	(revision 6)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,13 +15,9 @@
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -56,6 +52,4 @@
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -64,12 +58,4 @@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_CGPLUGIN_FALSE = @BUILD_CGPLUGIN_FALSE@
-BUILD_CGPLUGIN_TRUE = @BUILD_CGPLUGIN_TRUE@
-BUILD_DX9RENDERSYSTEM_FALSE = @BUILD_DX9RENDERSYSTEM_FALSE@
-BUILD_DX9RENDERSYSTEM_TRUE = @BUILD_DX9RENDERSYSTEM_TRUE@
-BUILD_EXRPLUGIN_FALSE = @BUILD_EXRPLUGIN_FALSE@
-BUILD_EXRPLUGIN_TRUE = @BUILD_EXRPLUGIN_TRUE@
-BUILD_UNIT_TESTS_FALSE = @BUILD_UNIT_TESTS_FALSE@
-BUILD_UNIT_TESTS_TRUE = @BUILD_UNIT_TESTS_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -107,6 +93,5 @@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
-HAVE_CEGUI_FALSE = @HAVE_CEGUI_FALSE@
-HAVE_CEGUI_TRUE = @HAVE_CEGUI_TRUE@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -123,18 +108,9 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
-OGRE_BUILDING_DEMOS_FALSE = @OGRE_BUILDING_DEMOS_FALSE@
-OGRE_BUILDING_DEMOS_TRUE = @OGRE_BUILDING_DEMOS_TRUE@
-OGRE_BUILD_SSE_FALSE = @OGRE_BUILD_SSE_FALSE@
-OGRE_BUILD_SSE_TRUE = @OGRE_BUILD_SSE_TRUE@
 OGRE_CFLAGS = @OGRE_CFLAGS@
 OGRE_GLSUPPORT = @OGRE_GLSUPPORT@
 OGRE_GUI = @OGRE_GUI@
-OGRE_LINUX_FALSE = @OGRE_LINUX_FALSE@
-OGRE_LINUX_TRUE = @OGRE_LINUX_TRUE@
-OGRE_NT_FALSE = @OGRE_NT_FALSE@
-OGRE_NT_TRUE = @OGRE_NT_TRUE@
-OGRE_OSX_FALSE = @OGRE_OSX_FALSE@
-OGRE_OSX_TRUE = @OGRE_OSX_TRUE@
 OGRE_PLATFORM = @OGRE_PLATFORM@
 OGRE_THREAD_LIBS = @OGRE_THREAD_LIBS@
@@ -156,6 +132,5 @@
 RANLIB = @RANLIB@
 RC = @RC@
-SAME_PLATFORM_AND_GUI_FALSE = @SAME_PLATFORM_AND_GUI_FALSE@
-SAME_PLATFORM_AND_GUI_TRUE = @SAME_PLATFORM_AND_GUI_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHARED_FLAGS = @SHARED_FLAGS@
@@ -164,8 +139,4 @@
 STLPORT_LIBS = @STLPORT_LIBS@
 STRIP = @STRIP@
-USE_DEVIL_FALSE = @USE_DEVIL_FALSE@
-USE_DEVIL_TRUE = @USE_DEVIL_TRUE@
-USE_FREEIMAGE_FALSE = @USE_FREEIMAGE_FALSE@
-USE_FREEIMAGE_TRUE = @USE_FREEIMAGE_TRUE@
 VERSION = @VERSION@
 XMKMF = @XMKMF@
@@ -174,12 +145,11 @@
 ZZIPLIB_CFLAGS = @ZZIPLIB_CFLAGS@
 ZZIPLIB_LIBS = @ZZIPLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -193,4 +163,5 @@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -221,4 +192,5 @@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
@@ -227,4 +199,6 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 noinst_HEADERS = Compositor.h CompositorDemo_FrameListener.h ItemSelectorViewManager.h
 all: all-am
@@ -266,8 +240,4 @@
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -320,20 +290,19 @@
 
 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; \
+	@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; \
-	  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 \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
@@ -380,6 +349,5 @@
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-am
@@ -395,9 +363,17 @@
 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:
@@ -419,5 +395,7 @@
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
@@ -425,10 +403,12 @@
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	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 \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am
+	uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: Samples/Compositor/src/Makefile.in
===================================================================
--- Samples/Compositor/src/Makefile.in	(revision 5)
+++ Samples/Compositor/src/Makefile.in	(revision 6)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,13 +15,9 @@
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -58,15 +54,19 @@
 am__DEPENDENCIES_1 =
 Compositor_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/OgreMain/include
+Compositor_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(Compositor_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/OgreMain/include@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(Compositor_SOURCES)
 DIST_SOURCES = $(Compositor_SOURCES)
@@ -75,6 +75,4 @@
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -83,12 +81,4 @@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_CGPLUGIN_FALSE = @BUILD_CGPLUGIN_FALSE@
-BUILD_CGPLUGIN_TRUE = @BUILD_CGPLUGIN_TRUE@
-BUILD_DX9RENDERSYSTEM_FALSE = @BUILD_DX9RENDERSYSTEM_FALSE@
-BUILD_DX9RENDERSYSTEM_TRUE = @BUILD_DX9RENDERSYSTEM_TRUE@
-BUILD_EXRPLUGIN_FALSE = @BUILD_EXRPLUGIN_FALSE@
-BUILD_EXRPLUGIN_TRUE = @BUILD_EXRPLUGIN_TRUE@
-BUILD_UNIT_TESTS_FALSE = @BUILD_UNIT_TESTS_FALSE@
-BUILD_UNIT_TESTS_TRUE = @BUILD_UNIT_TESTS_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -126,6 +116,5 @@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
-HAVE_CEGUI_FALSE = @HAVE_CEGUI_FALSE@
-HAVE_CEGUI_TRUE = @HAVE_CEGUI_TRUE@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -142,18 +131,9 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
-OGRE_BUILDING_DEMOS_FALSE = @OGRE_BUILDING_DEMOS_FALSE@
-OGRE_BUILDING_DEMOS_TRUE = @OGRE_BUILDING_DEMOS_TRUE@
-OGRE_BUILD_SSE_FALSE = @OGRE_BUILD_SSE_FALSE@
-OGRE_BUILD_SSE_TRUE = @OGRE_BUILD_SSE_TRUE@
 OGRE_CFLAGS = @OGRE_CFLAGS@
 OGRE_GLSUPPORT = @OGRE_GLSUPPORT@
 OGRE_GUI = @OGRE_GUI@
-OGRE_LINUX_FALSE = @OGRE_LINUX_FALSE@
-OGRE_LINUX_TRUE = @OGRE_LINUX_TRUE@
-OGRE_NT_FALSE = @OGRE_NT_FALSE@
-OGRE_NT_TRUE = @OGRE_NT_TRUE@
-OGRE_OSX_FALSE = @OGRE_OSX_FALSE@
-OGRE_OSX_TRUE = @OGRE_OSX_TRUE@
 OGRE_PLATFORM = @OGRE_PLATFORM@
 OGRE_THREAD_LIBS = @OGRE_THREAD_LIBS@
@@ -175,6 +155,5 @@
 RANLIB = @RANLIB@
 RC = @RC@
-SAME_PLATFORM_AND_GUI_FALSE = @SAME_PLATFORM_AND_GUI_FALSE@
-SAME_PLATFORM_AND_GUI_TRUE = @SAME_PLATFORM_AND_GUI_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHARED_FLAGS = @SHARED_FLAGS@
@@ -183,8 +162,4 @@
 STLPORT_LIBS = @STLPORT_LIBS@
 STRIP = @STRIP@
-USE_DEVIL_FALSE = @USE_DEVIL_FALSE@
-USE_DEVIL_TRUE = @USE_DEVIL_TRUE@
-USE_FREEIMAGE_FALSE = @USE_FREEIMAGE_FALSE@
-USE_FREEIMAGE_TRUE = @USE_FREEIMAGE_TRUE@
 VERSION = @VERSION@
 XMKMF = @XMKMF@
@@ -193,12 +168,11 @@
 ZZIPLIB_CFLAGS = @ZZIPLIB_CFLAGS@
 ZZIPLIB_LIBS = @ZZIPLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -212,4 +186,5 @@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -240,4 +215,5 @@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
@@ -246,4 +222,6 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 INCLUDES = $(STLPORT_CFLAGS) -I$(top_srcdir)/Samples/Compositor/include -I$(top_srcdir)/OgreMain/include -I$(top_srcdir)/Samples/Common/include -I$(top_srcdir)/Samples/Common/CEGUIRenderer/include @CEGUI_CFLAGS@ $(OIS_CFLAGS)
 Compositor_SOURCES = Compositor.cpp CompositorDemo_FrameListener.cpp ItemSelectorViewManager.cpp
@@ -285,5 +263,5 @@
 install-ogreexecPROGRAMS: $(ogreexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(ogreexecdir)" || $(mkdir_p) "$(DESTDIR)$(ogreexecdir)"
+	test -z "$(ogreexecdir)" || $(MKDIR_P) "$(DESTDIR)$(ogreexecdir)"
 	@list='$(ogreexec_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
@@ -313,5 +291,5 @@
 Compositor$(EXEEXT): $(Compositor_OBJECTS) $(Compositor_DEPENDENCIES) 
 	@rm -f Compositor$(EXEEXT)
-	$(CXXLINK) $(Compositor_LDFLAGS) $(Compositor_OBJECTS) $(Compositor_LDADD) $(LIBS)
+	$(Compositor_LINK) $(Compositor_OBJECTS) $(Compositor_LDADD) $(LIBS)
 
 mostlyclean-compile:
@@ -326,6 +304,6 @@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -333,6 +311,6 @@
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -340,6 +318,6 @@
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -351,8 +329,4 @@
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -405,20 +379,19 @@
 
 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; \
+	@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; \
-	  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 \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
@@ -436,5 +409,5 @@
 installdirs:
 	for dir in "$(DESTDIR)$(ogreexecdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -471,5 +444,5 @@
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
@@ -485,9 +458,17 @@
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-ogreexecPROGRAMS
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
 
 installcheck-am:
@@ -511,5 +492,7 @@
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-ogreexecPROGRAMS
+uninstall-am: uninstall-ogreexecPROGRAMS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
@@ -517,12 +500,13 @@
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-ogreexecPROGRAMS install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-ogreexecPROGRAMS
+	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-ogreexecPROGRAMS install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-ogreexecPROGRAMS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
