Index: Tests/src/Makefile.in
===================================================================
--- Tests/src/Makefile.in	(revision 5)
+++ Tests/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,
@@ -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
@@ -37,4 +33,5 @@
 host_triplet = @host@
 target_triplet = @target@
+TESTS = TestSuite$(EXEEXT)
 check_PROGRAMS = TestSuite$(EXEEXT)
 subdir = Tests/src
@@ -54,15 +51,19 @@
 TestSuite_OBJECTS = $(am_TestSuite_OBJECTS)
 TestSuite_DEPENDENCIES =
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/OgreMain/include
+TestSuite_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(TestSuite_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 = $(TestSuite_SOURCES)
 DIST_SOURCES = $(TestSuite_SOURCES)
@@ -71,6 +72,4 @@
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -79,12 +78,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@
@@ -122,6 +113,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@
@@ -138,18 +128,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@
@@ -171,6 +152,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@
@@ -179,8 +159,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@
@@ -189,12 +165,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@
@@ -208,4 +183,5 @@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -236,4 +212,5 @@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
@@ -242,6 +219,7 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 INCLUDES = -I$(top_srcdir)/OgreMain/include -I$(top_srcdir)/Tests/OgreMain/include $(CPPUNIT_CFLAGS)
-TESTS = TestSuite
 TestSuite_SOURCES = main.cpp \
                     ../OgreMain/src/EdgeBuilderTests.cpp \
@@ -297,5 +275,5 @@
 TestSuite$(EXEEXT): $(TestSuite_OBJECTS) $(TestSuite_DEPENDENCIES) 
 	@rm -f TestSuite$(EXEEXT)
-	$(CXXLINK) $(TestSuite_LDFLAGS) $(TestSuite_OBJECTS) $(TestSuite_LDADD) $(LIBS)
+	$(TestSuite_LINK) $(TestSuite_OBJECTS) $(TestSuite_LDADD) $(LIBS)
 
 mostlyclean-compile:
@@ -315,6 +293,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@
@@ -322,6 +300,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@
@@ -329,6 +307,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@
@@ -336,6 +314,6 @@
 
 EdgeBuilderTests.o: ../OgreMain/src/EdgeBuilderTests.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT EdgeBuilderTests.o -MD -MP -MF "$(DEPDIR)/EdgeBuilderTests.Tpo" -c -o EdgeBuilderTests.o `test -f '../OgreMain/src/EdgeBuilderTests.cpp' || echo '$(srcdir)/'`../OgreMain/src/EdgeBuilderTests.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/EdgeBuilderTests.Tpo" "$(DEPDIR)/EdgeBuilderTests.Po"; else rm -f "$(DEPDIR)/EdgeBuilderTests.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT EdgeBuilderTests.o -MD -MP -MF $(DEPDIR)/EdgeBuilderTests.Tpo -c -o EdgeBuilderTests.o `test -f '../OgreMain/src/EdgeBuilderTests.cpp' || echo '$(srcdir)/'`../OgreMain/src/EdgeBuilderTests.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/EdgeBuilderTests.Tpo $(DEPDIR)/EdgeBuilderTests.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../OgreMain/src/EdgeBuilderTests.cpp' object='EdgeBuilderTests.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -343,6 +321,6 @@
 
 EdgeBuilderTests.obj: ../OgreMain/src/EdgeBuilderTests.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT EdgeBuilderTests.obj -MD -MP -MF "$(DEPDIR)/EdgeBuilderTests.Tpo" -c -o EdgeBuilderTests.obj `if test -f '../OgreMain/src/EdgeBuilderTests.cpp'; then $(CYGPATH_W) '../OgreMain/src/EdgeBuilderTests.cpp'; else $(CYGPATH_W) '$(srcdir)/../OgreMain/src/EdgeBuilderTests.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/EdgeBuilderTests.Tpo" "$(DEPDIR)/EdgeBuilderTests.Po"; else rm -f "$(DEPDIR)/EdgeBuilderTests.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT EdgeBuilderTests.obj -MD -MP -MF $(DEPDIR)/EdgeBuilderTests.Tpo -c -o EdgeBuilderTests.obj `if test -f '../OgreMain/src/EdgeBuilderTests.cpp'; then $(CYGPATH_W) '../OgreMain/src/EdgeBuilderTests.cpp'; else $(CYGPATH_W) '$(srcdir)/../OgreMain/src/EdgeBuilderTests.cpp'; fi`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/EdgeBuilderTests.Tpo $(DEPDIR)/EdgeBuilderTests.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../OgreMain/src/EdgeBuilderTests.cpp' object='EdgeBuilderTests.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -350,6 +328,6 @@
 
 FileSystemArchiveTests.o: ../OgreMain/src/FileSystemArchiveTests.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FileSystemArchiveTests.o -MD -MP -MF "$(DEPDIR)/FileSystemArchiveTests.Tpo" -c -o FileSystemArchiveTests.o `test -f '../OgreMain/src/FileSystemArchiveTests.cpp' || echo '$(srcdir)/'`../OgreMain/src/FileSystemArchiveTests.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/FileSystemArchiveTests.Tpo" "$(DEPDIR)/FileSystemArchiveTests.Po"; else rm -f "$(DEPDIR)/FileSystemArchiveTests.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FileSystemArchiveTests.o -MD -MP -MF $(DEPDIR)/FileSystemArchiveTests.Tpo -c -o FileSystemArchiveTests.o `test -f '../OgreMain/src/FileSystemArchiveTests.cpp' || echo '$(srcdir)/'`../OgreMain/src/FileSystemArchiveTests.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/FileSystemArchiveTests.Tpo $(DEPDIR)/FileSystemArchiveTests.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../OgreMain/src/FileSystemArchiveTests.cpp' object='FileSystemArchiveTests.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -357,6 +335,6 @@
 
 FileSystemArchiveTests.obj: ../OgreMain/src/FileSystemArchiveTests.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FileSystemArchiveTests.obj -MD -MP -MF "$(DEPDIR)/FileSystemArchiveTests.Tpo" -c -o FileSystemArchiveTests.obj `if test -f '../OgreMain/src/FileSystemArchiveTests.cpp'; then $(CYGPATH_W) '../OgreMain/src/FileSystemArchiveTests.cpp'; else $(CYGPATH_W) '$(srcdir)/../OgreMain/src/FileSystemArchiveTests.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/FileSystemArchiveTests.Tpo" "$(DEPDIR)/FileSystemArchiveTests.Po"; else rm -f "$(DEPDIR)/FileSystemArchiveTests.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FileSystemArchiveTests.obj -MD -MP -MF $(DEPDIR)/FileSystemArchiveTests.Tpo -c -o FileSystemArchiveTests.obj `if test -f '../OgreMain/src/FileSystemArchiveTests.cpp'; then $(CYGPATH_W) '../OgreMain/src/FileSystemArchiveTests.cpp'; else $(CYGPATH_W) '$(srcdir)/../OgreMain/src/FileSystemArchiveTests.cpp'; fi`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/FileSystemArchiveTests.Tpo $(DEPDIR)/FileSystemArchiveTests.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../OgreMain/src/FileSystemArchiveTests.cpp' object='FileSystemArchiveTests.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -364,6 +342,6 @@
 
 StringTests.o: ../OgreMain/src/StringTests.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT StringTests.o -MD -MP -MF "$(DEPDIR)/StringTests.Tpo" -c -o StringTests.o `test -f '../OgreMain/src/StringTests.cpp' || echo '$(srcdir)/'`../OgreMain/src/StringTests.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/StringTests.Tpo" "$(DEPDIR)/StringTests.Po"; else rm -f "$(DEPDIR)/StringTests.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT StringTests.o -MD -MP -MF $(DEPDIR)/StringTests.Tpo -c -o StringTests.o `test -f '../OgreMain/src/StringTests.cpp' || echo '$(srcdir)/'`../OgreMain/src/StringTests.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/StringTests.Tpo $(DEPDIR)/StringTests.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../OgreMain/src/StringTests.cpp' object='StringTests.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -371,6 +349,6 @@
 
 StringTests.obj: ../OgreMain/src/StringTests.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT StringTests.obj -MD -MP -MF "$(DEPDIR)/StringTests.Tpo" -c -o StringTests.obj `if test -f '../OgreMain/src/StringTests.cpp'; then $(CYGPATH_W) '../OgreMain/src/StringTests.cpp'; else $(CYGPATH_W) '$(srcdir)/../OgreMain/src/StringTests.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/StringTests.Tpo" "$(DEPDIR)/StringTests.Po"; else rm -f "$(DEPDIR)/StringTests.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT StringTests.obj -MD -MP -MF $(DEPDIR)/StringTests.Tpo -c -o StringTests.obj `if test -f '../OgreMain/src/StringTests.cpp'; then $(CYGPATH_W) '../OgreMain/src/StringTests.cpp'; else $(CYGPATH_W) '$(srcdir)/../OgreMain/src/StringTests.cpp'; fi`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/StringTests.Tpo $(DEPDIR)/StringTests.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../OgreMain/src/StringTests.cpp' object='StringTests.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -378,6 +356,6 @@
 
 ZipArchiveTests.o: ../OgreMain/src/ZipArchiveTests.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ZipArchiveTests.o -MD -MP -MF "$(DEPDIR)/ZipArchiveTests.Tpo" -c -o ZipArchiveTests.o `test -f '../OgreMain/src/ZipArchiveTests.cpp' || echo '$(srcdir)/'`../OgreMain/src/ZipArchiveTests.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ZipArchiveTests.Tpo" "$(DEPDIR)/ZipArchiveTests.Po"; else rm -f "$(DEPDIR)/ZipArchiveTests.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ZipArchiveTests.o -MD -MP -MF $(DEPDIR)/ZipArchiveTests.Tpo -c -o ZipArchiveTests.o `test -f '../OgreMain/src/ZipArchiveTests.cpp' || echo '$(srcdir)/'`../OgreMain/src/ZipArchiveTests.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/ZipArchiveTests.Tpo $(DEPDIR)/ZipArchiveTests.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../OgreMain/src/ZipArchiveTests.cpp' object='ZipArchiveTests.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -385,6 +363,6 @@
 
 ZipArchiveTests.obj: ../OgreMain/src/ZipArchiveTests.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ZipArchiveTests.obj -MD -MP -MF "$(DEPDIR)/ZipArchiveTests.Tpo" -c -o ZipArchiveTests.obj `if test -f '../OgreMain/src/ZipArchiveTests.cpp'; then $(CYGPATH_W) '../OgreMain/src/ZipArchiveTests.cpp'; else $(CYGPATH_W) '$(srcdir)/../OgreMain/src/ZipArchiveTests.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ZipArchiveTests.Tpo" "$(DEPDIR)/ZipArchiveTests.Po"; else rm -f "$(DEPDIR)/ZipArchiveTests.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ZipArchiveTests.obj -MD -MP -MF $(DEPDIR)/ZipArchiveTests.Tpo -c -o ZipArchiveTests.obj `if test -f '../OgreMain/src/ZipArchiveTests.cpp'; then $(CYGPATH_W) '../OgreMain/src/ZipArchiveTests.cpp'; else $(CYGPATH_W) '$(srcdir)/../OgreMain/src/ZipArchiveTests.cpp'; fi`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/ZipArchiveTests.Tpo $(DEPDIR)/ZipArchiveTests.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../OgreMain/src/ZipArchiveTests.cpp' object='ZipArchiveTests.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -392,6 +370,6 @@
 
 BitwiseTests.o: ../OgreMain/src/BitwiseTests.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT BitwiseTests.o -MD -MP -MF "$(DEPDIR)/BitwiseTests.Tpo" -c -o BitwiseTests.o `test -f '../OgreMain/src/BitwiseTests.cpp' || echo '$(srcdir)/'`../OgreMain/src/BitwiseTests.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/BitwiseTests.Tpo" "$(DEPDIR)/BitwiseTests.Po"; else rm -f "$(DEPDIR)/BitwiseTests.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT BitwiseTests.o -MD -MP -MF $(DEPDIR)/BitwiseTests.Tpo -c -o BitwiseTests.o `test -f '../OgreMain/src/BitwiseTests.cpp' || echo '$(srcdir)/'`../OgreMain/src/BitwiseTests.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/BitwiseTests.Tpo $(DEPDIR)/BitwiseTests.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../OgreMain/src/BitwiseTests.cpp' object='BitwiseTests.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -399,6 +377,6 @@
 
 BitwiseTests.obj: ../OgreMain/src/BitwiseTests.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT BitwiseTests.obj -MD -MP -MF "$(DEPDIR)/BitwiseTests.Tpo" -c -o BitwiseTests.obj `if test -f '../OgreMain/src/BitwiseTests.cpp'; then $(CYGPATH_W) '../OgreMain/src/BitwiseTests.cpp'; else $(CYGPATH_W) '$(srcdir)/../OgreMain/src/BitwiseTests.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/BitwiseTests.Tpo" "$(DEPDIR)/BitwiseTests.Po"; else rm -f "$(DEPDIR)/BitwiseTests.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT BitwiseTests.obj -MD -MP -MF $(DEPDIR)/BitwiseTests.Tpo -c -o BitwiseTests.obj `if test -f '../OgreMain/src/BitwiseTests.cpp'; then $(CYGPATH_W) '../OgreMain/src/BitwiseTests.cpp'; else $(CYGPATH_W) '$(srcdir)/../OgreMain/src/BitwiseTests.cpp'; fi`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/BitwiseTests.Tpo $(DEPDIR)/BitwiseTests.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../OgreMain/src/BitwiseTests.cpp' object='BitwiseTests.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -406,6 +384,6 @@
 
 PixelFormatTests.o: ../OgreMain/src/PixelFormatTests.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PixelFormatTests.o -MD -MP -MF "$(DEPDIR)/PixelFormatTests.Tpo" -c -o PixelFormatTests.o `test -f '../OgreMain/src/PixelFormatTests.cpp' || echo '$(srcdir)/'`../OgreMain/src/PixelFormatTests.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/PixelFormatTests.Tpo" "$(DEPDIR)/PixelFormatTests.Po"; else rm -f "$(DEPDIR)/PixelFormatTests.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PixelFormatTests.o -MD -MP -MF $(DEPDIR)/PixelFormatTests.Tpo -c -o PixelFormatTests.o `test -f '../OgreMain/src/PixelFormatTests.cpp' || echo '$(srcdir)/'`../OgreMain/src/PixelFormatTests.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/PixelFormatTests.Tpo $(DEPDIR)/PixelFormatTests.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../OgreMain/src/PixelFormatTests.cpp' object='PixelFormatTests.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -413,6 +391,6 @@
 
 PixelFormatTests.obj: ../OgreMain/src/PixelFormatTests.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PixelFormatTests.obj -MD -MP -MF "$(DEPDIR)/PixelFormatTests.Tpo" -c -o PixelFormatTests.obj `if test -f '../OgreMain/src/PixelFormatTests.cpp'; then $(CYGPATH_W) '../OgreMain/src/PixelFormatTests.cpp'; else $(CYGPATH_W) '$(srcdir)/../OgreMain/src/PixelFormatTests.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/PixelFormatTests.Tpo" "$(DEPDIR)/PixelFormatTests.Po"; else rm -f "$(DEPDIR)/PixelFormatTests.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PixelFormatTests.obj -MD -MP -MF $(DEPDIR)/PixelFormatTests.Tpo -c -o PixelFormatTests.obj `if test -f '../OgreMain/src/PixelFormatTests.cpp'; then $(CYGPATH_W) '../OgreMain/src/PixelFormatTests.cpp'; else $(CYGPATH_W) '$(srcdir)/../OgreMain/src/PixelFormatTests.cpp'; fi`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/PixelFormatTests.Tpo $(DEPDIR)/PixelFormatTests.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../OgreMain/src/PixelFormatTests.cpp' object='PixelFormatTests.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -420,6 +398,6 @@
 
 RadixSort.o: ../OgreMain/src/RadixSort.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT RadixSort.o -MD -MP -MF "$(DEPDIR)/RadixSort.Tpo" -c -o RadixSort.o `test -f '../OgreMain/src/RadixSort.cpp' || echo '$(srcdir)/'`../OgreMain/src/RadixSort.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/RadixSort.Tpo" "$(DEPDIR)/RadixSort.Po"; else rm -f "$(DEPDIR)/RadixSort.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT RadixSort.o -MD -MP -MF $(DEPDIR)/RadixSort.Tpo -c -o RadixSort.o `test -f '../OgreMain/src/RadixSort.cpp' || echo '$(srcdir)/'`../OgreMain/src/RadixSort.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/RadixSort.Tpo $(DEPDIR)/RadixSort.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../OgreMain/src/RadixSort.cpp' object='RadixSort.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -427,6 +405,6 @@
 
 RadixSort.obj: ../OgreMain/src/RadixSort.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT RadixSort.obj -MD -MP -MF "$(DEPDIR)/RadixSort.Tpo" -c -o RadixSort.obj `if test -f '../OgreMain/src/RadixSort.cpp'; then $(CYGPATH_W) '../OgreMain/src/RadixSort.cpp'; else $(CYGPATH_W) '$(srcdir)/../OgreMain/src/RadixSort.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/RadixSort.Tpo" "$(DEPDIR)/RadixSort.Po"; else rm -f "$(DEPDIR)/RadixSort.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT RadixSort.obj -MD -MP -MF $(DEPDIR)/RadixSort.Tpo -c -o RadixSort.obj `if test -f '../OgreMain/src/RadixSort.cpp'; then $(CYGPATH_W) '../OgreMain/src/RadixSort.cpp'; else $(CYGPATH_W) '$(srcdir)/../OgreMain/src/RadixSort.cpp'; fi`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/RadixSort.Tpo $(DEPDIR)/RadixSort.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../OgreMain/src/RadixSort.cpp' object='RadixSort.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -438,8 +416,4 @@
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -492,7 +466,7 @@
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
 	srcdir=$(srcdir); export srcdir; \
-	list='$(TESTS)'; \
+	list=' $(TESTS) '; \
 	if test -n "$$list"; then \
 	  for tst in $$list; do \
@@ -503,5 +477,5 @@
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *$$ws$$tst$$ws*) \
 		xpass=`expr $$xpass + 1`; \
 		failed=`expr $$failed + 1`; \
@@ -515,5 +489,5 @@
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *$$ws$$tst$$ws*) \
 		xfail=`expr $$xfail + 1`; \
 		echo "XFAIL: $$tst"; \
@@ -565,20 +539,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; \
@@ -630,5 +603,5 @@
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
@@ -644,9 +617,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:
@@ -670,5 +651,7 @@
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
@@ -677,10 +660,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-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am
+	tags uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
