diff --git a/CppUTest.dsp b/CppUTest.dsp
deleted file mode 100644
index ddfaadefe..000000000
--- a/CppUTest.dsp
+++ /dev/null
@@ -1,253 +0,0 @@
-# Microsoft Developer Studio Project File - Name="CppUTest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=CppUTest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "CppUTest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "CppUTest.mak" CFG="CppUTest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "CppUTest - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "CppUTest - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "CppUTest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "CppUTest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\include\Platforms\VisualCpp" /D "_LIB" /D "WIN32" /D "_DEBUG" /D "_MBCS" /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"lib\CppUTest.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PreLink_Cmds=del lib\vc6\CppUTest.lib	del lib\CppUTest.lib
-PostBuild_Cmds=copy lib\CppUTest.lib lib\vc6\CppUTest.lib	copy Debug\vc60.pdb lib\vc6\vc60.pdb
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "CppUTest - Win32 Release"
-# Name "CppUTest - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\src\CppUTest\CommandLineArguments.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\CppUTest\CommandLineTestRunner.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\CppUTest\JUnitTestOutput.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\CppUTest\MemoryLeakDetector.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\CppUTest\MemoryLeakWarningPlugin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\CppUTest\SimpleString.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\CppUTest\TestFailure.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\CppUTest\TestFilter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\CppUTest\TestHarness_c.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\CppUTest\TestMemoryAllocator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\CppUTest\TestOutput.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\CppUTest\TestPlugin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\CppUTest\TestRegistry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\CppUTest\TestResult.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\CppUTest\Utest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\Platforms\VisualCpp\UtestPlatform.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\include\CppUTest\CommandLineArguments.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\CppUTest\CommandLineTestRunner.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\CppUTest\JUnitTestOutput.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\CppUTest\MemoryLeakDetector.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\CppUTest\MemoryLeakDetectorMallocMacros.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\CppUTest\MemoryLeakDetectorNewMacros.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\CppUTest\MemoryLeakWarningPlugin.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\CppUTest\PlatformSpecificFunctions.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\CppUTest\SimpleString.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\CppUTest\StandardCLibrary.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\CppUTest\TestFailure.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\CppUTest\TestFilter.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\CppUTest\TestHarness.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\CppUTest\TestHarness_c.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\CppUTest\TestMemoryAllocator.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\CppUTest\TestOutput.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\CppUTest\TestPlugin.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\CppUTest\TestRegistry.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\CppUTest\TestResult.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\CppUTest\TestTestingFixture.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\CppUTest\Utest.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\CppUTest\UtestMacros.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\CppUTest\VirtualCall.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/CppUTest.mak b/CppUTest.mak
deleted file mode 100644
index 10b81ea46..000000000
--- a/CppUTest.mak
+++ /dev/null
@@ -1,288 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on CppUTest.dsp
-!IF "$(CFG)" == ""
-CFG=CppUTest - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to CppUTest - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "CppUTest - Win32 Release" && "$(CFG)" != "CppUTest - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "CppUTest.mak" CFG="CppUTest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "CppUTest - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "CppUTest - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "CppUTest - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-ALL : "$(OUTDIR)\CppUTest.lib"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\CommandLineArguments.obj"
-	-@erase "$(INTDIR)\CommandLineTestRunner.obj"
-	-@erase "$(INTDIR)\Failure.obj"
-	-@erase "$(INTDIR)\JUnitTestOutput.obj"
-	-@erase "$(INTDIR)\MemoryLeakAllocator.obj"
-	-@erase "$(INTDIR)\MemoryLeakDetector.obj"
-	-@erase "$(INTDIR)\MemoryLeakWarningPlugin.obj"
-	-@erase "$(INTDIR)\SimpleString.obj"
-	-@erase "$(INTDIR)\TestHarness_c.obj"
-	-@erase "$(INTDIR)\TestOutput.obj"
-	-@erase "$(INTDIR)\TestPlugin.obj"
-	-@erase "$(INTDIR)\TestRegistry.obj"
-	-@erase "$(INTDIR)\TestResult.obj"
-	-@erase "$(INTDIR)\Utest.obj"
-	-@erase "$(INTDIR)\UtestPlatform.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(OUTDIR)\CppUTest.lib"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /Fp"$(INTDIR)\CppUTest.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\CppUTest.bsc" 
-BSC32_SBRS= \
-	
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\CppUTest.lib" 
-LIB32_OBJS= \
-	"$(INTDIR)\CommandLineArguments.obj" \
-	"$(INTDIR)\CommandLineTestRunner.obj" \
-	"$(INTDIR)\Failure.obj" \
-	"$(INTDIR)\JUnitTestOutput.obj" \
-	"$(INTDIR)\MemoryLeakAllocator.obj" \
-	"$(INTDIR)\MemoryLeakDetector.obj" \
-	"$(INTDIR)\MemoryLeakWarningPlugin.obj" \
-	"$(INTDIR)\SimpleString.obj" \
-	"$(INTDIR)\TestHarness_c.obj" \
-	"$(INTDIR)\TestOutput.obj" \
-	"$(INTDIR)\TestPlugin.obj" \
-	"$(INTDIR)\TestRegistry.obj" \
-	"$(INTDIR)\TestResult.obj" \
-	"$(INTDIR)\Utest.obj" \
-	"$(INTDIR)\UtestPlatform.obj"
-
-"$(OUTDIR)\CppUTest.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
-    $(LIB32) @<<
-  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "CppUTest - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-
-ALL : ".\lib\CppUTest.lib"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\CommandLineArguments.obj"
-	-@erase "$(INTDIR)\CommandLineTestRunner.obj"
-	-@erase "$(INTDIR)\Failure.obj"
-	-@erase "$(INTDIR)\JUnitTestOutput.obj"
-	-@erase "$(INTDIR)\MemoryLeakAllocator.obj"
-	-@erase "$(INTDIR)\MemoryLeakDetector.obj"
-	-@erase "$(INTDIR)\MemoryLeakWarningPlugin.obj"
-	-@erase "$(INTDIR)\SimpleString.obj"
-	-@erase "$(INTDIR)\TestHarness_c.obj"
-	-@erase "$(INTDIR)\TestOutput.obj"
-	-@erase "$(INTDIR)\TestPlugin.obj"
-	-@erase "$(INTDIR)\TestRegistry.obj"
-	-@erase "$(INTDIR)\TestResult.obj"
-	-@erase "$(INTDIR)\Utest.obj"
-	-@erase "$(INTDIR)\UtestPlatform.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\vc60.pdb"
-	-@erase ".\lib\CppUTest.lib"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\include\Platforms\VisualCpp" /D "_LIB" /D "WIN32" /D "_DEBUG" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\CppUTest.bsc" 
-BSC32_SBRS= \
-	
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"lib\CppUTest.lib" 
-LIB32_OBJS= \
-	"$(INTDIR)\CommandLineArguments.obj" \
-	"$(INTDIR)\CommandLineTestRunner.obj" \
-	"$(INTDIR)\Failure.obj" \
-	"$(INTDIR)\JUnitTestOutput.obj" \
-	"$(INTDIR)\MemoryLeakAllocator.obj" \
-	"$(INTDIR)\MemoryLeakDetector.obj" \
-	"$(INTDIR)\MemoryLeakWarningPlugin.obj" \
-	"$(INTDIR)\SimpleString.obj" \
-	"$(INTDIR)\TestHarness_c.obj" \
-	"$(INTDIR)\TestOutput.obj" \
-	"$(INTDIR)\TestPlugin.obj" \
-	"$(INTDIR)\TestRegistry.obj" \
-	"$(INTDIR)\TestResult.obj" \
-	"$(INTDIR)\Utest.obj" \
-	"$(INTDIR)\UtestPlatform.obj"
-
-".\lib\CppUTest.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
-    $(LIB32) @<<
-  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ENDIF 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("CppUTest.dep")
-!INCLUDE "CppUTest.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "CppUTest.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "CppUTest - Win32 Release" || "$(CFG)" == "CppUTest - Win32 Debug"
-SOURCE=.\src\CppUTest\CommandLineArguments.cpp
-
-"$(INTDIR)\CommandLineArguments.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\src\CppUTest\CommandLineTestRunner.cpp
-
-"$(INTDIR)\CommandLineTestRunner.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\src\CppUTest\Failure.cpp
-
-"$(INTDIR)\Failure.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\src\CppUTest\JUnitTestOutput.cpp
-
-"$(INTDIR)\JUnitTestOutput.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\src\CppUTest\MemoryLeakAllocator.cpp
-
-"$(INTDIR)\MemoryLeakAllocator.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\src\CppUTest\MemoryLeakDetector.cpp
-
-"$(INTDIR)\MemoryLeakDetector.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\src\CppUTest\MemoryLeakWarningPlugin.cpp
-
-"$(INTDIR)\MemoryLeakWarningPlugin.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\src\CppUTest\SimpleString.cpp
-
-"$(INTDIR)\SimpleString.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\src\CppUTest\TestHarness_c.cpp
-
-"$(INTDIR)\TestHarness_c.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\src\CppUTest\TestOutput.cpp
-
-"$(INTDIR)\TestOutput.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\src\CppUTest\TestPlugin.cpp
-
-"$(INTDIR)\TestPlugin.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\src\CppUTest\TestRegistry.cpp
-
-"$(INTDIR)\TestRegistry.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\src\CppUTest\TestResult.cpp
-
-"$(INTDIR)\TestResult.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\src\CppUTest\Utest.cpp
-
-"$(INTDIR)\Utest.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\src\Platforms\VisualCpp\UtestPlatform.cpp
-
-"$(INTDIR)\UtestPlatform.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-
-!ENDIF 
-
diff --git a/Makefile.am b/Makefile.am
index 59cbf4eda..696a0907c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,19 +34,19 @@ lib_libCppUTest_a_CXXFLAGS = $(AM_CXXFLAGS) $(CPPUTEST_CXXFLAGS) $(CPPUTEST_ADDI
 
 lib_libCppUTest_a_SOURCES = \
 	src/CppUTest/CommandLineArguments.cpp \
-	src/CppUTest/MemoryLeakWarningPlugin.cpp \
-	src/CppUTest/TestHarness_c.cpp \
-	src/CppUTest/TestRegistry.cpp \
 	src/CppUTest/CommandLineTestRunner.cpp \
-	src/CppUTest/SimpleString.cpp \
-	src/CppUTest/TestMemoryAllocator.cpp \
-	src/CppUTest/TestResult.cpp \
 	src/CppUTest/JUnitTestOutput.cpp \
-	src/CppUTest/TestFailure.cpp \
-	src/CppUTest/TestOutput.cpp \
 	src/CppUTest/MemoryLeakDetector.cpp \
+	src/CppUTest/MemoryLeakWarningPlugin.cpp \
+	src/CppUTest/SimpleString.cpp \
+	src/CppUTest/TestFailure.cpp \
 	src/CppUTest/TestFilter.cpp \
+	src/CppUTest/TestHarness_c.cpp \
+	src/CppUTest/TestMemoryAllocator.cpp \
+	src/CppUTest/TestOutput.cpp \
 	src/CppUTest/TestPlugin.cpp \
+	src/CppUTest/TestRegistry.cpp \
+	src/CppUTest/TestResult.cpp \
 	src/CppUTest/Utest.cpp \
 	src/Platforms/$(CPP_PLATFORM)/UtestPlatform.cpp
 
@@ -54,28 +54,28 @@ include_cpputestdir = $(includedir)/CppUTest
 
 include_cpputest_HEADERS = \
 	include/CppUTest/CommandLineArguments.h \
-	include/CppUTest/PlatformSpecificFunctions.h \
-	include/CppUTest/TestMemoryAllocator.h \
 	include/CppUTest/CommandLineTestRunner.h \
-	include/CppUTest/PlatformSpecificFunctions_c.h \
-	include/CppUTest/TestOutput.h \
 	include/CppUTest/CppUTestConfig.h \
-	include/CppUTest/SimpleString.h \
-	include/CppUTest/TestPlugin.h \
 	include/CppUTest/JUnitTestOutput.h \
-	include/CppUTest/StandardCLibrary.h \
-	include/CppUTest/TestRegistry.h \
 	include/CppUTest/MemoryLeakDetector.h \
-	include/CppUTest/TestFailure.h \
-	include/CppUTest/TestResult.h \
 	include/CppUTest/MemoryLeakDetectorMallocMacros.h \
-	include/CppUTest/TestFilter.h \
-	include/CppUTest/TestTestingFixture.h \
 	include/CppUTest/MemoryLeakDetectorNewMacros.h \
-	include/CppUTest/TestHarness.h \
-	include/CppUTest/Utest.h \
 	include/CppUTest/MemoryLeakWarningPlugin.h \
+	include/CppUTest/PlatformSpecificFunctions.h \
+	include/CppUTest/PlatformSpecificFunctions_c.h \
+	include/CppUTest/SimpleString.h \
+	include/CppUTest/StandardCLibrary.h \
+	include/CppUTest/TestFailure.h \
+	include/CppUTest/TestFilter.h \
+	include/CppUTest/TestHarness.h \
 	include/CppUTest/TestHarness_c.h \
+	include/CppUTest/TestMemoryAllocator.h \
+	include/CppUTest/TestOutput.h \
+	include/CppUTest/TestPlugin.h \
+	include/CppUTest/TestRegistry.h \
+	include/CppUTest/TestResult.h \
+	include/CppUTest/TestTestingFixture.h \
+	include/CppUTest/Utest.h \
 	include/CppUTest/UtestMacros.h
 
 lib_libCppUTestExt_a_CPPFLAGS = $(lib_libCppUTest_a_CPPFLAGS)
@@ -84,40 +84,40 @@ lib_libCppUTestExt_a_CXXFLAGS = $(lib_libCppUTest_a_CXXFLAGS)
 
 lib_libCppUTestExt_a_SOURCES = \
    src/CppUTestExt/CodeMemoryReportFormatter.cpp \
+   src/CppUTestExt/MemoryReportAllocator.cpp \
    src/CppUTestExt/MemoryReporterPlugin.cpp \
-   src/CppUTestExt/MockFailure.cpp \
-   src/CppUTestExt/MockSupportPlugin.cpp \
+   src/CppUTestExt/MemoryReportFormatter.cpp \
    src/CppUTestExt/MockActualCall.cpp \
-   src/CppUTestExt/MockSupport_c.cpp \
-   src/CppUTestExt/MemoryReportAllocator.cpp \
    src/CppUTestExt/MockExpectedCall.cpp \
-   src/CppUTestExt/MockNamedValue.cpp \
-   src/CppUTestExt/OrderedTest.cpp \
-   src/CppUTestExt/MemoryReportFormatter.cpp \
    src/CppUTestExt/MockExpectedFunctionsList.cpp \
-   src/CppUTestExt/MockSupport.cpp
+   src/CppUTestExt/MockFailure.cpp \
+   src/CppUTestExt/MockNamedValue.cpp \
+   src/CppUTestExt/MockSupport.cpp \
+   src/CppUTestExt/MockSupportPlugin.cpp \
+   src/CppUTestExt/MockSupport_c.cpp \
+   src/CppUTestExt/OrderedTest.cpp
 
 if INCLUDE_CPPUTEST_EXT
 include_cpputestextdir = $(includedir)/CppUTestExt
 
 include_cpputestext_HEADERS = \
-	include/CppUTestExt/MemoryReportAllocator.h \
-	include/CppUTestExt/MockExpectedFunctionsList.h \
-	include/CppUTestExt/MockSupportPlugin.h \
-	include/CppUTestExt/MockSupport.h \
-	include/CppUTestExt/MockCheckedExpectedCall.h \
-	include/CppUTestExt/MockExpectedCall.h \
-	include/CppUTestExt/MemoryReportFormatter.h \
-	include/CppUTestExt/MockFailure.h \
-	include/CppUTestExt/MockSupport_c.h \
 	include/CppUTestExt/GMock.h \
 	include/CppUTestExt/GTest.h \
-	include/CppUTestExt/MemoryReporterPlugin.h \
-	include/CppUTestExt/OrderedTest.h \
 	include/CppUTestExt/GTestConvertor.h \
+	include/CppUTestExt/MemoryReportAllocator.h \
+	include/CppUTestExt/MemoryReporterPlugin.h \
+	include/CppUTestExt/MemoryReportFormatter.h \
 	include/CppUTestExt/MockActualCall.h \
 	include/CppUTestExt/MockCheckedActualCall.h \
-	include/CppUTestExt/MockNamedValue.h
+	include/CppUTestExt/MockCheckedExpectedCall.h \
+	include/CppUTestExt/MockExpectedCall.h \
+	include/CppUTestExt/MockExpectedFunctionsList.h \
+	include/CppUTestExt/MockFailure.h \
+	include/CppUTestExt/MockNamedValue.h \
+	include/CppUTestExt/MockSupport.h \
+	include/CppUTestExt/MockSupportPlugin.h \
+	include/CppUTestExt/MockSupport_c.h \
+	include/CppUTestExt/OrderedTest.h	
 	
 endif
 
@@ -128,34 +128,34 @@ CppUTestTests_LDADD = lib/libCppUTest.a $(CPPUTEST_LDADD)
 CppUTestTests_LDFLAGS = $(AM_LDFLAGS) $(CPPUTEST_LDFLAGS) $(CPPUTEST_ADDITIONAL_LDFLAGS)
 
 CppUTestTests_SOURCES = \
+	tests/AllocationInCFile.c \
+	tests/AllocationInCppFile.cpp \
+	tests/AllocLetTestFree.c \
+	tests/AllocLetTestFreeTest.cpp \
 	tests/AllTests.cpp \
-	tests/SetPluginTest.cpp \
 	tests/CheatSheetTest.cpp \
-	tests/SimpleStringTest.cpp \
 	tests/CommandLineArgumentsTest.cpp \
-	tests/TestFailureTest.cpp \
-	tests/TestFailureNaNTest.cpp \
 	tests/CommandLineTestRunnerTest.cpp \
+	tests/JUnitOutputTest.cpp \
+	tests/MemoryLeakDetectorTest.cpp \
+	tests/MemoryLeakOperatorOverloadsTest.cpp \
+	tests/MemoryLeakWarningTest.cpp \
+	tests/NullTestTest.cpp \
+	tests/PluginTest.cpp \
+	tests/PreprocessorTest.cpp \
+	tests/SetPluginTest.cpp \
+	tests/SimpleStringTest.cpp \
+	tests/TestFailureNaNTest.cpp \
+	tests/TestFailureTest.cpp \
 	tests/TestFilterTest.cpp \
 	tests/TestHarness_cTest.cpp \
-	tests/JUnitOutputTest.cpp \
 	tests/TestHarness_cTestCFile.c \
-	tests/MemoryLeakDetectorTest.cpp \
 	tests/TestInstallerTest.cpp \
-	tests/AllocLetTestFree.c \
-	tests/MemoryLeakOperatorOverloadsTest.cpp \
 	tests/TestMemoryAllocatorTest.cpp \
-	tests/MemoryLeakWarningTest.cpp \
 	tests/TestOutputTest.cpp \
-	tests/AllocLetTestFreeTest.cpp \
-	tests/NullTestTest.cpp \
 	tests/TestRegistryTest.cpp \
-	tests/AllocationInCFile.c \
-	tests/PluginTest.cpp \
 	tests/TestResultTest.cpp \
-	tests/PreprocessorTest.cpp \
 	tests/TestUTestMacro.cpp \
-	tests/AllocationInCppFile.cpp \
 	tests/UtestTest.cpp
 
 CppUTestExtTests_CPPFLAGS = $(lib_libCppUTestExt_a_CPPFLAGS)
@@ -165,24 +165,24 @@ CppUTestExtTests_LDADD = lib/libCppUTestExt.a lib/libCppUTest.a $(CPPUTEST_LDADD
 CppUTestExtTests_LDFLAGS = $(CppUTestTests_LDFLAGS)
 
 CppUTestExtTests_SOURCES = \
-	tests/CppUTestExt/TestMockActualFunctionCall.cpp \
-	tests/CppUTestExt/TestMockSupport.cpp \
-	tests/CppUTestExt/TestCodeMemoryReportFormatter.cpp \
-	tests/CppUTestExt/TestMockCheatSheet.cpp \
-	tests/CppUTestExt/TestMockSupport_c.cpp \
-	tests/CppUTestExt/TestGMock.cpp \
-	tests/CppUTestExt/TestMockExpectedFunctionCall.cpp \
-	tests/CppUTestExt/TestMockSupport_cCFile.c \
-	tests/CppUTestExt/TestGTest.cpp \
-	tests/CppUTestExt/TestGTestConvertor.cpp \
-	tests/CppUTestExt/TestMockExpectedFunctionsList.cpp \
-	tests/CppUTestExt/TestMemoryReportAllocator.cpp \
-	tests/CppUTestExt/TestMockFailure.cpp \
-	tests/CppUTestExt/TestOrderedTest.cpp \
-	tests/CppUTestExt/TestMemoryReportFormatter.cpp \
-	tests/CppUTestExt/TestMemoryReporterPlugin.cpp \
-	tests/CppUTestExt/TestMockPlugin.cpp \
-	tests/CppUTestExt/AllTests.cpp 
+	tests/CppUTestExt/AllTests.cpp \
+	tests/CppUTestExt/CodeMemoryReportFormatterTest.cpp \
+	tests/CppUTestExt/GMockTest.cpp \
+	tests/CppUTestExt/GTest1Test.cpp \
+	tests/CppUTestExt/GTest2ConvertorTest.cpp \
+	tests/CppUTestExt/MemoryReportAllocatorTest.cpp \
+	tests/CppUTestExt/MemoryReporterPluginTest.cpp \
+	tests/CppUTestExt/MemoryReportFormatterTest.cpp \
+	tests/CppUTestExt/MockActualCallTest.cpp \
+	tests/CppUTestExt/MockCheatSheetTest.cpp \
+	tests/CppUTestExt/MockExpectedCallTest.cpp \
+	tests/CppUTestExt/MockExpectedFunctionsListTest.cpp \
+	tests/CppUTestExt/MockFailureTest.cpp \
+	tests/CppUTestExt/MockPluginTest.cpp \
+	tests/CppUTestExt/MockSupportTest.cpp \
+	tests/CppUTestExt/MockSupport_cTest.cpp \
+	tests/CppUTestExt/MockSupport_cTestCFile.c \
+	tests/CppUTestExt/OrderedTestTest.cpp
 
 if INCLUDE_GMOCKTESTS
 
diff --git a/Makefile.in b/Makefile.in
index 289a8cfdb..f71caa4ad 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -97,19 +97,19 @@ lib_libCppUTest_a_AR = $(AR) $(ARFLAGS)
 lib_libCppUTest_a_LIBADD =
 am_lib_libCppUTest_a_OBJECTS =  \
 	lib_libCppUTest_a-CommandLineArguments.$(OBJEXT) \
-	lib_libCppUTest_a-MemoryLeakWarningPlugin.$(OBJEXT) \
-	lib_libCppUTest_a-TestHarness_c.$(OBJEXT) \
-	lib_libCppUTest_a-TestRegistry.$(OBJEXT) \
 	lib_libCppUTest_a-CommandLineTestRunner.$(OBJEXT) \
-	lib_libCppUTest_a-SimpleString.$(OBJEXT) \
-	lib_libCppUTest_a-TestMemoryAllocator.$(OBJEXT) \
-	lib_libCppUTest_a-TestResult.$(OBJEXT) \
 	lib_libCppUTest_a-JUnitTestOutput.$(OBJEXT) \
-	lib_libCppUTest_a-TestFailure.$(OBJEXT) \
-	lib_libCppUTest_a-TestOutput.$(OBJEXT) \
 	lib_libCppUTest_a-MemoryLeakDetector.$(OBJEXT) \
+	lib_libCppUTest_a-MemoryLeakWarningPlugin.$(OBJEXT) \
+	lib_libCppUTest_a-SimpleString.$(OBJEXT) \
+	lib_libCppUTest_a-TestFailure.$(OBJEXT) \
 	lib_libCppUTest_a-TestFilter.$(OBJEXT) \
+	lib_libCppUTest_a-TestHarness_c.$(OBJEXT) \
+	lib_libCppUTest_a-TestMemoryAllocator.$(OBJEXT) \
+	lib_libCppUTest_a-TestOutput.$(OBJEXT) \
 	lib_libCppUTest_a-TestPlugin.$(OBJEXT) \
+	lib_libCppUTest_a-TestRegistry.$(OBJEXT) \
+	lib_libCppUTest_a-TestResult.$(OBJEXT) \
 	lib_libCppUTest_a-Utest.$(OBJEXT) \
 	lib_libCppUTest_a-UtestPlatform.$(OBJEXT)
 lib_libCppUTest_a_OBJECTS = $(am_lib_libCppUTest_a_OBJECTS)
@@ -118,41 +118,40 @@ lib_libCppUTestExt_a_AR = $(AR) $(ARFLAGS)
 lib_libCppUTestExt_a_LIBADD =
 am_lib_libCppUTestExt_a_OBJECTS =  \
 	lib_libCppUTestExt_a-CodeMemoryReportFormatter.$(OBJEXT) \
+	lib_libCppUTestExt_a-MemoryReportAllocator.$(OBJEXT) \
 	lib_libCppUTestExt_a-MemoryReporterPlugin.$(OBJEXT) \
-	lib_libCppUTestExt_a-MockFailure.$(OBJEXT) \
-	lib_libCppUTestExt_a-MockSupportPlugin.$(OBJEXT) \
+	lib_libCppUTestExt_a-MemoryReportFormatter.$(OBJEXT) \
 	lib_libCppUTestExt_a-MockActualCall.$(OBJEXT) \
-	lib_libCppUTestExt_a-MockSupport_c.$(OBJEXT) \
-	lib_libCppUTestExt_a-MemoryReportAllocator.$(OBJEXT) \
 	lib_libCppUTestExt_a-MockExpectedCall.$(OBJEXT) \
-	lib_libCppUTestExt_a-MockNamedValue.$(OBJEXT) \
-	lib_libCppUTestExt_a-OrderedTest.$(OBJEXT) \
-	lib_libCppUTestExt_a-MemoryReportFormatter.$(OBJEXT) \
 	lib_libCppUTestExt_a-MockExpectedFunctionsList.$(OBJEXT) \
-	lib_libCppUTestExt_a-MockSupport.$(OBJEXT)
+	lib_libCppUTestExt_a-MockFailure.$(OBJEXT) \
+	lib_libCppUTestExt_a-MockNamedValue.$(OBJEXT) \
+	lib_libCppUTestExt_a-MockSupport.$(OBJEXT) \
+	lib_libCppUTestExt_a-MockSupportPlugin.$(OBJEXT) \
+	lib_libCppUTestExt_a-MockSupport_c.$(OBJEXT) \
+	lib_libCppUTestExt_a-OrderedTest.$(OBJEXT)
 lib_libCppUTestExt_a_OBJECTS = $(am_lib_libCppUTestExt_a_OBJECTS)
 am__EXEEXT_1 = CppUTestTests$(EXEEXT)
 am__EXEEXT_2 = CppUTestExtTests$(EXEEXT)
 @INCLUDE_CPPUTEST_EXT_TRUE@am__EXEEXT_3 = $(am__EXEEXT_2)
-am_CppUTestExtTests_OBJECTS =  \
-	CppUTestExtTests-TestMockActualFunctionCall.$(OBJEXT) \
-	CppUTestExtTests-TestMockSupport.$(OBJEXT) \
-	CppUTestExtTests-TestCodeMemoryReportFormatter.$(OBJEXT) \
-	CppUTestExtTests-TestMockCheatSheet.$(OBJEXT) \
-	CppUTestExtTests-TestMockSupport_c.$(OBJEXT) \
-	CppUTestExtTests-TestGMock.$(OBJEXT) \
-	CppUTestExtTests-TestMockExpectedFunctionCall.$(OBJEXT) \
-	CppUTestExtTests-TestMockSupport_cCFile.$(OBJEXT) \
-	CppUTestExtTests-TestGTest.$(OBJEXT) \
-	CppUTestExtTests-TestGTestConvertor.$(OBJEXT) \
-	CppUTestExtTests-TestMockExpectedFunctionsList.$(OBJEXT) \
-	CppUTestExtTests-TestMemoryReportAllocator.$(OBJEXT) \
-	CppUTestExtTests-TestMockFailure.$(OBJEXT) \
-	CppUTestExtTests-TestOrderedTest.$(OBJEXT) \
-	CppUTestExtTests-TestMemoryReportFormatter.$(OBJEXT) \
-	CppUTestExtTests-TestMemoryReporterPlugin.$(OBJEXT) \
-	CppUTestExtTests-TestMockPlugin.$(OBJEXT) \
-	CppUTestExtTests-AllTests.$(OBJEXT)
+am_CppUTestExtTests_OBJECTS = CppUTestExtTests-AllTests.$(OBJEXT) \
+	CppUTestExtTests-CodeMemoryReportFormatterTest.$(OBJEXT) \
+	CppUTestExtTests-GMockTest.$(OBJEXT) \
+	CppUTestExtTests-GTest1Test.$(OBJEXT) \
+	CppUTestExtTests-GTest2ConvertorTest.$(OBJEXT) \
+	CppUTestExtTests-MemoryReportAllocatorTest.$(OBJEXT) \
+	CppUTestExtTests-MemoryReporterPluginTest.$(OBJEXT) \
+	CppUTestExtTests-MemoryReportFormatterTest.$(OBJEXT) \
+	CppUTestExtTests-MockActualCallTest.$(OBJEXT) \
+	CppUTestExtTests-MockCheatSheetTest.$(OBJEXT) \
+	CppUTestExtTests-MockExpectedCallTest.$(OBJEXT) \
+	CppUTestExtTests-MockExpectedFunctionsListTest.$(OBJEXT) \
+	CppUTestExtTests-MockFailureTest.$(OBJEXT) \
+	CppUTestExtTests-MockPluginTest.$(OBJEXT) \
+	CppUTestExtTests-MockSupportTest.$(OBJEXT) \
+	CppUTestExtTests-MockSupport_cTest.$(OBJEXT) \
+	CppUTestExtTests-MockSupport_cTestCFile.$(OBJEXT) \
+	CppUTestExtTests-OrderedTestTest.$(OBJEXT)
 CppUTestExtTests_OBJECTS = $(am_CppUTestExtTests_OBJECTS)
 am__DEPENDENCIES_1 =
 CppUTestExtTests_DEPENDENCIES = lib/libCppUTestExt.a lib/libCppUTest.a \
@@ -164,34 +163,34 @@ CppUTestExtTests_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 	$(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) \
 	$(CppUTestExtTests_LDFLAGS) $(LDFLAGS) -o $@
-am_CppUTestTests_OBJECTS = CppUTestTests-AllTests.$(OBJEXT) \
-	CppUTestTests-SetPluginTest.$(OBJEXT) \
+am_CppUTestTests_OBJECTS = CppUTestTests-AllocationInCFile.$(OBJEXT) \
+	CppUTestTests-AllocationInCppFile.$(OBJEXT) \
+	CppUTestTests-AllocLetTestFree.$(OBJEXT) \
+	CppUTestTests-AllocLetTestFreeTest.$(OBJEXT) \
+	CppUTestTests-AllTests.$(OBJEXT) \
 	CppUTestTests-CheatSheetTest.$(OBJEXT) \
-	CppUTestTests-SimpleStringTest.$(OBJEXT) \
 	CppUTestTests-CommandLineArgumentsTest.$(OBJEXT) \
-	CppUTestTests-TestFailureTest.$(OBJEXT) \
-	CppUTestTests-TestFailureNaNTest.$(OBJEXT) \
 	CppUTestTests-CommandLineTestRunnerTest.$(OBJEXT) \
+	CppUTestTests-JUnitOutputTest.$(OBJEXT) \
+	CppUTestTests-MemoryLeakDetectorTest.$(OBJEXT) \
+	CppUTestTests-MemoryLeakOperatorOverloadsTest.$(OBJEXT) \
+	CppUTestTests-MemoryLeakWarningTest.$(OBJEXT) \
+	CppUTestTests-NullTestTest.$(OBJEXT) \
+	CppUTestTests-PluginTest.$(OBJEXT) \
+	CppUTestTests-PreprocessorTest.$(OBJEXT) \
+	CppUTestTests-SetPluginTest.$(OBJEXT) \
+	CppUTestTests-SimpleStringTest.$(OBJEXT) \
+	CppUTestTests-TestFailureNaNTest.$(OBJEXT) \
+	CppUTestTests-TestFailureTest.$(OBJEXT) \
 	CppUTestTests-TestFilterTest.$(OBJEXT) \
 	CppUTestTests-TestHarness_cTest.$(OBJEXT) \
-	CppUTestTests-JUnitOutputTest.$(OBJEXT) \
 	CppUTestTests-TestHarness_cTestCFile.$(OBJEXT) \
-	CppUTestTests-MemoryLeakDetectorTest.$(OBJEXT) \
 	CppUTestTests-TestInstallerTest.$(OBJEXT) \
-	CppUTestTests-AllocLetTestFree.$(OBJEXT) \
-	CppUTestTests-MemoryLeakOperatorOverloadsTest.$(OBJEXT) \
 	CppUTestTests-TestMemoryAllocatorTest.$(OBJEXT) \
-	CppUTestTests-MemoryLeakWarningTest.$(OBJEXT) \
 	CppUTestTests-TestOutputTest.$(OBJEXT) \
-	CppUTestTests-AllocLetTestFreeTest.$(OBJEXT) \
-	CppUTestTests-NullTestTest.$(OBJEXT) \
 	CppUTestTests-TestRegistryTest.$(OBJEXT) \
-	CppUTestTests-AllocationInCFile.$(OBJEXT) \
-	CppUTestTests-PluginTest.$(OBJEXT) \
 	CppUTestTests-TestResultTest.$(OBJEXT) \
-	CppUTestTests-PreprocessorTest.$(OBJEXT) \
 	CppUTestTests-TestUTestMacro.$(OBJEXT) \
-	CppUTestTests-AllocationInCppFile.$(OBJEXT) \
 	CppUTestTests-UtestTest.$(OBJEXT)
 CppUTestTests_OBJECTS = $(am_CppUTestTests_OBJECTS)
 CppUTestTests_DEPENDENCIES = lib/libCppUTest.a $(am__DEPENDENCIES_1)
@@ -244,23 +243,23 @@ DIST_SOURCES = $(lib_libCppUTest_a_SOURCES) \
 	$(lib_libCppUTestExt_a_SOURCES) $(CppUTestExtTests_SOURCES) \
 	$(CppUTestTests_SOURCES)
 DATA = $(pkgconfig_DATA)
-am__include_cpputestext_HEADERS_DIST =  \
+am__include_cpputestext_HEADERS_DIST = include/CppUTestExt/GMock.h \
+	include/CppUTestExt/GTest.h \
+	include/CppUTestExt/GTestConvertor.h \
 	include/CppUTestExt/MemoryReportAllocator.h \
-	include/CppUTestExt/MockExpectedFunctionsList.h \
-	include/CppUTestExt/MockSupportPlugin.h \
-	include/CppUTestExt/MockSupport.h \
+	include/CppUTestExt/MemoryReporterPlugin.h \
+	include/CppUTestExt/MemoryReportFormatter.h \
+	include/CppUTestExt/MockActualCall.h \
+	include/CppUTestExt/MockCheckedActualCall.h \
 	include/CppUTestExt/MockCheckedExpectedCall.h \
 	include/CppUTestExt/MockExpectedCall.h \
-	include/CppUTestExt/MemoryReportFormatter.h \
+	include/CppUTestExt/MockExpectedFunctionsList.h \
 	include/CppUTestExt/MockFailure.h \
+	include/CppUTestExt/MockNamedValue.h \
+	include/CppUTestExt/MockSupport.h \
+	include/CppUTestExt/MockSupportPlugin.h \
 	include/CppUTestExt/MockSupport_c.h \
-	include/CppUTestExt/GMock.h include/CppUTestExt/GTest.h \
-	include/CppUTestExt/MemoryReporterPlugin.h \
-	include/CppUTestExt/OrderedTest.h \
-	include/CppUTestExt/GTestConvertor.h \
-	include/CppUTestExt/MockActualCall.h \
-	include/CppUTestExt/MockCheckedActualCall.h \
-	include/CppUTestExt/MockNamedValue.h
+	include/CppUTestExt/OrderedTest.h
 HEADERS = $(include_cpputest_HEADERS) $(include_cpputestext_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -439,47 +438,47 @@ lib_libCppUTest_a_CFLAGS = $(AM_CFLAGS) $(CPPUTEST_CFLAGS) $(CPPUTEST_ADDITIONAL
 lib_libCppUTest_a_CXXFLAGS = $(AM_CXXFLAGS) $(CPPUTEST_CXXFLAGS) $(CPPUTEST_ADDITIONAL_CXXFLAGS)
 lib_libCppUTest_a_SOURCES = \
 	src/CppUTest/CommandLineArguments.cpp \
-	src/CppUTest/MemoryLeakWarningPlugin.cpp \
-	src/CppUTest/TestHarness_c.cpp \
-	src/CppUTest/TestRegistry.cpp \
 	src/CppUTest/CommandLineTestRunner.cpp \
-	src/CppUTest/SimpleString.cpp \
-	src/CppUTest/TestMemoryAllocator.cpp \
-	src/CppUTest/TestResult.cpp \
 	src/CppUTest/JUnitTestOutput.cpp \
-	src/CppUTest/TestFailure.cpp \
-	src/CppUTest/TestOutput.cpp \
 	src/CppUTest/MemoryLeakDetector.cpp \
+	src/CppUTest/MemoryLeakWarningPlugin.cpp \
+	src/CppUTest/SimpleString.cpp \
+	src/CppUTest/TestFailure.cpp \
 	src/CppUTest/TestFilter.cpp \
+	src/CppUTest/TestHarness_c.cpp \
+	src/CppUTest/TestMemoryAllocator.cpp \
+	src/CppUTest/TestOutput.cpp \
 	src/CppUTest/TestPlugin.cpp \
+	src/CppUTest/TestRegistry.cpp \
+	src/CppUTest/TestResult.cpp \
 	src/CppUTest/Utest.cpp \
 	src/Platforms/$(CPP_PLATFORM)/UtestPlatform.cpp
 
 include_cpputestdir = $(includedir)/CppUTest
 include_cpputest_HEADERS = \
 	include/CppUTest/CommandLineArguments.h \
-	include/CppUTest/PlatformSpecificFunctions.h \
-	include/CppUTest/TestMemoryAllocator.h \
 	include/CppUTest/CommandLineTestRunner.h \
-	include/CppUTest/PlatformSpecificFunctions_c.h \
-	include/CppUTest/TestOutput.h \
 	include/CppUTest/CppUTestConfig.h \
-	include/CppUTest/SimpleString.h \
-	include/CppUTest/TestPlugin.h \
 	include/CppUTest/JUnitTestOutput.h \
-	include/CppUTest/StandardCLibrary.h \
-	include/CppUTest/TestRegistry.h \
 	include/CppUTest/MemoryLeakDetector.h \
-	include/CppUTest/TestFailure.h \
-	include/CppUTest/TestResult.h \
 	include/CppUTest/MemoryLeakDetectorMallocMacros.h \
-	include/CppUTest/TestFilter.h \
-	include/CppUTest/TestTestingFixture.h \
 	include/CppUTest/MemoryLeakDetectorNewMacros.h \
-	include/CppUTest/TestHarness.h \
-	include/CppUTest/Utest.h \
 	include/CppUTest/MemoryLeakWarningPlugin.h \
+	include/CppUTest/PlatformSpecificFunctions.h \
+	include/CppUTest/PlatformSpecificFunctions_c.h \
+	include/CppUTest/SimpleString.h \
+	include/CppUTest/StandardCLibrary.h \
+	include/CppUTest/TestFailure.h \
+	include/CppUTest/TestFilter.h \
+	include/CppUTest/TestHarness.h \
 	include/CppUTest/TestHarness_c.h \
+	include/CppUTest/TestMemoryAllocator.h \
+	include/CppUTest/TestOutput.h \
+	include/CppUTest/TestPlugin.h \
+	include/CppUTest/TestRegistry.h \
+	include/CppUTest/TestResult.h \
+	include/CppUTest/TestTestingFixture.h \
+	include/CppUTest/Utest.h \
 	include/CppUTest/UtestMacros.h
 
 lib_libCppUTestExt_a_CPPFLAGS = $(lib_libCppUTest_a_CPPFLAGS)
@@ -487,38 +486,38 @@ lib_libCppUTestExt_a_CFLAGS = $(lib_libCppUTest_a_CFLAGS)
 lib_libCppUTestExt_a_CXXFLAGS = $(lib_libCppUTest_a_CXXFLAGS)
 lib_libCppUTestExt_a_SOURCES = \
    src/CppUTestExt/CodeMemoryReportFormatter.cpp \
+   src/CppUTestExt/MemoryReportAllocator.cpp \
    src/CppUTestExt/MemoryReporterPlugin.cpp \
-   src/CppUTestExt/MockFailure.cpp \
-   src/CppUTestExt/MockSupportPlugin.cpp \
+   src/CppUTestExt/MemoryReportFormatter.cpp \
    src/CppUTestExt/MockActualCall.cpp \
-   src/CppUTestExt/MockSupport_c.cpp \
-   src/CppUTestExt/MemoryReportAllocator.cpp \
    src/CppUTestExt/MockExpectedCall.cpp \
-   src/CppUTestExt/MockNamedValue.cpp \
-   src/CppUTestExt/OrderedTest.cpp \
-   src/CppUTestExt/MemoryReportFormatter.cpp \
    src/CppUTestExt/MockExpectedFunctionsList.cpp \
-   src/CppUTestExt/MockSupport.cpp
+   src/CppUTestExt/MockFailure.cpp \
+   src/CppUTestExt/MockNamedValue.cpp \
+   src/CppUTestExt/MockSupport.cpp \
+   src/CppUTestExt/MockSupportPlugin.cpp \
+   src/CppUTestExt/MockSupport_c.cpp \
+   src/CppUTestExt/OrderedTest.cpp
 
 @INCLUDE_CPPUTEST_EXT_TRUE@include_cpputestextdir = $(includedir)/CppUTestExt
 @INCLUDE_CPPUTEST_EXT_TRUE@include_cpputestext_HEADERS = \
-@INCLUDE_CPPUTEST_EXT_TRUE@	include/CppUTestExt/MemoryReportAllocator.h \
-@INCLUDE_CPPUTEST_EXT_TRUE@	include/CppUTestExt/MockExpectedFunctionsList.h \
-@INCLUDE_CPPUTEST_EXT_TRUE@	include/CppUTestExt/MockSupportPlugin.h \
-@INCLUDE_CPPUTEST_EXT_TRUE@	include/CppUTestExt/MockSupport.h \
-@INCLUDE_CPPUTEST_EXT_TRUE@	include/CppUTestExt/MockCheckedExpectedCall.h \
-@INCLUDE_CPPUTEST_EXT_TRUE@	include/CppUTestExt/MockExpectedCall.h \
-@INCLUDE_CPPUTEST_EXT_TRUE@	include/CppUTestExt/MemoryReportFormatter.h \
-@INCLUDE_CPPUTEST_EXT_TRUE@	include/CppUTestExt/MockFailure.h \
-@INCLUDE_CPPUTEST_EXT_TRUE@	include/CppUTestExt/MockSupport_c.h \
 @INCLUDE_CPPUTEST_EXT_TRUE@	include/CppUTestExt/GMock.h \
 @INCLUDE_CPPUTEST_EXT_TRUE@	include/CppUTestExt/GTest.h \
-@INCLUDE_CPPUTEST_EXT_TRUE@	include/CppUTestExt/MemoryReporterPlugin.h \
-@INCLUDE_CPPUTEST_EXT_TRUE@	include/CppUTestExt/OrderedTest.h \
 @INCLUDE_CPPUTEST_EXT_TRUE@	include/CppUTestExt/GTestConvertor.h \
+@INCLUDE_CPPUTEST_EXT_TRUE@	include/CppUTestExt/MemoryReportAllocator.h \
+@INCLUDE_CPPUTEST_EXT_TRUE@	include/CppUTestExt/MemoryReporterPlugin.h \
+@INCLUDE_CPPUTEST_EXT_TRUE@	include/CppUTestExt/MemoryReportFormatter.h \
 @INCLUDE_CPPUTEST_EXT_TRUE@	include/CppUTestExt/MockActualCall.h \
 @INCLUDE_CPPUTEST_EXT_TRUE@	include/CppUTestExt/MockCheckedActualCall.h \
-@INCLUDE_CPPUTEST_EXT_TRUE@	include/CppUTestExt/MockNamedValue.h
+@INCLUDE_CPPUTEST_EXT_TRUE@	include/CppUTestExt/MockCheckedExpectedCall.h \
+@INCLUDE_CPPUTEST_EXT_TRUE@	include/CppUTestExt/MockExpectedCall.h \
+@INCLUDE_CPPUTEST_EXT_TRUE@	include/CppUTestExt/MockExpectedFunctionsList.h \
+@INCLUDE_CPPUTEST_EXT_TRUE@	include/CppUTestExt/MockFailure.h \
+@INCLUDE_CPPUTEST_EXT_TRUE@	include/CppUTestExt/MockNamedValue.h \
+@INCLUDE_CPPUTEST_EXT_TRUE@	include/CppUTestExt/MockSupport.h \
+@INCLUDE_CPPUTEST_EXT_TRUE@	include/CppUTestExt/MockSupportPlugin.h \
+@INCLUDE_CPPUTEST_EXT_TRUE@	include/CppUTestExt/MockSupport_c.h \
+@INCLUDE_CPPUTEST_EXT_TRUE@	include/CppUTestExt/OrderedTest.h	
 
 CppUTestTests_CPPFLAGS = $(lib_libCppUTest_a_CPPFLAGS)
 CppUTestTests_CFLAGS = $(lib_libCppUTest_a_CFLAGS)
@@ -526,34 +525,34 @@ CppUTestTests_CXXFLAGS = $(lib_libCppUTest_a_CXXFLAGS)
 CppUTestTests_LDADD = lib/libCppUTest.a $(CPPUTEST_LDADD)
 CppUTestTests_LDFLAGS = $(AM_LDFLAGS) $(CPPUTEST_LDFLAGS) $(CPPUTEST_ADDITIONAL_LDFLAGS)
 CppUTestTests_SOURCES = \
+	tests/AllocationInCFile.c \
+	tests/AllocationInCppFile.cpp \
+	tests/AllocLetTestFree.c \
+	tests/AllocLetTestFreeTest.cpp \
 	tests/AllTests.cpp \
-	tests/SetPluginTest.cpp \
 	tests/CheatSheetTest.cpp \
-	tests/SimpleStringTest.cpp \
 	tests/CommandLineArgumentsTest.cpp \
-	tests/TestFailureTest.cpp \
-	tests/TestFailureNaNTest.cpp \
 	tests/CommandLineTestRunnerTest.cpp \
+	tests/JUnitOutputTest.cpp \
+	tests/MemoryLeakDetectorTest.cpp \
+	tests/MemoryLeakOperatorOverloadsTest.cpp \
+	tests/MemoryLeakWarningTest.cpp \
+	tests/NullTestTest.cpp \
+	tests/PluginTest.cpp \
+	tests/PreprocessorTest.cpp \
+	tests/SetPluginTest.cpp \
+	tests/SimpleStringTest.cpp \
+	tests/TestFailureNaNTest.cpp \
+	tests/TestFailureTest.cpp \
 	tests/TestFilterTest.cpp \
 	tests/TestHarness_cTest.cpp \
-	tests/JUnitOutputTest.cpp \
 	tests/TestHarness_cTestCFile.c \
-	tests/MemoryLeakDetectorTest.cpp \
 	tests/TestInstallerTest.cpp \
-	tests/AllocLetTestFree.c \
-	tests/MemoryLeakOperatorOverloadsTest.cpp \
 	tests/TestMemoryAllocatorTest.cpp \
-	tests/MemoryLeakWarningTest.cpp \
 	tests/TestOutputTest.cpp \
-	tests/AllocLetTestFreeTest.cpp \
-	tests/NullTestTest.cpp \
 	tests/TestRegistryTest.cpp \
-	tests/AllocationInCFile.c \
-	tests/PluginTest.cpp \
 	tests/TestResultTest.cpp \
-	tests/PreprocessorTest.cpp \
 	tests/TestUTestMacro.cpp \
-	tests/AllocationInCppFile.cpp \
 	tests/UtestTest.cpp
 
 CppUTestExtTests_CPPFLAGS = $(lib_libCppUTestExt_a_CPPFLAGS)
@@ -562,24 +561,24 @@ CppUTestExtTests_CXXFLAGS = $(lib_libCppUTestExt_a_CXXFLAGS)
 CppUTestExtTests_LDADD = lib/libCppUTestExt.a lib/libCppUTest.a $(CPPUTEST_LDADD)
 CppUTestExtTests_LDFLAGS = $(CppUTestTests_LDFLAGS)
 CppUTestExtTests_SOURCES = \
-	tests/CppUTestExt/TestMockActualFunctionCall.cpp \
-	tests/CppUTestExt/TestMockSupport.cpp \
-	tests/CppUTestExt/TestCodeMemoryReportFormatter.cpp \
-	tests/CppUTestExt/TestMockCheatSheet.cpp \
-	tests/CppUTestExt/TestMockSupport_c.cpp \
-	tests/CppUTestExt/TestGMock.cpp \
-	tests/CppUTestExt/TestMockExpectedFunctionCall.cpp \
-	tests/CppUTestExt/TestMockSupport_cCFile.c \
-	tests/CppUTestExt/TestGTest.cpp \
-	tests/CppUTestExt/TestGTestConvertor.cpp \
-	tests/CppUTestExt/TestMockExpectedFunctionsList.cpp \
-	tests/CppUTestExt/TestMemoryReportAllocator.cpp \
-	tests/CppUTestExt/TestMockFailure.cpp \
-	tests/CppUTestExt/TestOrderedTest.cpp \
-	tests/CppUTestExt/TestMemoryReportFormatter.cpp \
-	tests/CppUTestExt/TestMemoryReporterPlugin.cpp \
-	tests/CppUTestExt/TestMockPlugin.cpp \
-	tests/CppUTestExt/AllTests.cpp 
+	tests/CppUTestExt/AllTests.cpp \
+	tests/CppUTestExt/CodeMemoryReportFormatterTest.cpp \
+	tests/CppUTestExt/GMockTest.cpp \
+	tests/CppUTestExt/GTest1Test.cpp \
+	tests/CppUTestExt/GTest2ConvertorTest.cpp \
+	tests/CppUTestExt/MemoryReportAllocatorTest.cpp \
+	tests/CppUTestExt/MemoryReporterPluginTest.cpp \
+	tests/CppUTestExt/MemoryReportFormatterTest.cpp \
+	tests/CppUTestExt/MockActualCallTest.cpp \
+	tests/CppUTestExt/MockCheatSheetTest.cpp \
+	tests/CppUTestExt/MockExpectedCallTest.cpp \
+	tests/CppUTestExt/MockExpectedFunctionsListTest.cpp \
+	tests/CppUTestExt/MockFailureTest.cpp \
+	tests/CppUTestExt/MockPluginTest.cpp \
+	tests/CppUTestExt/MockSupportTest.cpp \
+	tests/CppUTestExt/MockSupport_cTest.cpp \
+	tests/CppUTestExt/MockSupport_cTestCFile.c \
+	tests/CppUTestExt/OrderedTestTest.cpp
 
 
 #GTestTests_CPPFLAGS = $(lib_libCppUTestExt_a_CPPFLAGS)
@@ -716,23 +715,23 @@ distclean-compile:
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-AllTests.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-TestCodeMemoryReportFormatter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-TestGMock.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-TestGTest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-TestGTestConvertor.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-TestMemoryReportAllocator.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-TestMemoryReportFormatter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-TestMemoryReporterPlugin.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-TestMockActualFunctionCall.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-TestMockCheatSheet.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-TestMockExpectedFunctionCall.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-TestMockExpectedFunctionsList.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-TestMockFailure.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-TestMockPlugin.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-TestMockSupport.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-TestMockSupport_c.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-TestMockSupport_cCFile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-TestOrderedTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-CodeMemoryReportFormatterTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-GMockTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-GTest1Test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-GTest2ConvertorTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-MemoryReportAllocatorTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-MemoryReportFormatterTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-MemoryReporterPluginTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-MockActualCallTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-MockCheatSheetTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-MockExpectedCallTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-MockExpectedFunctionsListTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-MockFailureTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-MockPluginTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-MockSupportTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-MockSupport_cTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-MockSupport_cTestCFile.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestExtTests-OrderedTestTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestTests-AllTests.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestTests-AllocLetTestFree.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUTestTests-AllocLetTestFreeTest.Po@am__quote@
@@ -816,37 +815,37 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
-CppUTestExtTests-TestMockSupport_cCFile.o: tests/CppUTestExt/TestMockSupport_cCFile.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CFLAGS) $(CFLAGS) -MT CppUTestExtTests-TestMockSupport_cCFile.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestMockSupport_cCFile.Tpo -c -o CppUTestExtTests-TestMockSupport_cCFile.o `test -f 'tests/CppUTestExt/TestMockSupport_cCFile.c' || echo '$(srcdir)/'`tests/CppUTestExt/TestMockSupport_cCFile.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestMockSupport_cCFile.Tpo $(DEPDIR)/CppUTestExtTests-TestMockSupport_cCFile.Po
+CppUTestExtTests-MockSupport_cTestCFile.o: tests/CppUTestExt/MockSupport_cTestCFile.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CFLAGS) $(CFLAGS) -MT CppUTestExtTests-MockSupport_cTestCFile.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-MockSupport_cTestCFile.Tpo -c -o CppUTestExtTests-MockSupport_cTestCFile.o `test -f 'tests/CppUTestExt/MockSupport_cTestCFile.c' || echo '$(srcdir)/'`tests/CppUTestExt/MockSupport_cTestCFile.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-MockSupport_cTestCFile.Tpo $(DEPDIR)/CppUTestExtTests-MockSupport_cTestCFile.Po
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/CppUTestExt/TestMockSupport_cCFile.c' object='CppUTestExtTests-TestMockSupport_cCFile.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/CppUTestExt/MockSupport_cTestCFile.c' object='CppUTestExtTests-MockSupport_cTestCFile.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CFLAGS) $(CFLAGS) -c -o CppUTestExtTests-TestMockSupport_cCFile.o `test -f 'tests/CppUTestExt/TestMockSupport_cCFile.c' || echo '$(srcdir)/'`tests/CppUTestExt/TestMockSupport_cCFile.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CFLAGS) $(CFLAGS) -c -o CppUTestExtTests-MockSupport_cTestCFile.o `test -f 'tests/CppUTestExt/MockSupport_cTestCFile.c' || echo '$(srcdir)/'`tests/CppUTestExt/MockSupport_cTestCFile.c
 
-CppUTestExtTests-TestMockSupport_cCFile.obj: tests/CppUTestExt/TestMockSupport_cCFile.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CFLAGS) $(CFLAGS) -MT CppUTestExtTests-TestMockSupport_cCFile.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestMockSupport_cCFile.Tpo -c -o CppUTestExtTests-TestMockSupport_cCFile.obj `if test -f 'tests/CppUTestExt/TestMockSupport_cCFile.c'; then $(CYGPATH_W) 'tests/CppUTestExt/TestMockSupport_cCFile.c'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestMockSupport_cCFile.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestMockSupport_cCFile.Tpo $(DEPDIR)/CppUTestExtTests-TestMockSupport_cCFile.Po
+CppUTestExtTests-MockSupport_cTestCFile.obj: tests/CppUTestExt/MockSupport_cTestCFile.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CFLAGS) $(CFLAGS) -MT CppUTestExtTests-MockSupport_cTestCFile.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-MockSupport_cTestCFile.Tpo -c -o CppUTestExtTests-MockSupport_cTestCFile.obj `if test -f 'tests/CppUTestExt/MockSupport_cTestCFile.c'; then $(CYGPATH_W) 'tests/CppUTestExt/MockSupport_cTestCFile.c'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/MockSupport_cTestCFile.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-MockSupport_cTestCFile.Tpo $(DEPDIR)/CppUTestExtTests-MockSupport_cTestCFile.Po
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/CppUTestExt/TestMockSupport_cCFile.c' object='CppUTestExtTests-TestMockSupport_cCFile.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/CppUTestExt/MockSupport_cTestCFile.c' object='CppUTestExtTests-MockSupport_cTestCFile.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CFLAGS) $(CFLAGS) -c -o CppUTestExtTests-TestMockSupport_cCFile.obj `if test -f 'tests/CppUTestExt/TestMockSupport_cCFile.c'; then $(CYGPATH_W) 'tests/CppUTestExt/TestMockSupport_cCFile.c'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestMockSupport_cCFile.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CFLAGS) $(CFLAGS) -c -o CppUTestExtTests-MockSupport_cTestCFile.obj `if test -f 'tests/CppUTestExt/MockSupport_cTestCFile.c'; then $(CYGPATH_W) 'tests/CppUTestExt/MockSupport_cTestCFile.c'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/MockSupport_cTestCFile.c'; fi`
 
-CppUTestTests-TestHarness_cTestCFile.o: tests/TestHarness_cTestCFile.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CFLAGS) $(CFLAGS) -MT CppUTestTests-TestHarness_cTestCFile.o -MD -MP -MF $(DEPDIR)/CppUTestTests-TestHarness_cTestCFile.Tpo -c -o CppUTestTests-TestHarness_cTestCFile.o `test -f 'tests/TestHarness_cTestCFile.c' || echo '$(srcdir)/'`tests/TestHarness_cTestCFile.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-TestHarness_cTestCFile.Tpo $(DEPDIR)/CppUTestTests-TestHarness_cTestCFile.Po
+CppUTestTests-AllocationInCFile.o: tests/AllocationInCFile.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CFLAGS) $(CFLAGS) -MT CppUTestTests-AllocationInCFile.o -MD -MP -MF $(DEPDIR)/CppUTestTests-AllocationInCFile.Tpo -c -o CppUTestTests-AllocationInCFile.o `test -f 'tests/AllocationInCFile.c' || echo '$(srcdir)/'`tests/AllocationInCFile.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-AllocationInCFile.Tpo $(DEPDIR)/CppUTestTests-AllocationInCFile.Po
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/TestHarness_cTestCFile.c' object='CppUTestTests-TestHarness_cTestCFile.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/AllocationInCFile.c' object='CppUTestTests-AllocationInCFile.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CFLAGS) $(CFLAGS) -c -o CppUTestTests-TestHarness_cTestCFile.o `test -f 'tests/TestHarness_cTestCFile.c' || echo '$(srcdir)/'`tests/TestHarness_cTestCFile.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CFLAGS) $(CFLAGS) -c -o CppUTestTests-AllocationInCFile.o `test -f 'tests/AllocationInCFile.c' || echo '$(srcdir)/'`tests/AllocationInCFile.c
 
-CppUTestTests-TestHarness_cTestCFile.obj: tests/TestHarness_cTestCFile.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CFLAGS) $(CFLAGS) -MT CppUTestTests-TestHarness_cTestCFile.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-TestHarness_cTestCFile.Tpo -c -o CppUTestTests-TestHarness_cTestCFile.obj `if test -f 'tests/TestHarness_cTestCFile.c'; then $(CYGPATH_W) 'tests/TestHarness_cTestCFile.c'; else $(CYGPATH_W) '$(srcdir)/tests/TestHarness_cTestCFile.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-TestHarness_cTestCFile.Tpo $(DEPDIR)/CppUTestTests-TestHarness_cTestCFile.Po
+CppUTestTests-AllocationInCFile.obj: tests/AllocationInCFile.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CFLAGS) $(CFLAGS) -MT CppUTestTests-AllocationInCFile.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-AllocationInCFile.Tpo -c -o CppUTestTests-AllocationInCFile.obj `if test -f 'tests/AllocationInCFile.c'; then $(CYGPATH_W) 'tests/AllocationInCFile.c'; else $(CYGPATH_W) '$(srcdir)/tests/AllocationInCFile.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-AllocationInCFile.Tpo $(DEPDIR)/CppUTestTests-AllocationInCFile.Po
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/TestHarness_cTestCFile.c' object='CppUTestTests-TestHarness_cTestCFile.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/AllocationInCFile.c' object='CppUTestTests-AllocationInCFile.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CFLAGS) $(CFLAGS) -c -o CppUTestTests-TestHarness_cTestCFile.obj `if test -f 'tests/TestHarness_cTestCFile.c'; then $(CYGPATH_W) 'tests/TestHarness_cTestCFile.c'; else $(CYGPATH_W) '$(srcdir)/tests/TestHarness_cTestCFile.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CFLAGS) $(CFLAGS) -c -o CppUTestTests-AllocationInCFile.obj `if test -f 'tests/AllocationInCFile.c'; then $(CYGPATH_W) 'tests/AllocationInCFile.c'; else $(CYGPATH_W) '$(srcdir)/tests/AllocationInCFile.c'; fi`
 
 CppUTestTests-AllocLetTestFree.o: tests/AllocLetTestFree.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CFLAGS) $(CFLAGS) -MT CppUTestTests-AllocLetTestFree.o -MD -MP -MF $(DEPDIR)/CppUTestTests-AllocLetTestFree.Tpo -c -o CppUTestTests-AllocLetTestFree.o `test -f 'tests/AllocLetTestFree.c' || echo '$(srcdir)/'`tests/AllocLetTestFree.c
@@ -864,21 +863,21 @@ CppUTestTests-AllocLetTestFree.obj: tests/AllocLetTestFree.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CFLAGS) $(CFLAGS) -c -o CppUTestTests-AllocLetTestFree.obj `if test -f 'tests/AllocLetTestFree.c'; then $(CYGPATH_W) 'tests/AllocLetTestFree.c'; else $(CYGPATH_W) '$(srcdir)/tests/AllocLetTestFree.c'; fi`
 
-CppUTestTests-AllocationInCFile.o: tests/AllocationInCFile.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CFLAGS) $(CFLAGS) -MT CppUTestTests-AllocationInCFile.o -MD -MP -MF $(DEPDIR)/CppUTestTests-AllocationInCFile.Tpo -c -o CppUTestTests-AllocationInCFile.o `test -f 'tests/AllocationInCFile.c' || echo '$(srcdir)/'`tests/AllocationInCFile.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-AllocationInCFile.Tpo $(DEPDIR)/CppUTestTests-AllocationInCFile.Po
+CppUTestTests-TestHarness_cTestCFile.o: tests/TestHarness_cTestCFile.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CFLAGS) $(CFLAGS) -MT CppUTestTests-TestHarness_cTestCFile.o -MD -MP -MF $(DEPDIR)/CppUTestTests-TestHarness_cTestCFile.Tpo -c -o CppUTestTests-TestHarness_cTestCFile.o `test -f 'tests/TestHarness_cTestCFile.c' || echo '$(srcdir)/'`tests/TestHarness_cTestCFile.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-TestHarness_cTestCFile.Tpo $(DEPDIR)/CppUTestTests-TestHarness_cTestCFile.Po
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/AllocationInCFile.c' object='CppUTestTests-AllocationInCFile.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/TestHarness_cTestCFile.c' object='CppUTestTests-TestHarness_cTestCFile.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CFLAGS) $(CFLAGS) -c -o CppUTestTests-AllocationInCFile.o `test -f 'tests/AllocationInCFile.c' || echo '$(srcdir)/'`tests/AllocationInCFile.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CFLAGS) $(CFLAGS) -c -o CppUTestTests-TestHarness_cTestCFile.o `test -f 'tests/TestHarness_cTestCFile.c' || echo '$(srcdir)/'`tests/TestHarness_cTestCFile.c
 
-CppUTestTests-AllocationInCFile.obj: tests/AllocationInCFile.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CFLAGS) $(CFLAGS) -MT CppUTestTests-AllocationInCFile.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-AllocationInCFile.Tpo -c -o CppUTestTests-AllocationInCFile.obj `if test -f 'tests/AllocationInCFile.c'; then $(CYGPATH_W) 'tests/AllocationInCFile.c'; else $(CYGPATH_W) '$(srcdir)/tests/AllocationInCFile.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-AllocationInCFile.Tpo $(DEPDIR)/CppUTestTests-AllocationInCFile.Po
+CppUTestTests-TestHarness_cTestCFile.obj: tests/TestHarness_cTestCFile.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CFLAGS) $(CFLAGS) -MT CppUTestTests-TestHarness_cTestCFile.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-TestHarness_cTestCFile.Tpo -c -o CppUTestTests-TestHarness_cTestCFile.obj `if test -f 'tests/TestHarness_cTestCFile.c'; then $(CYGPATH_W) 'tests/TestHarness_cTestCFile.c'; else $(CYGPATH_W) '$(srcdir)/tests/TestHarness_cTestCFile.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-TestHarness_cTestCFile.Tpo $(DEPDIR)/CppUTestTests-TestHarness_cTestCFile.Po
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/AllocationInCFile.c' object='CppUTestTests-AllocationInCFile.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/TestHarness_cTestCFile.c' object='CppUTestTests-TestHarness_cTestCFile.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CFLAGS) $(CFLAGS) -c -o CppUTestTests-AllocationInCFile.obj `if test -f 'tests/AllocationInCFile.c'; then $(CYGPATH_W) 'tests/AllocationInCFile.c'; else $(CYGPATH_W) '$(srcdir)/tests/AllocationInCFile.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CFLAGS) $(CFLAGS) -c -o CppUTestTests-TestHarness_cTestCFile.obj `if test -f 'tests/TestHarness_cTestCFile.c'; then $(CYGPATH_W) 'tests/TestHarness_cTestCFile.c'; else $(CYGPATH_W) '$(srcdir)/tests/TestHarness_cTestCFile.c'; fi`
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -920,69 +919,69 @@ lib_libCppUTest_a-CommandLineArguments.obj: src/CppUTest/CommandLineArguments.cp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-CommandLineArguments.obj `if test -f 'src/CppUTest/CommandLineArguments.cpp'; then $(CYGPATH_W) 'src/CppUTest/CommandLineArguments.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/CommandLineArguments.cpp'; fi`
 
-lib_libCppUTest_a-MemoryLeakWarningPlugin.o: src/CppUTest/MemoryLeakWarningPlugin.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-MemoryLeakWarningPlugin.o -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-MemoryLeakWarningPlugin.Tpo -c -o lib_libCppUTest_a-MemoryLeakWarningPlugin.o `test -f 'src/CppUTest/MemoryLeakWarningPlugin.cpp' || echo '$(srcdir)/'`src/CppUTest/MemoryLeakWarningPlugin.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-MemoryLeakWarningPlugin.Tpo $(DEPDIR)/lib_libCppUTest_a-MemoryLeakWarningPlugin.Po
+lib_libCppUTest_a-CommandLineTestRunner.o: src/CppUTest/CommandLineTestRunner.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-CommandLineTestRunner.o -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-CommandLineTestRunner.Tpo -c -o lib_libCppUTest_a-CommandLineTestRunner.o `test -f 'src/CppUTest/CommandLineTestRunner.cpp' || echo '$(srcdir)/'`src/CppUTest/CommandLineTestRunner.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-CommandLineTestRunner.Tpo $(DEPDIR)/lib_libCppUTest_a-CommandLineTestRunner.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/MemoryLeakWarningPlugin.cpp' object='lib_libCppUTest_a-MemoryLeakWarningPlugin.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/CommandLineTestRunner.cpp' object='lib_libCppUTest_a-CommandLineTestRunner.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-MemoryLeakWarningPlugin.o `test -f 'src/CppUTest/MemoryLeakWarningPlugin.cpp' || echo '$(srcdir)/'`src/CppUTest/MemoryLeakWarningPlugin.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-CommandLineTestRunner.o `test -f 'src/CppUTest/CommandLineTestRunner.cpp' || echo '$(srcdir)/'`src/CppUTest/CommandLineTestRunner.cpp
 
-lib_libCppUTest_a-MemoryLeakWarningPlugin.obj: src/CppUTest/MemoryLeakWarningPlugin.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-MemoryLeakWarningPlugin.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-MemoryLeakWarningPlugin.Tpo -c -o lib_libCppUTest_a-MemoryLeakWarningPlugin.obj `if test -f 'src/CppUTest/MemoryLeakWarningPlugin.cpp'; then $(CYGPATH_W) 'src/CppUTest/MemoryLeakWarningPlugin.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/MemoryLeakWarningPlugin.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-MemoryLeakWarningPlugin.Tpo $(DEPDIR)/lib_libCppUTest_a-MemoryLeakWarningPlugin.Po
+lib_libCppUTest_a-CommandLineTestRunner.obj: src/CppUTest/CommandLineTestRunner.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-CommandLineTestRunner.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-CommandLineTestRunner.Tpo -c -o lib_libCppUTest_a-CommandLineTestRunner.obj `if test -f 'src/CppUTest/CommandLineTestRunner.cpp'; then $(CYGPATH_W) 'src/CppUTest/CommandLineTestRunner.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/CommandLineTestRunner.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-CommandLineTestRunner.Tpo $(DEPDIR)/lib_libCppUTest_a-CommandLineTestRunner.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/MemoryLeakWarningPlugin.cpp' object='lib_libCppUTest_a-MemoryLeakWarningPlugin.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/CommandLineTestRunner.cpp' object='lib_libCppUTest_a-CommandLineTestRunner.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-MemoryLeakWarningPlugin.obj `if test -f 'src/CppUTest/MemoryLeakWarningPlugin.cpp'; then $(CYGPATH_W) 'src/CppUTest/MemoryLeakWarningPlugin.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/MemoryLeakWarningPlugin.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-CommandLineTestRunner.obj `if test -f 'src/CppUTest/CommandLineTestRunner.cpp'; then $(CYGPATH_W) 'src/CppUTest/CommandLineTestRunner.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/CommandLineTestRunner.cpp'; fi`
 
-lib_libCppUTest_a-TestHarness_c.o: src/CppUTest/TestHarness_c.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-TestHarness_c.o -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-TestHarness_c.Tpo -c -o lib_libCppUTest_a-TestHarness_c.o `test -f 'src/CppUTest/TestHarness_c.cpp' || echo '$(srcdir)/'`src/CppUTest/TestHarness_c.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-TestHarness_c.Tpo $(DEPDIR)/lib_libCppUTest_a-TestHarness_c.Po
+lib_libCppUTest_a-JUnitTestOutput.o: src/CppUTest/JUnitTestOutput.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-JUnitTestOutput.o -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-JUnitTestOutput.Tpo -c -o lib_libCppUTest_a-JUnitTestOutput.o `test -f 'src/CppUTest/JUnitTestOutput.cpp' || echo '$(srcdir)/'`src/CppUTest/JUnitTestOutput.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-JUnitTestOutput.Tpo $(DEPDIR)/lib_libCppUTest_a-JUnitTestOutput.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/TestHarness_c.cpp' object='lib_libCppUTest_a-TestHarness_c.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/JUnitTestOutput.cpp' object='lib_libCppUTest_a-JUnitTestOutput.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-TestHarness_c.o `test -f 'src/CppUTest/TestHarness_c.cpp' || echo '$(srcdir)/'`src/CppUTest/TestHarness_c.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-JUnitTestOutput.o `test -f 'src/CppUTest/JUnitTestOutput.cpp' || echo '$(srcdir)/'`src/CppUTest/JUnitTestOutput.cpp
 
-lib_libCppUTest_a-TestHarness_c.obj: src/CppUTest/TestHarness_c.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-TestHarness_c.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-TestHarness_c.Tpo -c -o lib_libCppUTest_a-TestHarness_c.obj `if test -f 'src/CppUTest/TestHarness_c.cpp'; then $(CYGPATH_W) 'src/CppUTest/TestHarness_c.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/TestHarness_c.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-TestHarness_c.Tpo $(DEPDIR)/lib_libCppUTest_a-TestHarness_c.Po
+lib_libCppUTest_a-JUnitTestOutput.obj: src/CppUTest/JUnitTestOutput.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-JUnitTestOutput.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-JUnitTestOutput.Tpo -c -o lib_libCppUTest_a-JUnitTestOutput.obj `if test -f 'src/CppUTest/JUnitTestOutput.cpp'; then $(CYGPATH_W) 'src/CppUTest/JUnitTestOutput.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/JUnitTestOutput.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-JUnitTestOutput.Tpo $(DEPDIR)/lib_libCppUTest_a-JUnitTestOutput.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/TestHarness_c.cpp' object='lib_libCppUTest_a-TestHarness_c.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/JUnitTestOutput.cpp' object='lib_libCppUTest_a-JUnitTestOutput.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-TestHarness_c.obj `if test -f 'src/CppUTest/TestHarness_c.cpp'; then $(CYGPATH_W) 'src/CppUTest/TestHarness_c.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/TestHarness_c.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-JUnitTestOutput.obj `if test -f 'src/CppUTest/JUnitTestOutput.cpp'; then $(CYGPATH_W) 'src/CppUTest/JUnitTestOutput.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/JUnitTestOutput.cpp'; fi`
 
-lib_libCppUTest_a-TestRegistry.o: src/CppUTest/TestRegistry.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-TestRegistry.o -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-TestRegistry.Tpo -c -o lib_libCppUTest_a-TestRegistry.o `test -f 'src/CppUTest/TestRegistry.cpp' || echo '$(srcdir)/'`src/CppUTest/TestRegistry.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-TestRegistry.Tpo $(DEPDIR)/lib_libCppUTest_a-TestRegistry.Po
+lib_libCppUTest_a-MemoryLeakDetector.o: src/CppUTest/MemoryLeakDetector.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-MemoryLeakDetector.o -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-MemoryLeakDetector.Tpo -c -o lib_libCppUTest_a-MemoryLeakDetector.o `test -f 'src/CppUTest/MemoryLeakDetector.cpp' || echo '$(srcdir)/'`src/CppUTest/MemoryLeakDetector.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-MemoryLeakDetector.Tpo $(DEPDIR)/lib_libCppUTest_a-MemoryLeakDetector.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/TestRegistry.cpp' object='lib_libCppUTest_a-TestRegistry.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/MemoryLeakDetector.cpp' object='lib_libCppUTest_a-MemoryLeakDetector.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-TestRegistry.o `test -f 'src/CppUTest/TestRegistry.cpp' || echo '$(srcdir)/'`src/CppUTest/TestRegistry.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-MemoryLeakDetector.o `test -f 'src/CppUTest/MemoryLeakDetector.cpp' || echo '$(srcdir)/'`src/CppUTest/MemoryLeakDetector.cpp
 
-lib_libCppUTest_a-TestRegistry.obj: src/CppUTest/TestRegistry.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-TestRegistry.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-TestRegistry.Tpo -c -o lib_libCppUTest_a-TestRegistry.obj `if test -f 'src/CppUTest/TestRegistry.cpp'; then $(CYGPATH_W) 'src/CppUTest/TestRegistry.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/TestRegistry.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-TestRegistry.Tpo $(DEPDIR)/lib_libCppUTest_a-TestRegistry.Po
+lib_libCppUTest_a-MemoryLeakDetector.obj: src/CppUTest/MemoryLeakDetector.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-MemoryLeakDetector.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-MemoryLeakDetector.Tpo -c -o lib_libCppUTest_a-MemoryLeakDetector.obj `if test -f 'src/CppUTest/MemoryLeakDetector.cpp'; then $(CYGPATH_W) 'src/CppUTest/MemoryLeakDetector.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/MemoryLeakDetector.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-MemoryLeakDetector.Tpo $(DEPDIR)/lib_libCppUTest_a-MemoryLeakDetector.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/TestRegistry.cpp' object='lib_libCppUTest_a-TestRegistry.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/MemoryLeakDetector.cpp' object='lib_libCppUTest_a-MemoryLeakDetector.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-TestRegistry.obj `if test -f 'src/CppUTest/TestRegistry.cpp'; then $(CYGPATH_W) 'src/CppUTest/TestRegistry.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/TestRegistry.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-MemoryLeakDetector.obj `if test -f 'src/CppUTest/MemoryLeakDetector.cpp'; then $(CYGPATH_W) 'src/CppUTest/MemoryLeakDetector.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/MemoryLeakDetector.cpp'; fi`
 
-lib_libCppUTest_a-CommandLineTestRunner.o: src/CppUTest/CommandLineTestRunner.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-CommandLineTestRunner.o -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-CommandLineTestRunner.Tpo -c -o lib_libCppUTest_a-CommandLineTestRunner.o `test -f 'src/CppUTest/CommandLineTestRunner.cpp' || echo '$(srcdir)/'`src/CppUTest/CommandLineTestRunner.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-CommandLineTestRunner.Tpo $(DEPDIR)/lib_libCppUTest_a-CommandLineTestRunner.Po
+lib_libCppUTest_a-MemoryLeakWarningPlugin.o: src/CppUTest/MemoryLeakWarningPlugin.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-MemoryLeakWarningPlugin.o -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-MemoryLeakWarningPlugin.Tpo -c -o lib_libCppUTest_a-MemoryLeakWarningPlugin.o `test -f 'src/CppUTest/MemoryLeakWarningPlugin.cpp' || echo '$(srcdir)/'`src/CppUTest/MemoryLeakWarningPlugin.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-MemoryLeakWarningPlugin.Tpo $(DEPDIR)/lib_libCppUTest_a-MemoryLeakWarningPlugin.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/CommandLineTestRunner.cpp' object='lib_libCppUTest_a-CommandLineTestRunner.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/MemoryLeakWarningPlugin.cpp' object='lib_libCppUTest_a-MemoryLeakWarningPlugin.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-CommandLineTestRunner.o `test -f 'src/CppUTest/CommandLineTestRunner.cpp' || echo '$(srcdir)/'`src/CppUTest/CommandLineTestRunner.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-MemoryLeakWarningPlugin.o `test -f 'src/CppUTest/MemoryLeakWarningPlugin.cpp' || echo '$(srcdir)/'`src/CppUTest/MemoryLeakWarningPlugin.cpp
 
-lib_libCppUTest_a-CommandLineTestRunner.obj: src/CppUTest/CommandLineTestRunner.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-CommandLineTestRunner.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-CommandLineTestRunner.Tpo -c -o lib_libCppUTest_a-CommandLineTestRunner.obj `if test -f 'src/CppUTest/CommandLineTestRunner.cpp'; then $(CYGPATH_W) 'src/CppUTest/CommandLineTestRunner.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/CommandLineTestRunner.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-CommandLineTestRunner.Tpo $(DEPDIR)/lib_libCppUTest_a-CommandLineTestRunner.Po
+lib_libCppUTest_a-MemoryLeakWarningPlugin.obj: src/CppUTest/MemoryLeakWarningPlugin.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-MemoryLeakWarningPlugin.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-MemoryLeakWarningPlugin.Tpo -c -o lib_libCppUTest_a-MemoryLeakWarningPlugin.obj `if test -f 'src/CppUTest/MemoryLeakWarningPlugin.cpp'; then $(CYGPATH_W) 'src/CppUTest/MemoryLeakWarningPlugin.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/MemoryLeakWarningPlugin.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-MemoryLeakWarningPlugin.Tpo $(DEPDIR)/lib_libCppUTest_a-MemoryLeakWarningPlugin.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/CommandLineTestRunner.cpp' object='lib_libCppUTest_a-CommandLineTestRunner.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/MemoryLeakWarningPlugin.cpp' object='lib_libCppUTest_a-MemoryLeakWarningPlugin.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-CommandLineTestRunner.obj `if test -f 'src/CppUTest/CommandLineTestRunner.cpp'; then $(CYGPATH_W) 'src/CppUTest/CommandLineTestRunner.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/CommandLineTestRunner.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-MemoryLeakWarningPlugin.obj `if test -f 'src/CppUTest/MemoryLeakWarningPlugin.cpp'; then $(CYGPATH_W) 'src/CppUTest/MemoryLeakWarningPlugin.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/MemoryLeakWarningPlugin.cpp'; fi`
 
 lib_libCppUTest_a-SimpleString.o: src/CppUTest/SimpleString.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-SimpleString.o -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-SimpleString.Tpo -c -o lib_libCppUTest_a-SimpleString.o `test -f 'src/CppUTest/SimpleString.cpp' || echo '$(srcdir)/'`src/CppUTest/SimpleString.cpp
@@ -1000,69 +999,69 @@ lib_libCppUTest_a-SimpleString.obj: src/CppUTest/SimpleString.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-SimpleString.obj `if test -f 'src/CppUTest/SimpleString.cpp'; then $(CYGPATH_W) 'src/CppUTest/SimpleString.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/SimpleString.cpp'; fi`
 
-lib_libCppUTest_a-TestMemoryAllocator.o: src/CppUTest/TestMemoryAllocator.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-TestMemoryAllocator.o -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-TestMemoryAllocator.Tpo -c -o lib_libCppUTest_a-TestMemoryAllocator.o `test -f 'src/CppUTest/TestMemoryAllocator.cpp' || echo '$(srcdir)/'`src/CppUTest/TestMemoryAllocator.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-TestMemoryAllocator.Tpo $(DEPDIR)/lib_libCppUTest_a-TestMemoryAllocator.Po
+lib_libCppUTest_a-TestFailure.o: src/CppUTest/TestFailure.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-TestFailure.o -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-TestFailure.Tpo -c -o lib_libCppUTest_a-TestFailure.o `test -f 'src/CppUTest/TestFailure.cpp' || echo '$(srcdir)/'`src/CppUTest/TestFailure.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-TestFailure.Tpo $(DEPDIR)/lib_libCppUTest_a-TestFailure.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/TestMemoryAllocator.cpp' object='lib_libCppUTest_a-TestMemoryAllocator.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/TestFailure.cpp' object='lib_libCppUTest_a-TestFailure.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-TestMemoryAllocator.o `test -f 'src/CppUTest/TestMemoryAllocator.cpp' || echo '$(srcdir)/'`src/CppUTest/TestMemoryAllocator.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-TestFailure.o `test -f 'src/CppUTest/TestFailure.cpp' || echo '$(srcdir)/'`src/CppUTest/TestFailure.cpp
 
-lib_libCppUTest_a-TestMemoryAllocator.obj: src/CppUTest/TestMemoryAllocator.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-TestMemoryAllocator.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-TestMemoryAllocator.Tpo -c -o lib_libCppUTest_a-TestMemoryAllocator.obj `if test -f 'src/CppUTest/TestMemoryAllocator.cpp'; then $(CYGPATH_W) 'src/CppUTest/TestMemoryAllocator.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/TestMemoryAllocator.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-TestMemoryAllocator.Tpo $(DEPDIR)/lib_libCppUTest_a-TestMemoryAllocator.Po
+lib_libCppUTest_a-TestFailure.obj: src/CppUTest/TestFailure.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-TestFailure.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-TestFailure.Tpo -c -o lib_libCppUTest_a-TestFailure.obj `if test -f 'src/CppUTest/TestFailure.cpp'; then $(CYGPATH_W) 'src/CppUTest/TestFailure.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/TestFailure.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-TestFailure.Tpo $(DEPDIR)/lib_libCppUTest_a-TestFailure.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/TestMemoryAllocator.cpp' object='lib_libCppUTest_a-TestMemoryAllocator.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/TestFailure.cpp' object='lib_libCppUTest_a-TestFailure.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-TestMemoryAllocator.obj `if test -f 'src/CppUTest/TestMemoryAllocator.cpp'; then $(CYGPATH_W) 'src/CppUTest/TestMemoryAllocator.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/TestMemoryAllocator.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-TestFailure.obj `if test -f 'src/CppUTest/TestFailure.cpp'; then $(CYGPATH_W) 'src/CppUTest/TestFailure.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/TestFailure.cpp'; fi`
 
-lib_libCppUTest_a-TestResult.o: src/CppUTest/TestResult.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-TestResult.o -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-TestResult.Tpo -c -o lib_libCppUTest_a-TestResult.o `test -f 'src/CppUTest/TestResult.cpp' || echo '$(srcdir)/'`src/CppUTest/TestResult.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-TestResult.Tpo $(DEPDIR)/lib_libCppUTest_a-TestResult.Po
+lib_libCppUTest_a-TestFilter.o: src/CppUTest/TestFilter.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-TestFilter.o -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-TestFilter.Tpo -c -o lib_libCppUTest_a-TestFilter.o `test -f 'src/CppUTest/TestFilter.cpp' || echo '$(srcdir)/'`src/CppUTest/TestFilter.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-TestFilter.Tpo $(DEPDIR)/lib_libCppUTest_a-TestFilter.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/TestResult.cpp' object='lib_libCppUTest_a-TestResult.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/TestFilter.cpp' object='lib_libCppUTest_a-TestFilter.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-TestResult.o `test -f 'src/CppUTest/TestResult.cpp' || echo '$(srcdir)/'`src/CppUTest/TestResult.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-TestFilter.o `test -f 'src/CppUTest/TestFilter.cpp' || echo '$(srcdir)/'`src/CppUTest/TestFilter.cpp
 
-lib_libCppUTest_a-TestResult.obj: src/CppUTest/TestResult.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-TestResult.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-TestResult.Tpo -c -o lib_libCppUTest_a-TestResult.obj `if test -f 'src/CppUTest/TestResult.cpp'; then $(CYGPATH_W) 'src/CppUTest/TestResult.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/TestResult.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-TestResult.Tpo $(DEPDIR)/lib_libCppUTest_a-TestResult.Po
+lib_libCppUTest_a-TestFilter.obj: src/CppUTest/TestFilter.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-TestFilter.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-TestFilter.Tpo -c -o lib_libCppUTest_a-TestFilter.obj `if test -f 'src/CppUTest/TestFilter.cpp'; then $(CYGPATH_W) 'src/CppUTest/TestFilter.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/TestFilter.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-TestFilter.Tpo $(DEPDIR)/lib_libCppUTest_a-TestFilter.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/TestResult.cpp' object='lib_libCppUTest_a-TestResult.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/TestFilter.cpp' object='lib_libCppUTest_a-TestFilter.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-TestResult.obj `if test -f 'src/CppUTest/TestResult.cpp'; then $(CYGPATH_W) 'src/CppUTest/TestResult.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/TestResult.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-TestFilter.obj `if test -f 'src/CppUTest/TestFilter.cpp'; then $(CYGPATH_W) 'src/CppUTest/TestFilter.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/TestFilter.cpp'; fi`
 
-lib_libCppUTest_a-JUnitTestOutput.o: src/CppUTest/JUnitTestOutput.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-JUnitTestOutput.o -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-JUnitTestOutput.Tpo -c -o lib_libCppUTest_a-JUnitTestOutput.o `test -f 'src/CppUTest/JUnitTestOutput.cpp' || echo '$(srcdir)/'`src/CppUTest/JUnitTestOutput.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-JUnitTestOutput.Tpo $(DEPDIR)/lib_libCppUTest_a-JUnitTestOutput.Po
+lib_libCppUTest_a-TestHarness_c.o: src/CppUTest/TestHarness_c.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-TestHarness_c.o -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-TestHarness_c.Tpo -c -o lib_libCppUTest_a-TestHarness_c.o `test -f 'src/CppUTest/TestHarness_c.cpp' || echo '$(srcdir)/'`src/CppUTest/TestHarness_c.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-TestHarness_c.Tpo $(DEPDIR)/lib_libCppUTest_a-TestHarness_c.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/JUnitTestOutput.cpp' object='lib_libCppUTest_a-JUnitTestOutput.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/TestHarness_c.cpp' object='lib_libCppUTest_a-TestHarness_c.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-JUnitTestOutput.o `test -f 'src/CppUTest/JUnitTestOutput.cpp' || echo '$(srcdir)/'`src/CppUTest/JUnitTestOutput.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-TestHarness_c.o `test -f 'src/CppUTest/TestHarness_c.cpp' || echo '$(srcdir)/'`src/CppUTest/TestHarness_c.cpp
 
-lib_libCppUTest_a-JUnitTestOutput.obj: src/CppUTest/JUnitTestOutput.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-JUnitTestOutput.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-JUnitTestOutput.Tpo -c -o lib_libCppUTest_a-JUnitTestOutput.obj `if test -f 'src/CppUTest/JUnitTestOutput.cpp'; then $(CYGPATH_W) 'src/CppUTest/JUnitTestOutput.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/JUnitTestOutput.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-JUnitTestOutput.Tpo $(DEPDIR)/lib_libCppUTest_a-JUnitTestOutput.Po
+lib_libCppUTest_a-TestHarness_c.obj: src/CppUTest/TestHarness_c.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-TestHarness_c.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-TestHarness_c.Tpo -c -o lib_libCppUTest_a-TestHarness_c.obj `if test -f 'src/CppUTest/TestHarness_c.cpp'; then $(CYGPATH_W) 'src/CppUTest/TestHarness_c.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/TestHarness_c.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-TestHarness_c.Tpo $(DEPDIR)/lib_libCppUTest_a-TestHarness_c.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/JUnitTestOutput.cpp' object='lib_libCppUTest_a-JUnitTestOutput.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/TestHarness_c.cpp' object='lib_libCppUTest_a-TestHarness_c.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-JUnitTestOutput.obj `if test -f 'src/CppUTest/JUnitTestOutput.cpp'; then $(CYGPATH_W) 'src/CppUTest/JUnitTestOutput.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/JUnitTestOutput.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-TestHarness_c.obj `if test -f 'src/CppUTest/TestHarness_c.cpp'; then $(CYGPATH_W) 'src/CppUTest/TestHarness_c.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/TestHarness_c.cpp'; fi`
 
-lib_libCppUTest_a-TestFailure.o: src/CppUTest/TestFailure.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-TestFailure.o -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-TestFailure.Tpo -c -o lib_libCppUTest_a-TestFailure.o `test -f 'src/CppUTest/TestFailure.cpp' || echo '$(srcdir)/'`src/CppUTest/TestFailure.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-TestFailure.Tpo $(DEPDIR)/lib_libCppUTest_a-TestFailure.Po
+lib_libCppUTest_a-TestMemoryAllocator.o: src/CppUTest/TestMemoryAllocator.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-TestMemoryAllocator.o -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-TestMemoryAllocator.Tpo -c -o lib_libCppUTest_a-TestMemoryAllocator.o `test -f 'src/CppUTest/TestMemoryAllocator.cpp' || echo '$(srcdir)/'`src/CppUTest/TestMemoryAllocator.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-TestMemoryAllocator.Tpo $(DEPDIR)/lib_libCppUTest_a-TestMemoryAllocator.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/TestFailure.cpp' object='lib_libCppUTest_a-TestFailure.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/TestMemoryAllocator.cpp' object='lib_libCppUTest_a-TestMemoryAllocator.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-TestFailure.o `test -f 'src/CppUTest/TestFailure.cpp' || echo '$(srcdir)/'`src/CppUTest/TestFailure.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-TestMemoryAllocator.o `test -f 'src/CppUTest/TestMemoryAllocator.cpp' || echo '$(srcdir)/'`src/CppUTest/TestMemoryAllocator.cpp
 
-lib_libCppUTest_a-TestFailure.obj: src/CppUTest/TestFailure.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-TestFailure.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-TestFailure.Tpo -c -o lib_libCppUTest_a-TestFailure.obj `if test -f 'src/CppUTest/TestFailure.cpp'; then $(CYGPATH_W) 'src/CppUTest/TestFailure.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/TestFailure.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-TestFailure.Tpo $(DEPDIR)/lib_libCppUTest_a-TestFailure.Po
+lib_libCppUTest_a-TestMemoryAllocator.obj: src/CppUTest/TestMemoryAllocator.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-TestMemoryAllocator.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-TestMemoryAllocator.Tpo -c -o lib_libCppUTest_a-TestMemoryAllocator.obj `if test -f 'src/CppUTest/TestMemoryAllocator.cpp'; then $(CYGPATH_W) 'src/CppUTest/TestMemoryAllocator.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/TestMemoryAllocator.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-TestMemoryAllocator.Tpo $(DEPDIR)/lib_libCppUTest_a-TestMemoryAllocator.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/TestFailure.cpp' object='lib_libCppUTest_a-TestFailure.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/TestMemoryAllocator.cpp' object='lib_libCppUTest_a-TestMemoryAllocator.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-TestFailure.obj `if test -f 'src/CppUTest/TestFailure.cpp'; then $(CYGPATH_W) 'src/CppUTest/TestFailure.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/TestFailure.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-TestMemoryAllocator.obj `if test -f 'src/CppUTest/TestMemoryAllocator.cpp'; then $(CYGPATH_W) 'src/CppUTest/TestMemoryAllocator.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/TestMemoryAllocator.cpp'; fi`
 
 lib_libCppUTest_a-TestOutput.o: src/CppUTest/TestOutput.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-TestOutput.o -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-TestOutput.Tpo -c -o lib_libCppUTest_a-TestOutput.o `test -f 'src/CppUTest/TestOutput.cpp' || echo '$(srcdir)/'`src/CppUTest/TestOutput.cpp
@@ -1080,53 +1079,53 @@ lib_libCppUTest_a-TestOutput.obj: src/CppUTest/TestOutput.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-TestOutput.obj `if test -f 'src/CppUTest/TestOutput.cpp'; then $(CYGPATH_W) 'src/CppUTest/TestOutput.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/TestOutput.cpp'; fi`
 
-lib_libCppUTest_a-MemoryLeakDetector.o: src/CppUTest/MemoryLeakDetector.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-MemoryLeakDetector.o -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-MemoryLeakDetector.Tpo -c -o lib_libCppUTest_a-MemoryLeakDetector.o `test -f 'src/CppUTest/MemoryLeakDetector.cpp' || echo '$(srcdir)/'`src/CppUTest/MemoryLeakDetector.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-MemoryLeakDetector.Tpo $(DEPDIR)/lib_libCppUTest_a-MemoryLeakDetector.Po
+lib_libCppUTest_a-TestPlugin.o: src/CppUTest/TestPlugin.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-TestPlugin.o -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-TestPlugin.Tpo -c -o lib_libCppUTest_a-TestPlugin.o `test -f 'src/CppUTest/TestPlugin.cpp' || echo '$(srcdir)/'`src/CppUTest/TestPlugin.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-TestPlugin.Tpo $(DEPDIR)/lib_libCppUTest_a-TestPlugin.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/MemoryLeakDetector.cpp' object='lib_libCppUTest_a-MemoryLeakDetector.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/TestPlugin.cpp' object='lib_libCppUTest_a-TestPlugin.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-MemoryLeakDetector.o `test -f 'src/CppUTest/MemoryLeakDetector.cpp' || echo '$(srcdir)/'`src/CppUTest/MemoryLeakDetector.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-TestPlugin.o `test -f 'src/CppUTest/TestPlugin.cpp' || echo '$(srcdir)/'`src/CppUTest/TestPlugin.cpp
 
-lib_libCppUTest_a-MemoryLeakDetector.obj: src/CppUTest/MemoryLeakDetector.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-MemoryLeakDetector.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-MemoryLeakDetector.Tpo -c -o lib_libCppUTest_a-MemoryLeakDetector.obj `if test -f 'src/CppUTest/MemoryLeakDetector.cpp'; then $(CYGPATH_W) 'src/CppUTest/MemoryLeakDetector.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/MemoryLeakDetector.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-MemoryLeakDetector.Tpo $(DEPDIR)/lib_libCppUTest_a-MemoryLeakDetector.Po
+lib_libCppUTest_a-TestPlugin.obj: src/CppUTest/TestPlugin.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-TestPlugin.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-TestPlugin.Tpo -c -o lib_libCppUTest_a-TestPlugin.obj `if test -f 'src/CppUTest/TestPlugin.cpp'; then $(CYGPATH_W) 'src/CppUTest/TestPlugin.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/TestPlugin.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-TestPlugin.Tpo $(DEPDIR)/lib_libCppUTest_a-TestPlugin.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/MemoryLeakDetector.cpp' object='lib_libCppUTest_a-MemoryLeakDetector.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/TestPlugin.cpp' object='lib_libCppUTest_a-TestPlugin.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-MemoryLeakDetector.obj `if test -f 'src/CppUTest/MemoryLeakDetector.cpp'; then $(CYGPATH_W) 'src/CppUTest/MemoryLeakDetector.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/MemoryLeakDetector.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-TestPlugin.obj `if test -f 'src/CppUTest/TestPlugin.cpp'; then $(CYGPATH_W) 'src/CppUTest/TestPlugin.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/TestPlugin.cpp'; fi`
 
-lib_libCppUTest_a-TestFilter.o: src/CppUTest/TestFilter.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-TestFilter.o -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-TestFilter.Tpo -c -o lib_libCppUTest_a-TestFilter.o `test -f 'src/CppUTest/TestFilter.cpp' || echo '$(srcdir)/'`src/CppUTest/TestFilter.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-TestFilter.Tpo $(DEPDIR)/lib_libCppUTest_a-TestFilter.Po
+lib_libCppUTest_a-TestRegistry.o: src/CppUTest/TestRegistry.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-TestRegistry.o -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-TestRegistry.Tpo -c -o lib_libCppUTest_a-TestRegistry.o `test -f 'src/CppUTest/TestRegistry.cpp' || echo '$(srcdir)/'`src/CppUTest/TestRegistry.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-TestRegistry.Tpo $(DEPDIR)/lib_libCppUTest_a-TestRegistry.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/TestFilter.cpp' object='lib_libCppUTest_a-TestFilter.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/TestRegistry.cpp' object='lib_libCppUTest_a-TestRegistry.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-TestFilter.o `test -f 'src/CppUTest/TestFilter.cpp' || echo '$(srcdir)/'`src/CppUTest/TestFilter.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-TestRegistry.o `test -f 'src/CppUTest/TestRegistry.cpp' || echo '$(srcdir)/'`src/CppUTest/TestRegistry.cpp
 
-lib_libCppUTest_a-TestFilter.obj: src/CppUTest/TestFilter.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-TestFilter.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-TestFilter.Tpo -c -o lib_libCppUTest_a-TestFilter.obj `if test -f 'src/CppUTest/TestFilter.cpp'; then $(CYGPATH_W) 'src/CppUTest/TestFilter.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/TestFilter.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-TestFilter.Tpo $(DEPDIR)/lib_libCppUTest_a-TestFilter.Po
+lib_libCppUTest_a-TestRegistry.obj: src/CppUTest/TestRegistry.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-TestRegistry.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-TestRegistry.Tpo -c -o lib_libCppUTest_a-TestRegistry.obj `if test -f 'src/CppUTest/TestRegistry.cpp'; then $(CYGPATH_W) 'src/CppUTest/TestRegistry.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/TestRegistry.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-TestRegistry.Tpo $(DEPDIR)/lib_libCppUTest_a-TestRegistry.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/TestFilter.cpp' object='lib_libCppUTest_a-TestFilter.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/TestRegistry.cpp' object='lib_libCppUTest_a-TestRegistry.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-TestFilter.obj `if test -f 'src/CppUTest/TestFilter.cpp'; then $(CYGPATH_W) 'src/CppUTest/TestFilter.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/TestFilter.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-TestRegistry.obj `if test -f 'src/CppUTest/TestRegistry.cpp'; then $(CYGPATH_W) 'src/CppUTest/TestRegistry.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/TestRegistry.cpp'; fi`
 
-lib_libCppUTest_a-TestPlugin.o: src/CppUTest/TestPlugin.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-TestPlugin.o -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-TestPlugin.Tpo -c -o lib_libCppUTest_a-TestPlugin.o `test -f 'src/CppUTest/TestPlugin.cpp' || echo '$(srcdir)/'`src/CppUTest/TestPlugin.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-TestPlugin.Tpo $(DEPDIR)/lib_libCppUTest_a-TestPlugin.Po
+lib_libCppUTest_a-TestResult.o: src/CppUTest/TestResult.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-TestResult.o -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-TestResult.Tpo -c -o lib_libCppUTest_a-TestResult.o `test -f 'src/CppUTest/TestResult.cpp' || echo '$(srcdir)/'`src/CppUTest/TestResult.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-TestResult.Tpo $(DEPDIR)/lib_libCppUTest_a-TestResult.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/TestPlugin.cpp' object='lib_libCppUTest_a-TestPlugin.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/TestResult.cpp' object='lib_libCppUTest_a-TestResult.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-TestPlugin.o `test -f 'src/CppUTest/TestPlugin.cpp' || echo '$(srcdir)/'`src/CppUTest/TestPlugin.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-TestResult.o `test -f 'src/CppUTest/TestResult.cpp' || echo '$(srcdir)/'`src/CppUTest/TestResult.cpp
 
-lib_libCppUTest_a-TestPlugin.obj: src/CppUTest/TestPlugin.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-TestPlugin.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-TestPlugin.Tpo -c -o lib_libCppUTest_a-TestPlugin.obj `if test -f 'src/CppUTest/TestPlugin.cpp'; then $(CYGPATH_W) 'src/CppUTest/TestPlugin.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/TestPlugin.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-TestPlugin.Tpo $(DEPDIR)/lib_libCppUTest_a-TestPlugin.Po
+lib_libCppUTest_a-TestResult.obj: src/CppUTest/TestResult.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-TestResult.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-TestResult.Tpo -c -o lib_libCppUTest_a-TestResult.obj `if test -f 'src/CppUTest/TestResult.cpp'; then $(CYGPATH_W) 'src/CppUTest/TestResult.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/TestResult.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTest_a-TestResult.Tpo $(DEPDIR)/lib_libCppUTest_a-TestResult.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/TestPlugin.cpp' object='lib_libCppUTest_a-TestPlugin.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTest/TestResult.cpp' object='lib_libCppUTest_a-TestResult.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-TestPlugin.obj `if test -f 'src/CppUTest/TestPlugin.cpp'; then $(CYGPATH_W) 'src/CppUTest/TestPlugin.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/TestPlugin.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTest_a-TestResult.obj `if test -f 'src/CppUTest/TestResult.cpp'; then $(CYGPATH_W) 'src/CppUTest/TestResult.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTest/TestResult.cpp'; fi`
 
 lib_libCppUTest_a-Utest.o: src/CppUTest/Utest.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTest_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTest_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTest_a-Utest.o -MD -MP -MF $(DEPDIR)/lib_libCppUTest_a-Utest.Tpo -c -o lib_libCppUTest_a-Utest.o `test -f 'src/CppUTest/Utest.cpp' || echo '$(srcdir)/'`src/CppUTest/Utest.cpp
@@ -1176,6 +1175,22 @@ lib_libCppUTestExt_a-CodeMemoryReportFormatter.obj: src/CppUTestExt/CodeMemoryRe
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-CodeMemoryReportFormatter.obj `if test -f 'src/CppUTestExt/CodeMemoryReportFormatter.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/CodeMemoryReportFormatter.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/CodeMemoryReportFormatter.cpp'; fi`
 
+lib_libCppUTestExt_a-MemoryReportAllocator.o: src/CppUTestExt/MemoryReportAllocator.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MemoryReportAllocator.o -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MemoryReportAllocator.Tpo -c -o lib_libCppUTestExt_a-MemoryReportAllocator.o `test -f 'src/CppUTestExt/MemoryReportAllocator.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MemoryReportAllocator.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MemoryReportAllocator.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MemoryReportAllocator.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MemoryReportAllocator.cpp' object='lib_libCppUTestExt_a-MemoryReportAllocator.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MemoryReportAllocator.o `test -f 'src/CppUTestExt/MemoryReportAllocator.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MemoryReportAllocator.cpp
+
+lib_libCppUTestExt_a-MemoryReportAllocator.obj: src/CppUTestExt/MemoryReportAllocator.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MemoryReportAllocator.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MemoryReportAllocator.Tpo -c -o lib_libCppUTestExt_a-MemoryReportAllocator.obj `if test -f 'src/CppUTestExt/MemoryReportAllocator.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MemoryReportAllocator.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MemoryReportAllocator.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MemoryReportAllocator.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MemoryReportAllocator.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MemoryReportAllocator.cpp' object='lib_libCppUTestExt_a-MemoryReportAllocator.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MemoryReportAllocator.obj `if test -f 'src/CppUTestExt/MemoryReportAllocator.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MemoryReportAllocator.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MemoryReportAllocator.cpp'; fi`
+
 lib_libCppUTestExt_a-MemoryReporterPlugin.o: src/CppUTestExt/MemoryReporterPlugin.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MemoryReporterPlugin.o -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MemoryReporterPlugin.Tpo -c -o lib_libCppUTestExt_a-MemoryReporterPlugin.o `test -f 'src/CppUTestExt/MemoryReporterPlugin.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MemoryReporterPlugin.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MemoryReporterPlugin.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MemoryReporterPlugin.Po
@@ -1192,37 +1207,21 @@ lib_libCppUTestExt_a-MemoryReporterPlugin.obj: src/CppUTestExt/MemoryReporterPlu
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MemoryReporterPlugin.obj `if test -f 'src/CppUTestExt/MemoryReporterPlugin.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MemoryReporterPlugin.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MemoryReporterPlugin.cpp'; fi`
 
-lib_libCppUTestExt_a-MockFailure.o: src/CppUTestExt/MockFailure.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MockFailure.o -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MockFailure.Tpo -c -o lib_libCppUTestExt_a-MockFailure.o `test -f 'src/CppUTestExt/MockFailure.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MockFailure.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MockFailure.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MockFailure.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MockFailure.cpp' object='lib_libCppUTestExt_a-MockFailure.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MockFailure.o `test -f 'src/CppUTestExt/MockFailure.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MockFailure.cpp
-
-lib_libCppUTestExt_a-MockFailure.obj: src/CppUTestExt/MockFailure.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MockFailure.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MockFailure.Tpo -c -o lib_libCppUTestExt_a-MockFailure.obj `if test -f 'src/CppUTestExt/MockFailure.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MockFailure.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MockFailure.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MockFailure.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MockFailure.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MockFailure.cpp' object='lib_libCppUTestExt_a-MockFailure.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MockFailure.obj `if test -f 'src/CppUTestExt/MockFailure.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MockFailure.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MockFailure.cpp'; fi`
-
-lib_libCppUTestExt_a-MockSupportPlugin.o: src/CppUTestExt/MockSupportPlugin.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MockSupportPlugin.o -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MockSupportPlugin.Tpo -c -o lib_libCppUTestExt_a-MockSupportPlugin.o `test -f 'src/CppUTestExt/MockSupportPlugin.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MockSupportPlugin.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MockSupportPlugin.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MockSupportPlugin.Po
+lib_libCppUTestExt_a-MemoryReportFormatter.o: src/CppUTestExt/MemoryReportFormatter.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MemoryReportFormatter.o -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MemoryReportFormatter.Tpo -c -o lib_libCppUTestExt_a-MemoryReportFormatter.o `test -f 'src/CppUTestExt/MemoryReportFormatter.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MemoryReportFormatter.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MemoryReportFormatter.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MemoryReportFormatter.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MockSupportPlugin.cpp' object='lib_libCppUTestExt_a-MockSupportPlugin.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MemoryReportFormatter.cpp' object='lib_libCppUTestExt_a-MemoryReportFormatter.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MockSupportPlugin.o `test -f 'src/CppUTestExt/MockSupportPlugin.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MockSupportPlugin.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MemoryReportFormatter.o `test -f 'src/CppUTestExt/MemoryReportFormatter.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MemoryReportFormatter.cpp
 
-lib_libCppUTestExt_a-MockSupportPlugin.obj: src/CppUTestExt/MockSupportPlugin.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MockSupportPlugin.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MockSupportPlugin.Tpo -c -o lib_libCppUTestExt_a-MockSupportPlugin.obj `if test -f 'src/CppUTestExt/MockSupportPlugin.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MockSupportPlugin.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MockSupportPlugin.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MockSupportPlugin.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MockSupportPlugin.Po
+lib_libCppUTestExt_a-MemoryReportFormatter.obj: src/CppUTestExt/MemoryReportFormatter.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MemoryReportFormatter.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MemoryReportFormatter.Tpo -c -o lib_libCppUTestExt_a-MemoryReportFormatter.obj `if test -f 'src/CppUTestExt/MemoryReportFormatter.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MemoryReportFormatter.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MemoryReportFormatter.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MemoryReportFormatter.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MemoryReportFormatter.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MockSupportPlugin.cpp' object='lib_libCppUTestExt_a-MockSupportPlugin.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MemoryReportFormatter.cpp' object='lib_libCppUTestExt_a-MemoryReportFormatter.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MockSupportPlugin.obj `if test -f 'src/CppUTestExt/MockSupportPlugin.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MockSupportPlugin.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MockSupportPlugin.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MemoryReportFormatter.obj `if test -f 'src/CppUTestExt/MemoryReportFormatter.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MemoryReportFormatter.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MemoryReportFormatter.cpp'; fi`
 
 lib_libCppUTestExt_a-MockActualCall.o: src/CppUTestExt/MockActualCall.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MockActualCall.o -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MockActualCall.Tpo -c -o lib_libCppUTestExt_a-MockActualCall.o `test -f 'src/CppUTestExt/MockActualCall.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MockActualCall.cpp
@@ -1240,53 +1239,53 @@ lib_libCppUTestExt_a-MockActualCall.obj: src/CppUTestExt/MockActualCall.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MockActualCall.obj `if test -f 'src/CppUTestExt/MockActualCall.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MockActualCall.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MockActualCall.cpp'; fi`
 
-lib_libCppUTestExt_a-MockSupport_c.o: src/CppUTestExt/MockSupport_c.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MockSupport_c.o -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MockSupport_c.Tpo -c -o lib_libCppUTestExt_a-MockSupport_c.o `test -f 'src/CppUTestExt/MockSupport_c.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MockSupport_c.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MockSupport_c.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MockSupport_c.Po
+lib_libCppUTestExt_a-MockExpectedCall.o: src/CppUTestExt/MockExpectedCall.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MockExpectedCall.o -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MockExpectedCall.Tpo -c -o lib_libCppUTestExt_a-MockExpectedCall.o `test -f 'src/CppUTestExt/MockExpectedCall.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MockExpectedCall.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MockExpectedCall.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MockExpectedCall.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MockSupport_c.cpp' object='lib_libCppUTestExt_a-MockSupport_c.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MockExpectedCall.cpp' object='lib_libCppUTestExt_a-MockExpectedCall.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MockSupport_c.o `test -f 'src/CppUTestExt/MockSupport_c.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MockSupport_c.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MockExpectedCall.o `test -f 'src/CppUTestExt/MockExpectedCall.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MockExpectedCall.cpp
 
-lib_libCppUTestExt_a-MockSupport_c.obj: src/CppUTestExt/MockSupport_c.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MockSupport_c.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MockSupport_c.Tpo -c -o lib_libCppUTestExt_a-MockSupport_c.obj `if test -f 'src/CppUTestExt/MockSupport_c.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MockSupport_c.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MockSupport_c.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MockSupport_c.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MockSupport_c.Po
+lib_libCppUTestExt_a-MockExpectedCall.obj: src/CppUTestExt/MockExpectedCall.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MockExpectedCall.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MockExpectedCall.Tpo -c -o lib_libCppUTestExt_a-MockExpectedCall.obj `if test -f 'src/CppUTestExt/MockExpectedCall.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MockExpectedCall.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MockExpectedCall.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MockExpectedCall.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MockExpectedCall.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MockSupport_c.cpp' object='lib_libCppUTestExt_a-MockSupport_c.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MockExpectedCall.cpp' object='lib_libCppUTestExt_a-MockExpectedCall.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MockSupport_c.obj `if test -f 'src/CppUTestExt/MockSupport_c.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MockSupport_c.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MockSupport_c.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MockExpectedCall.obj `if test -f 'src/CppUTestExt/MockExpectedCall.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MockExpectedCall.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MockExpectedCall.cpp'; fi`
 
-lib_libCppUTestExt_a-MemoryReportAllocator.o: src/CppUTestExt/MemoryReportAllocator.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MemoryReportAllocator.o -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MemoryReportAllocator.Tpo -c -o lib_libCppUTestExt_a-MemoryReportAllocator.o `test -f 'src/CppUTestExt/MemoryReportAllocator.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MemoryReportAllocator.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MemoryReportAllocator.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MemoryReportAllocator.Po
+lib_libCppUTestExt_a-MockExpectedFunctionsList.o: src/CppUTestExt/MockExpectedFunctionsList.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MockExpectedFunctionsList.o -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MockExpectedFunctionsList.Tpo -c -o lib_libCppUTestExt_a-MockExpectedFunctionsList.o `test -f 'src/CppUTestExt/MockExpectedFunctionsList.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MockExpectedFunctionsList.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MockExpectedFunctionsList.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MockExpectedFunctionsList.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MemoryReportAllocator.cpp' object='lib_libCppUTestExt_a-MemoryReportAllocator.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MockExpectedFunctionsList.cpp' object='lib_libCppUTestExt_a-MockExpectedFunctionsList.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MemoryReportAllocator.o `test -f 'src/CppUTestExt/MemoryReportAllocator.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MemoryReportAllocator.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MockExpectedFunctionsList.o `test -f 'src/CppUTestExt/MockExpectedFunctionsList.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MockExpectedFunctionsList.cpp
 
-lib_libCppUTestExt_a-MemoryReportAllocator.obj: src/CppUTestExt/MemoryReportAllocator.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MemoryReportAllocator.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MemoryReportAllocator.Tpo -c -o lib_libCppUTestExt_a-MemoryReportAllocator.obj `if test -f 'src/CppUTestExt/MemoryReportAllocator.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MemoryReportAllocator.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MemoryReportAllocator.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MemoryReportAllocator.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MemoryReportAllocator.Po
+lib_libCppUTestExt_a-MockExpectedFunctionsList.obj: src/CppUTestExt/MockExpectedFunctionsList.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MockExpectedFunctionsList.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MockExpectedFunctionsList.Tpo -c -o lib_libCppUTestExt_a-MockExpectedFunctionsList.obj `if test -f 'src/CppUTestExt/MockExpectedFunctionsList.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MockExpectedFunctionsList.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MockExpectedFunctionsList.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MockExpectedFunctionsList.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MockExpectedFunctionsList.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MemoryReportAllocator.cpp' object='lib_libCppUTestExt_a-MemoryReportAllocator.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MockExpectedFunctionsList.cpp' object='lib_libCppUTestExt_a-MockExpectedFunctionsList.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MemoryReportAllocator.obj `if test -f 'src/CppUTestExt/MemoryReportAllocator.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MemoryReportAllocator.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MemoryReportAllocator.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MockExpectedFunctionsList.obj `if test -f 'src/CppUTestExt/MockExpectedFunctionsList.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MockExpectedFunctionsList.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MockExpectedFunctionsList.cpp'; fi`
 
-lib_libCppUTestExt_a-MockExpectedCall.o: src/CppUTestExt/MockExpectedCall.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MockExpectedCall.o -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MockExpectedCall.Tpo -c -o lib_libCppUTestExt_a-MockExpectedCall.o `test -f 'src/CppUTestExt/MockExpectedCall.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MockExpectedCall.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MockExpectedCall.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MockExpectedCall.Po
+lib_libCppUTestExt_a-MockFailure.o: src/CppUTestExt/MockFailure.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MockFailure.o -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MockFailure.Tpo -c -o lib_libCppUTestExt_a-MockFailure.o `test -f 'src/CppUTestExt/MockFailure.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MockFailure.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MockFailure.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MockFailure.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MockExpectedCall.cpp' object='lib_libCppUTestExt_a-MockExpectedCall.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MockFailure.cpp' object='lib_libCppUTestExt_a-MockFailure.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MockExpectedCall.o `test -f 'src/CppUTestExt/MockExpectedCall.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MockExpectedCall.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MockFailure.o `test -f 'src/CppUTestExt/MockFailure.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MockFailure.cpp
 
-lib_libCppUTestExt_a-MockExpectedCall.obj: src/CppUTestExt/MockExpectedCall.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MockExpectedCall.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MockExpectedCall.Tpo -c -o lib_libCppUTestExt_a-MockExpectedCall.obj `if test -f 'src/CppUTestExt/MockExpectedCall.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MockExpectedCall.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MockExpectedCall.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MockExpectedCall.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MockExpectedCall.Po
+lib_libCppUTestExt_a-MockFailure.obj: src/CppUTestExt/MockFailure.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MockFailure.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MockFailure.Tpo -c -o lib_libCppUTestExt_a-MockFailure.obj `if test -f 'src/CppUTestExt/MockFailure.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MockFailure.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MockFailure.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MockFailure.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MockFailure.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MockExpectedCall.cpp' object='lib_libCppUTestExt_a-MockExpectedCall.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MockFailure.cpp' object='lib_libCppUTestExt_a-MockFailure.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MockExpectedCall.obj `if test -f 'src/CppUTestExt/MockExpectedCall.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MockExpectedCall.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MockExpectedCall.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MockFailure.obj `if test -f 'src/CppUTestExt/MockFailure.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MockFailure.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MockFailure.cpp'; fi`
 
 lib_libCppUTestExt_a-MockNamedValue.o: src/CppUTestExt/MockNamedValue.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MockNamedValue.o -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MockNamedValue.Tpo -c -o lib_libCppUTestExt_a-MockNamedValue.o `test -f 'src/CppUTestExt/MockNamedValue.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MockNamedValue.cpp
@@ -1304,6 +1303,54 @@ lib_libCppUTestExt_a-MockNamedValue.obj: src/CppUTestExt/MockNamedValue.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MockNamedValue.obj `if test -f 'src/CppUTestExt/MockNamedValue.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MockNamedValue.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MockNamedValue.cpp'; fi`
 
+lib_libCppUTestExt_a-MockSupport.o: src/CppUTestExt/MockSupport.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MockSupport.o -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MockSupport.Tpo -c -o lib_libCppUTestExt_a-MockSupport.o `test -f 'src/CppUTestExt/MockSupport.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MockSupport.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MockSupport.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MockSupport.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MockSupport.cpp' object='lib_libCppUTestExt_a-MockSupport.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MockSupport.o `test -f 'src/CppUTestExt/MockSupport.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MockSupport.cpp
+
+lib_libCppUTestExt_a-MockSupport.obj: src/CppUTestExt/MockSupport.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MockSupport.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MockSupport.Tpo -c -o lib_libCppUTestExt_a-MockSupport.obj `if test -f 'src/CppUTestExt/MockSupport.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MockSupport.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MockSupport.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MockSupport.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MockSupport.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MockSupport.cpp' object='lib_libCppUTestExt_a-MockSupport.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MockSupport.obj `if test -f 'src/CppUTestExt/MockSupport.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MockSupport.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MockSupport.cpp'; fi`
+
+lib_libCppUTestExt_a-MockSupportPlugin.o: src/CppUTestExt/MockSupportPlugin.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MockSupportPlugin.o -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MockSupportPlugin.Tpo -c -o lib_libCppUTestExt_a-MockSupportPlugin.o `test -f 'src/CppUTestExt/MockSupportPlugin.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MockSupportPlugin.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MockSupportPlugin.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MockSupportPlugin.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MockSupportPlugin.cpp' object='lib_libCppUTestExt_a-MockSupportPlugin.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MockSupportPlugin.o `test -f 'src/CppUTestExt/MockSupportPlugin.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MockSupportPlugin.cpp
+
+lib_libCppUTestExt_a-MockSupportPlugin.obj: src/CppUTestExt/MockSupportPlugin.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MockSupportPlugin.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MockSupportPlugin.Tpo -c -o lib_libCppUTestExt_a-MockSupportPlugin.obj `if test -f 'src/CppUTestExt/MockSupportPlugin.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MockSupportPlugin.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MockSupportPlugin.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MockSupportPlugin.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MockSupportPlugin.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MockSupportPlugin.cpp' object='lib_libCppUTestExt_a-MockSupportPlugin.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MockSupportPlugin.obj `if test -f 'src/CppUTestExt/MockSupportPlugin.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MockSupportPlugin.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MockSupportPlugin.cpp'; fi`
+
+lib_libCppUTestExt_a-MockSupport_c.o: src/CppUTestExt/MockSupport_c.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MockSupport_c.o -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MockSupport_c.Tpo -c -o lib_libCppUTestExt_a-MockSupport_c.o `test -f 'src/CppUTestExt/MockSupport_c.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MockSupport_c.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MockSupport_c.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MockSupport_c.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MockSupport_c.cpp' object='lib_libCppUTestExt_a-MockSupport_c.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MockSupport_c.o `test -f 'src/CppUTestExt/MockSupport_c.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MockSupport_c.cpp
+
+lib_libCppUTestExt_a-MockSupport_c.obj: src/CppUTestExt/MockSupport_c.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MockSupport_c.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MockSupport_c.Tpo -c -o lib_libCppUTestExt_a-MockSupport_c.obj `if test -f 'src/CppUTestExt/MockSupport_c.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MockSupport_c.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MockSupport_c.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MockSupport_c.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MockSupport_c.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MockSupport_c.cpp' object='lib_libCppUTestExt_a-MockSupport_c.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MockSupport_c.obj `if test -f 'src/CppUTestExt/MockSupport_c.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MockSupport_c.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MockSupport_c.cpp'; fi`
+
 lib_libCppUTestExt_a-OrderedTest.o: src/CppUTestExt/OrderedTest.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-OrderedTest.o -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-OrderedTest.Tpo -c -o lib_libCppUTestExt_a-OrderedTest.o `test -f 'src/CppUTestExt/OrderedTest.cpp' || echo '$(srcdir)/'`src/CppUTestExt/OrderedTest.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-OrderedTest.Tpo $(DEPDIR)/lib_libCppUTestExt_a-OrderedTest.Po
@@ -1320,341 +1367,485 @@ lib_libCppUTestExt_a-OrderedTest.obj: src/CppUTestExt/OrderedTest.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-OrderedTest.obj `if test -f 'src/CppUTestExt/OrderedTest.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/OrderedTest.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/OrderedTest.cpp'; fi`
 
-lib_libCppUTestExt_a-MemoryReportFormatter.o: src/CppUTestExt/MemoryReportFormatter.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MemoryReportFormatter.o -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MemoryReportFormatter.Tpo -c -o lib_libCppUTestExt_a-MemoryReportFormatter.o `test -f 'src/CppUTestExt/MemoryReportFormatter.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MemoryReportFormatter.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MemoryReportFormatter.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MemoryReportFormatter.Po
+CppUTestExtTests-AllTests.o: tests/CppUTestExt/AllTests.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-AllTests.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-AllTests.Tpo -c -o CppUTestExtTests-AllTests.o `test -f 'tests/CppUTestExt/AllTests.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/AllTests.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-AllTests.Tpo $(DEPDIR)/CppUTestExtTests-AllTests.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MemoryReportFormatter.cpp' object='lib_libCppUTestExt_a-MemoryReportFormatter.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/AllTests.cpp' object='CppUTestExtTests-AllTests.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MemoryReportFormatter.o `test -f 'src/CppUTestExt/MemoryReportFormatter.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MemoryReportFormatter.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-AllTests.o `test -f 'tests/CppUTestExt/AllTests.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/AllTests.cpp
 
-lib_libCppUTestExt_a-MemoryReportFormatter.obj: src/CppUTestExt/MemoryReportFormatter.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MemoryReportFormatter.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MemoryReportFormatter.Tpo -c -o lib_libCppUTestExt_a-MemoryReportFormatter.obj `if test -f 'src/CppUTestExt/MemoryReportFormatter.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MemoryReportFormatter.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MemoryReportFormatter.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MemoryReportFormatter.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MemoryReportFormatter.Po
+CppUTestExtTests-AllTests.obj: tests/CppUTestExt/AllTests.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-AllTests.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-AllTests.Tpo -c -o CppUTestExtTests-AllTests.obj `if test -f 'tests/CppUTestExt/AllTests.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/AllTests.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/AllTests.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-AllTests.Tpo $(DEPDIR)/CppUTestExtTests-AllTests.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MemoryReportFormatter.cpp' object='lib_libCppUTestExt_a-MemoryReportFormatter.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/AllTests.cpp' object='CppUTestExtTests-AllTests.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MemoryReportFormatter.obj `if test -f 'src/CppUTestExt/MemoryReportFormatter.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MemoryReportFormatter.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MemoryReportFormatter.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-AllTests.obj `if test -f 'tests/CppUTestExt/AllTests.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/AllTests.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/AllTests.cpp'; fi`
 
-lib_libCppUTestExt_a-MockExpectedFunctionsList.o: src/CppUTestExt/MockExpectedFunctionsList.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MockExpectedFunctionsList.o -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MockExpectedFunctionsList.Tpo -c -o lib_libCppUTestExt_a-MockExpectedFunctionsList.o `test -f 'src/CppUTestExt/MockExpectedFunctionsList.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MockExpectedFunctionsList.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MockExpectedFunctionsList.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MockExpectedFunctionsList.Po
+CppUTestExtTests-CodeMemoryReportFormatterTest.o: tests/CppUTestExt/CodeMemoryReportFormatterTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-CodeMemoryReportFormatterTest.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-CodeMemoryReportFormatterTest.Tpo -c -o CppUTestExtTests-CodeMemoryReportFormatterTest.o `test -f 'tests/CppUTestExt/CodeMemoryReportFormatterTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/CodeMemoryReportFormatterTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-CodeMemoryReportFormatterTest.Tpo $(DEPDIR)/CppUTestExtTests-CodeMemoryReportFormatterTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MockExpectedFunctionsList.cpp' object='lib_libCppUTestExt_a-MockExpectedFunctionsList.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/CodeMemoryReportFormatterTest.cpp' object='CppUTestExtTests-CodeMemoryReportFormatterTest.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MockExpectedFunctionsList.o `test -f 'src/CppUTestExt/MockExpectedFunctionsList.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MockExpectedFunctionsList.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-CodeMemoryReportFormatterTest.o `test -f 'tests/CppUTestExt/CodeMemoryReportFormatterTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/CodeMemoryReportFormatterTest.cpp
 
-lib_libCppUTestExt_a-MockExpectedFunctionsList.obj: src/CppUTestExt/MockExpectedFunctionsList.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MockExpectedFunctionsList.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MockExpectedFunctionsList.Tpo -c -o lib_libCppUTestExt_a-MockExpectedFunctionsList.obj `if test -f 'src/CppUTestExt/MockExpectedFunctionsList.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MockExpectedFunctionsList.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MockExpectedFunctionsList.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MockExpectedFunctionsList.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MockExpectedFunctionsList.Po
+CppUTestExtTests-CodeMemoryReportFormatterTest.obj: tests/CppUTestExt/CodeMemoryReportFormatterTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-CodeMemoryReportFormatterTest.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-CodeMemoryReportFormatterTest.Tpo -c -o CppUTestExtTests-CodeMemoryReportFormatterTest.obj `if test -f 'tests/CppUTestExt/CodeMemoryReportFormatterTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/CodeMemoryReportFormatterTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/CodeMemoryReportFormatterTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-CodeMemoryReportFormatterTest.Tpo $(DEPDIR)/CppUTestExtTests-CodeMemoryReportFormatterTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MockExpectedFunctionsList.cpp' object='lib_libCppUTestExt_a-MockExpectedFunctionsList.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/CodeMemoryReportFormatterTest.cpp' object='CppUTestExtTests-CodeMemoryReportFormatterTest.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MockExpectedFunctionsList.obj `if test -f 'src/CppUTestExt/MockExpectedFunctionsList.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MockExpectedFunctionsList.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MockExpectedFunctionsList.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-CodeMemoryReportFormatterTest.obj `if test -f 'tests/CppUTestExt/CodeMemoryReportFormatterTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/CodeMemoryReportFormatterTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/CodeMemoryReportFormatterTest.cpp'; fi`
 
-lib_libCppUTestExt_a-MockSupport.o: src/CppUTestExt/MockSupport.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MockSupport.o -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MockSupport.Tpo -c -o lib_libCppUTestExt_a-MockSupport.o `test -f 'src/CppUTestExt/MockSupport.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MockSupport.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MockSupport.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MockSupport.Po
+CppUTestExtTests-GMockTest.o: tests/CppUTestExt/GMockTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-GMockTest.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-GMockTest.Tpo -c -o CppUTestExtTests-GMockTest.o `test -f 'tests/CppUTestExt/GMockTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/GMockTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-GMockTest.Tpo $(DEPDIR)/CppUTestExtTests-GMockTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MockSupport.cpp' object='lib_libCppUTestExt_a-MockSupport.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/GMockTest.cpp' object='CppUTestExtTests-GMockTest.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MockSupport.o `test -f 'src/CppUTestExt/MockSupport.cpp' || echo '$(srcdir)/'`src/CppUTestExt/MockSupport.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-GMockTest.o `test -f 'tests/CppUTestExt/GMockTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/GMockTest.cpp
 
-lib_libCppUTestExt_a-MockSupport.obj: src/CppUTestExt/MockSupport.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -MT lib_libCppUTestExt_a-MockSupport.obj -MD -MP -MF $(DEPDIR)/lib_libCppUTestExt_a-MockSupport.Tpo -c -o lib_libCppUTestExt_a-MockSupport.obj `if test -f 'src/CppUTestExt/MockSupport.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MockSupport.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MockSupport.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_libCppUTestExt_a-MockSupport.Tpo $(DEPDIR)/lib_libCppUTestExt_a-MockSupport.Po
+CppUTestExtTests-GMockTest.obj: tests/CppUTestExt/GMockTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-GMockTest.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-GMockTest.Tpo -c -o CppUTestExtTests-GMockTest.obj `if test -f 'tests/CppUTestExt/GMockTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/GMockTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/GMockTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-GMockTest.Tpo $(DEPDIR)/CppUTestExtTests-GMockTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/CppUTestExt/MockSupport.cpp' object='lib_libCppUTestExt_a-MockSupport.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/GMockTest.cpp' object='CppUTestExtTests-GMockTest.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libCppUTestExt_a_CPPFLAGS) $(CPPFLAGS) $(lib_libCppUTestExt_a_CXXFLAGS) $(CXXFLAGS) -c -o lib_libCppUTestExt_a-MockSupport.obj `if test -f 'src/CppUTestExt/MockSupport.cpp'; then $(CYGPATH_W) 'src/CppUTestExt/MockSupport.cpp'; else $(CYGPATH_W) '$(srcdir)/src/CppUTestExt/MockSupport.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-GMockTest.obj `if test -f 'tests/CppUTestExt/GMockTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/GMockTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/GMockTest.cpp'; fi`
+
+CppUTestExtTests-GTest1Test.o: tests/CppUTestExt/GTest1Test.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-GTest1Test.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-GTest1Test.Tpo -c -o CppUTestExtTests-GTest1Test.o `test -f 'tests/CppUTestExt/GTest1Test.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/GTest1Test.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-GTest1Test.Tpo $(DEPDIR)/CppUTestExtTests-GTest1Test.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/GTest1Test.cpp' object='CppUTestExtTests-GTest1Test.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-GTest1Test.o `test -f 'tests/CppUTestExt/GTest1Test.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/GTest1Test.cpp
+
+CppUTestExtTests-GTest1Test.obj: tests/CppUTestExt/GTest1Test.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-GTest1Test.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-GTest1Test.Tpo -c -o CppUTestExtTests-GTest1Test.obj `if test -f 'tests/CppUTestExt/GTest1Test.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/GTest1Test.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/GTest1Test.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-GTest1Test.Tpo $(DEPDIR)/CppUTestExtTests-GTest1Test.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/GTest1Test.cpp' object='CppUTestExtTests-GTest1Test.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-GTest1Test.obj `if test -f 'tests/CppUTestExt/GTest1Test.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/GTest1Test.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/GTest1Test.cpp'; fi`
+
+CppUTestExtTests-GTest2ConvertorTest.o: tests/CppUTestExt/GTest2ConvertorTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-GTest2ConvertorTest.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-GTest2ConvertorTest.Tpo -c -o CppUTestExtTests-GTest2ConvertorTest.o `test -f 'tests/CppUTestExt/GTest2ConvertorTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/GTest2ConvertorTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-GTest2ConvertorTest.Tpo $(DEPDIR)/CppUTestExtTests-GTest2ConvertorTest.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/GTest2ConvertorTest.cpp' object='CppUTestExtTests-GTest2ConvertorTest.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-GTest2ConvertorTest.o `test -f 'tests/CppUTestExt/GTest2ConvertorTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/GTest2ConvertorTest.cpp
+
+CppUTestExtTests-GTest2ConvertorTest.obj: tests/CppUTestExt/GTest2ConvertorTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-GTest2ConvertorTest.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-GTest2ConvertorTest.Tpo -c -o CppUTestExtTests-GTest2ConvertorTest.obj `if test -f 'tests/CppUTestExt/GTest2ConvertorTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/GTest2ConvertorTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/GTest2ConvertorTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-GTest2ConvertorTest.Tpo $(DEPDIR)/CppUTestExtTests-GTest2ConvertorTest.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/GTest2ConvertorTest.cpp' object='CppUTestExtTests-GTest2ConvertorTest.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-GTest2ConvertorTest.obj `if test -f 'tests/CppUTestExt/GTest2ConvertorTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/GTest2ConvertorTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/GTest2ConvertorTest.cpp'; fi`
+
+CppUTestExtTests-MemoryReportAllocatorTest.o: tests/CppUTestExt/MemoryReportAllocatorTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-MemoryReportAllocatorTest.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-MemoryReportAllocatorTest.Tpo -c -o CppUTestExtTests-MemoryReportAllocatorTest.o `test -f 'tests/CppUTestExt/MemoryReportAllocatorTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/MemoryReportAllocatorTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-MemoryReportAllocatorTest.Tpo $(DEPDIR)/CppUTestExtTests-MemoryReportAllocatorTest.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/MemoryReportAllocatorTest.cpp' object='CppUTestExtTests-MemoryReportAllocatorTest.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-MemoryReportAllocatorTest.o `test -f 'tests/CppUTestExt/MemoryReportAllocatorTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/MemoryReportAllocatorTest.cpp
+
+CppUTestExtTests-MemoryReportAllocatorTest.obj: tests/CppUTestExt/MemoryReportAllocatorTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-MemoryReportAllocatorTest.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-MemoryReportAllocatorTest.Tpo -c -o CppUTestExtTests-MemoryReportAllocatorTest.obj `if test -f 'tests/CppUTestExt/MemoryReportAllocatorTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/MemoryReportAllocatorTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/MemoryReportAllocatorTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-MemoryReportAllocatorTest.Tpo $(DEPDIR)/CppUTestExtTests-MemoryReportAllocatorTest.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/MemoryReportAllocatorTest.cpp' object='CppUTestExtTests-MemoryReportAllocatorTest.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-MemoryReportAllocatorTest.obj `if test -f 'tests/CppUTestExt/MemoryReportAllocatorTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/MemoryReportAllocatorTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/MemoryReportAllocatorTest.cpp'; fi`
+
+CppUTestExtTests-MemoryReporterPluginTest.o: tests/CppUTestExt/MemoryReporterPluginTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-MemoryReporterPluginTest.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-MemoryReporterPluginTest.Tpo -c -o CppUTestExtTests-MemoryReporterPluginTest.o `test -f 'tests/CppUTestExt/MemoryReporterPluginTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/MemoryReporterPluginTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-MemoryReporterPluginTest.Tpo $(DEPDIR)/CppUTestExtTests-MemoryReporterPluginTest.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/MemoryReporterPluginTest.cpp' object='CppUTestExtTests-MemoryReporterPluginTest.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-MemoryReporterPluginTest.o `test -f 'tests/CppUTestExt/MemoryReporterPluginTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/MemoryReporterPluginTest.cpp
+
+CppUTestExtTests-MemoryReporterPluginTest.obj: tests/CppUTestExt/MemoryReporterPluginTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-MemoryReporterPluginTest.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-MemoryReporterPluginTest.Tpo -c -o CppUTestExtTests-MemoryReporterPluginTest.obj `if test -f 'tests/CppUTestExt/MemoryReporterPluginTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/MemoryReporterPluginTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/MemoryReporterPluginTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-MemoryReporterPluginTest.Tpo $(DEPDIR)/CppUTestExtTests-MemoryReporterPluginTest.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/MemoryReporterPluginTest.cpp' object='CppUTestExtTests-MemoryReporterPluginTest.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-MemoryReporterPluginTest.obj `if test -f 'tests/CppUTestExt/MemoryReporterPluginTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/MemoryReporterPluginTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/MemoryReporterPluginTest.cpp'; fi`
+
+CppUTestExtTests-MemoryReportFormatterTest.o: tests/CppUTestExt/MemoryReportFormatterTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-MemoryReportFormatterTest.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-MemoryReportFormatterTest.Tpo -c -o CppUTestExtTests-MemoryReportFormatterTest.o `test -f 'tests/CppUTestExt/MemoryReportFormatterTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/MemoryReportFormatterTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-MemoryReportFormatterTest.Tpo $(DEPDIR)/CppUTestExtTests-MemoryReportFormatterTest.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/MemoryReportFormatterTest.cpp' object='CppUTestExtTests-MemoryReportFormatterTest.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-MemoryReportFormatterTest.o `test -f 'tests/CppUTestExt/MemoryReportFormatterTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/MemoryReportFormatterTest.cpp
 
-CppUTestExtTests-TestMockActualFunctionCall.o: tests/CppUTestExt/TestMockActualFunctionCall.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestMockActualFunctionCall.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestMockActualFunctionCall.Tpo -c -o CppUTestExtTests-TestMockActualFunctionCall.o `test -f 'tests/CppUTestExt/TestMockActualFunctionCall.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestMockActualFunctionCall.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestMockActualFunctionCall.Tpo $(DEPDIR)/CppUTestExtTests-TestMockActualFunctionCall.Po
+CppUTestExtTests-MemoryReportFormatterTest.obj: tests/CppUTestExt/MemoryReportFormatterTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-MemoryReportFormatterTest.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-MemoryReportFormatterTest.Tpo -c -o CppUTestExtTests-MemoryReportFormatterTest.obj `if test -f 'tests/CppUTestExt/MemoryReportFormatterTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/MemoryReportFormatterTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/MemoryReportFormatterTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-MemoryReportFormatterTest.Tpo $(DEPDIR)/CppUTestExtTests-MemoryReportFormatterTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestMockActualFunctionCall.cpp' object='CppUTestExtTests-TestMockActualFunctionCall.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/MemoryReportFormatterTest.cpp' object='CppUTestExtTests-MemoryReportFormatterTest.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestMockActualFunctionCall.o `test -f 'tests/CppUTestExt/TestMockActualFunctionCall.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestMockActualFunctionCall.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-MemoryReportFormatterTest.obj `if test -f 'tests/CppUTestExt/MemoryReportFormatterTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/MemoryReportFormatterTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/MemoryReportFormatterTest.cpp'; fi`
 
-CppUTestExtTests-TestMockActualFunctionCall.obj: tests/CppUTestExt/TestMockActualFunctionCall.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestMockActualFunctionCall.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestMockActualFunctionCall.Tpo -c -o CppUTestExtTests-TestMockActualFunctionCall.obj `if test -f 'tests/CppUTestExt/TestMockActualFunctionCall.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestMockActualFunctionCall.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestMockActualFunctionCall.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestMockActualFunctionCall.Tpo $(DEPDIR)/CppUTestExtTests-TestMockActualFunctionCall.Po
+CppUTestExtTests-MockActualCallTest.o: tests/CppUTestExt/MockActualCallTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-MockActualCallTest.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-MockActualCallTest.Tpo -c -o CppUTestExtTests-MockActualCallTest.o `test -f 'tests/CppUTestExt/MockActualCallTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/MockActualCallTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-MockActualCallTest.Tpo $(DEPDIR)/CppUTestExtTests-MockActualCallTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestMockActualFunctionCall.cpp' object='CppUTestExtTests-TestMockActualFunctionCall.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/MockActualCallTest.cpp' object='CppUTestExtTests-MockActualCallTest.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestMockActualFunctionCall.obj `if test -f 'tests/CppUTestExt/TestMockActualFunctionCall.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestMockActualFunctionCall.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestMockActualFunctionCall.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-MockActualCallTest.o `test -f 'tests/CppUTestExt/MockActualCallTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/MockActualCallTest.cpp
 
-CppUTestExtTests-TestMockSupport.o: tests/CppUTestExt/TestMockSupport.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestMockSupport.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestMockSupport.Tpo -c -o CppUTestExtTests-TestMockSupport.o `test -f 'tests/CppUTestExt/TestMockSupport.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestMockSupport.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestMockSupport.Tpo $(DEPDIR)/CppUTestExtTests-TestMockSupport.Po
+CppUTestExtTests-MockActualCallTest.obj: tests/CppUTestExt/MockActualCallTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-MockActualCallTest.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-MockActualCallTest.Tpo -c -o CppUTestExtTests-MockActualCallTest.obj `if test -f 'tests/CppUTestExt/MockActualCallTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/MockActualCallTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/MockActualCallTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-MockActualCallTest.Tpo $(DEPDIR)/CppUTestExtTests-MockActualCallTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestMockSupport.cpp' object='CppUTestExtTests-TestMockSupport.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/MockActualCallTest.cpp' object='CppUTestExtTests-MockActualCallTest.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestMockSupport.o `test -f 'tests/CppUTestExt/TestMockSupport.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestMockSupport.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-MockActualCallTest.obj `if test -f 'tests/CppUTestExt/MockActualCallTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/MockActualCallTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/MockActualCallTest.cpp'; fi`
 
-CppUTestExtTests-TestMockSupport.obj: tests/CppUTestExt/TestMockSupport.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestMockSupport.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestMockSupport.Tpo -c -o CppUTestExtTests-TestMockSupport.obj `if test -f 'tests/CppUTestExt/TestMockSupport.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestMockSupport.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestMockSupport.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestMockSupport.Tpo $(DEPDIR)/CppUTestExtTests-TestMockSupport.Po
+CppUTestExtTests-MockCheatSheetTest.o: tests/CppUTestExt/MockCheatSheetTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-MockCheatSheetTest.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-MockCheatSheetTest.Tpo -c -o CppUTestExtTests-MockCheatSheetTest.o `test -f 'tests/CppUTestExt/MockCheatSheetTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/MockCheatSheetTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-MockCheatSheetTest.Tpo $(DEPDIR)/CppUTestExtTests-MockCheatSheetTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestMockSupport.cpp' object='CppUTestExtTests-TestMockSupport.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/MockCheatSheetTest.cpp' object='CppUTestExtTests-MockCheatSheetTest.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestMockSupport.obj `if test -f 'tests/CppUTestExt/TestMockSupport.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestMockSupport.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestMockSupport.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-MockCheatSheetTest.o `test -f 'tests/CppUTestExt/MockCheatSheetTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/MockCheatSheetTest.cpp
 
-CppUTestExtTests-TestCodeMemoryReportFormatter.o: tests/CppUTestExt/TestCodeMemoryReportFormatter.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestCodeMemoryReportFormatter.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestCodeMemoryReportFormatter.Tpo -c -o CppUTestExtTests-TestCodeMemoryReportFormatter.o `test -f 'tests/CppUTestExt/TestCodeMemoryReportFormatter.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestCodeMemoryReportFormatter.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestCodeMemoryReportFormatter.Tpo $(DEPDIR)/CppUTestExtTests-TestCodeMemoryReportFormatter.Po
+CppUTestExtTests-MockCheatSheetTest.obj: tests/CppUTestExt/MockCheatSheetTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-MockCheatSheetTest.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-MockCheatSheetTest.Tpo -c -o CppUTestExtTests-MockCheatSheetTest.obj `if test -f 'tests/CppUTestExt/MockCheatSheetTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/MockCheatSheetTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/MockCheatSheetTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-MockCheatSheetTest.Tpo $(DEPDIR)/CppUTestExtTests-MockCheatSheetTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestCodeMemoryReportFormatter.cpp' object='CppUTestExtTests-TestCodeMemoryReportFormatter.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/MockCheatSheetTest.cpp' object='CppUTestExtTests-MockCheatSheetTest.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestCodeMemoryReportFormatter.o `test -f 'tests/CppUTestExt/TestCodeMemoryReportFormatter.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestCodeMemoryReportFormatter.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-MockCheatSheetTest.obj `if test -f 'tests/CppUTestExt/MockCheatSheetTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/MockCheatSheetTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/MockCheatSheetTest.cpp'; fi`
 
-CppUTestExtTests-TestCodeMemoryReportFormatter.obj: tests/CppUTestExt/TestCodeMemoryReportFormatter.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestCodeMemoryReportFormatter.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestCodeMemoryReportFormatter.Tpo -c -o CppUTestExtTests-TestCodeMemoryReportFormatter.obj `if test -f 'tests/CppUTestExt/TestCodeMemoryReportFormatter.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestCodeMemoryReportFormatter.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestCodeMemoryReportFormatter.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestCodeMemoryReportFormatter.Tpo $(DEPDIR)/CppUTestExtTests-TestCodeMemoryReportFormatter.Po
+CppUTestExtTests-MockExpectedCallTest.o: tests/CppUTestExt/MockExpectedCallTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-MockExpectedCallTest.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-MockExpectedCallTest.Tpo -c -o CppUTestExtTests-MockExpectedCallTest.o `test -f 'tests/CppUTestExt/MockExpectedCallTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/MockExpectedCallTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-MockExpectedCallTest.Tpo $(DEPDIR)/CppUTestExtTests-MockExpectedCallTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestCodeMemoryReportFormatter.cpp' object='CppUTestExtTests-TestCodeMemoryReportFormatter.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/MockExpectedCallTest.cpp' object='CppUTestExtTests-MockExpectedCallTest.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestCodeMemoryReportFormatter.obj `if test -f 'tests/CppUTestExt/TestCodeMemoryReportFormatter.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestCodeMemoryReportFormatter.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestCodeMemoryReportFormatter.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-MockExpectedCallTest.o `test -f 'tests/CppUTestExt/MockExpectedCallTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/MockExpectedCallTest.cpp
 
-CppUTestExtTests-TestMockCheatSheet.o: tests/CppUTestExt/TestMockCheatSheet.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestMockCheatSheet.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestMockCheatSheet.Tpo -c -o CppUTestExtTests-TestMockCheatSheet.o `test -f 'tests/CppUTestExt/TestMockCheatSheet.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestMockCheatSheet.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestMockCheatSheet.Tpo $(DEPDIR)/CppUTestExtTests-TestMockCheatSheet.Po
+CppUTestExtTests-MockExpectedCallTest.obj: tests/CppUTestExt/MockExpectedCallTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-MockExpectedCallTest.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-MockExpectedCallTest.Tpo -c -o CppUTestExtTests-MockExpectedCallTest.obj `if test -f 'tests/CppUTestExt/MockExpectedCallTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/MockExpectedCallTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/MockExpectedCallTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-MockExpectedCallTest.Tpo $(DEPDIR)/CppUTestExtTests-MockExpectedCallTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestMockCheatSheet.cpp' object='CppUTestExtTests-TestMockCheatSheet.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/MockExpectedCallTest.cpp' object='CppUTestExtTests-MockExpectedCallTest.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestMockCheatSheet.o `test -f 'tests/CppUTestExt/TestMockCheatSheet.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestMockCheatSheet.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-MockExpectedCallTest.obj `if test -f 'tests/CppUTestExt/MockExpectedCallTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/MockExpectedCallTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/MockExpectedCallTest.cpp'; fi`
 
-CppUTestExtTests-TestMockCheatSheet.obj: tests/CppUTestExt/TestMockCheatSheet.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestMockCheatSheet.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestMockCheatSheet.Tpo -c -o CppUTestExtTests-TestMockCheatSheet.obj `if test -f 'tests/CppUTestExt/TestMockCheatSheet.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestMockCheatSheet.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestMockCheatSheet.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestMockCheatSheet.Tpo $(DEPDIR)/CppUTestExtTests-TestMockCheatSheet.Po
+CppUTestExtTests-MockExpectedFunctionsListTest.o: tests/CppUTestExt/MockExpectedFunctionsListTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-MockExpectedFunctionsListTest.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-MockExpectedFunctionsListTest.Tpo -c -o CppUTestExtTests-MockExpectedFunctionsListTest.o `test -f 'tests/CppUTestExt/MockExpectedFunctionsListTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/MockExpectedFunctionsListTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-MockExpectedFunctionsListTest.Tpo $(DEPDIR)/CppUTestExtTests-MockExpectedFunctionsListTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestMockCheatSheet.cpp' object='CppUTestExtTests-TestMockCheatSheet.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/MockExpectedFunctionsListTest.cpp' object='CppUTestExtTests-MockExpectedFunctionsListTest.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestMockCheatSheet.obj `if test -f 'tests/CppUTestExt/TestMockCheatSheet.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestMockCheatSheet.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestMockCheatSheet.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-MockExpectedFunctionsListTest.o `test -f 'tests/CppUTestExt/MockExpectedFunctionsListTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/MockExpectedFunctionsListTest.cpp
 
-CppUTestExtTests-TestMockSupport_c.o: tests/CppUTestExt/TestMockSupport_c.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestMockSupport_c.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestMockSupport_c.Tpo -c -o CppUTestExtTests-TestMockSupport_c.o `test -f 'tests/CppUTestExt/TestMockSupport_c.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestMockSupport_c.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestMockSupport_c.Tpo $(DEPDIR)/CppUTestExtTests-TestMockSupport_c.Po
+CppUTestExtTests-MockExpectedFunctionsListTest.obj: tests/CppUTestExt/MockExpectedFunctionsListTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-MockExpectedFunctionsListTest.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-MockExpectedFunctionsListTest.Tpo -c -o CppUTestExtTests-MockExpectedFunctionsListTest.obj `if test -f 'tests/CppUTestExt/MockExpectedFunctionsListTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/MockExpectedFunctionsListTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/MockExpectedFunctionsListTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-MockExpectedFunctionsListTest.Tpo $(DEPDIR)/CppUTestExtTests-MockExpectedFunctionsListTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestMockSupport_c.cpp' object='CppUTestExtTests-TestMockSupport_c.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/MockExpectedFunctionsListTest.cpp' object='CppUTestExtTests-MockExpectedFunctionsListTest.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestMockSupport_c.o `test -f 'tests/CppUTestExt/TestMockSupport_c.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestMockSupport_c.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-MockExpectedFunctionsListTest.obj `if test -f 'tests/CppUTestExt/MockExpectedFunctionsListTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/MockExpectedFunctionsListTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/MockExpectedFunctionsListTest.cpp'; fi`
 
-CppUTestExtTests-TestMockSupport_c.obj: tests/CppUTestExt/TestMockSupport_c.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestMockSupport_c.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestMockSupport_c.Tpo -c -o CppUTestExtTests-TestMockSupport_c.obj `if test -f 'tests/CppUTestExt/TestMockSupport_c.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestMockSupport_c.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestMockSupport_c.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestMockSupport_c.Tpo $(DEPDIR)/CppUTestExtTests-TestMockSupport_c.Po
+CppUTestExtTests-MockFailureTest.o: tests/CppUTestExt/MockFailureTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-MockFailureTest.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-MockFailureTest.Tpo -c -o CppUTestExtTests-MockFailureTest.o `test -f 'tests/CppUTestExt/MockFailureTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/MockFailureTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-MockFailureTest.Tpo $(DEPDIR)/CppUTestExtTests-MockFailureTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestMockSupport_c.cpp' object='CppUTestExtTests-TestMockSupport_c.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/MockFailureTest.cpp' object='CppUTestExtTests-MockFailureTest.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestMockSupport_c.obj `if test -f 'tests/CppUTestExt/TestMockSupport_c.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestMockSupport_c.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestMockSupport_c.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-MockFailureTest.o `test -f 'tests/CppUTestExt/MockFailureTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/MockFailureTest.cpp
 
-CppUTestExtTests-TestGMock.o: tests/CppUTestExt/TestGMock.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestGMock.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestGMock.Tpo -c -o CppUTestExtTests-TestGMock.o `test -f 'tests/CppUTestExt/TestGMock.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestGMock.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestGMock.Tpo $(DEPDIR)/CppUTestExtTests-TestGMock.Po
+CppUTestExtTests-MockFailureTest.obj: tests/CppUTestExt/MockFailureTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-MockFailureTest.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-MockFailureTest.Tpo -c -o CppUTestExtTests-MockFailureTest.obj `if test -f 'tests/CppUTestExt/MockFailureTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/MockFailureTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/MockFailureTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-MockFailureTest.Tpo $(DEPDIR)/CppUTestExtTests-MockFailureTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestGMock.cpp' object='CppUTestExtTests-TestGMock.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/MockFailureTest.cpp' object='CppUTestExtTests-MockFailureTest.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestGMock.o `test -f 'tests/CppUTestExt/TestGMock.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestGMock.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-MockFailureTest.obj `if test -f 'tests/CppUTestExt/MockFailureTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/MockFailureTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/MockFailureTest.cpp'; fi`
 
-CppUTestExtTests-TestGMock.obj: tests/CppUTestExt/TestGMock.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestGMock.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestGMock.Tpo -c -o CppUTestExtTests-TestGMock.obj `if test -f 'tests/CppUTestExt/TestGMock.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestGMock.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestGMock.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestGMock.Tpo $(DEPDIR)/CppUTestExtTests-TestGMock.Po
+CppUTestExtTests-MockPluginTest.o: tests/CppUTestExt/MockPluginTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-MockPluginTest.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-MockPluginTest.Tpo -c -o CppUTestExtTests-MockPluginTest.o `test -f 'tests/CppUTestExt/MockPluginTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/MockPluginTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-MockPluginTest.Tpo $(DEPDIR)/CppUTestExtTests-MockPluginTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestGMock.cpp' object='CppUTestExtTests-TestGMock.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/MockPluginTest.cpp' object='CppUTestExtTests-MockPluginTest.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestGMock.obj `if test -f 'tests/CppUTestExt/TestGMock.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestGMock.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestGMock.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-MockPluginTest.o `test -f 'tests/CppUTestExt/MockPluginTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/MockPluginTest.cpp
 
-CppUTestExtTests-TestMockExpectedFunctionCall.o: tests/CppUTestExt/TestMockExpectedFunctionCall.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestMockExpectedFunctionCall.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestMockExpectedFunctionCall.Tpo -c -o CppUTestExtTests-TestMockExpectedFunctionCall.o `test -f 'tests/CppUTestExt/TestMockExpectedFunctionCall.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestMockExpectedFunctionCall.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestMockExpectedFunctionCall.Tpo $(DEPDIR)/CppUTestExtTests-TestMockExpectedFunctionCall.Po
+CppUTestExtTests-MockPluginTest.obj: tests/CppUTestExt/MockPluginTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-MockPluginTest.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-MockPluginTest.Tpo -c -o CppUTestExtTests-MockPluginTest.obj `if test -f 'tests/CppUTestExt/MockPluginTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/MockPluginTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/MockPluginTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-MockPluginTest.Tpo $(DEPDIR)/CppUTestExtTests-MockPluginTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestMockExpectedFunctionCall.cpp' object='CppUTestExtTests-TestMockExpectedFunctionCall.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/MockPluginTest.cpp' object='CppUTestExtTests-MockPluginTest.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestMockExpectedFunctionCall.o `test -f 'tests/CppUTestExt/TestMockExpectedFunctionCall.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestMockExpectedFunctionCall.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-MockPluginTest.obj `if test -f 'tests/CppUTestExt/MockPluginTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/MockPluginTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/MockPluginTest.cpp'; fi`
 
-CppUTestExtTests-TestMockExpectedFunctionCall.obj: tests/CppUTestExt/TestMockExpectedFunctionCall.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestMockExpectedFunctionCall.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestMockExpectedFunctionCall.Tpo -c -o CppUTestExtTests-TestMockExpectedFunctionCall.obj `if test -f 'tests/CppUTestExt/TestMockExpectedFunctionCall.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestMockExpectedFunctionCall.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestMockExpectedFunctionCall.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestMockExpectedFunctionCall.Tpo $(DEPDIR)/CppUTestExtTests-TestMockExpectedFunctionCall.Po
+CppUTestExtTests-MockSupportTest.o: tests/CppUTestExt/MockSupportTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-MockSupportTest.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-MockSupportTest.Tpo -c -o CppUTestExtTests-MockSupportTest.o `test -f 'tests/CppUTestExt/MockSupportTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/MockSupportTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-MockSupportTest.Tpo $(DEPDIR)/CppUTestExtTests-MockSupportTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestMockExpectedFunctionCall.cpp' object='CppUTestExtTests-TestMockExpectedFunctionCall.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/MockSupportTest.cpp' object='CppUTestExtTests-MockSupportTest.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestMockExpectedFunctionCall.obj `if test -f 'tests/CppUTestExt/TestMockExpectedFunctionCall.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestMockExpectedFunctionCall.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestMockExpectedFunctionCall.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-MockSupportTest.o `test -f 'tests/CppUTestExt/MockSupportTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/MockSupportTest.cpp
 
-CppUTestExtTests-TestGTest.o: tests/CppUTestExt/TestGTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestGTest.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestGTest.Tpo -c -o CppUTestExtTests-TestGTest.o `test -f 'tests/CppUTestExt/TestGTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestGTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestGTest.Tpo $(DEPDIR)/CppUTestExtTests-TestGTest.Po
+CppUTestExtTests-MockSupportTest.obj: tests/CppUTestExt/MockSupportTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-MockSupportTest.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-MockSupportTest.Tpo -c -o CppUTestExtTests-MockSupportTest.obj `if test -f 'tests/CppUTestExt/MockSupportTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/MockSupportTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/MockSupportTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-MockSupportTest.Tpo $(DEPDIR)/CppUTestExtTests-MockSupportTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestGTest.cpp' object='CppUTestExtTests-TestGTest.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/MockSupportTest.cpp' object='CppUTestExtTests-MockSupportTest.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestGTest.o `test -f 'tests/CppUTestExt/TestGTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestGTest.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-MockSupportTest.obj `if test -f 'tests/CppUTestExt/MockSupportTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/MockSupportTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/MockSupportTest.cpp'; fi`
 
-CppUTestExtTests-TestGTest.obj: tests/CppUTestExt/TestGTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestGTest.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestGTest.Tpo -c -o CppUTestExtTests-TestGTest.obj `if test -f 'tests/CppUTestExt/TestGTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestGTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestGTest.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestGTest.Tpo $(DEPDIR)/CppUTestExtTests-TestGTest.Po
+CppUTestExtTests-MockSupport_cTest.o: tests/CppUTestExt/MockSupport_cTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-MockSupport_cTest.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-MockSupport_cTest.Tpo -c -o CppUTestExtTests-MockSupport_cTest.o `test -f 'tests/CppUTestExt/MockSupport_cTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/MockSupport_cTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-MockSupport_cTest.Tpo $(DEPDIR)/CppUTestExtTests-MockSupport_cTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestGTest.cpp' object='CppUTestExtTests-TestGTest.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/MockSupport_cTest.cpp' object='CppUTestExtTests-MockSupport_cTest.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestGTest.obj `if test -f 'tests/CppUTestExt/TestGTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestGTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestGTest.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-MockSupport_cTest.o `test -f 'tests/CppUTestExt/MockSupport_cTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/MockSupport_cTest.cpp
 
-CppUTestExtTests-TestGTestConvertor.o: tests/CppUTestExt/TestGTestConvertor.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestGTestConvertor.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestGTestConvertor.Tpo -c -o CppUTestExtTests-TestGTestConvertor.o `test -f 'tests/CppUTestExt/TestGTestConvertor.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestGTestConvertor.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestGTestConvertor.Tpo $(DEPDIR)/CppUTestExtTests-TestGTestConvertor.Po
+CppUTestExtTests-MockSupport_cTest.obj: tests/CppUTestExt/MockSupport_cTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-MockSupport_cTest.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-MockSupport_cTest.Tpo -c -o CppUTestExtTests-MockSupport_cTest.obj `if test -f 'tests/CppUTestExt/MockSupport_cTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/MockSupport_cTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/MockSupport_cTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-MockSupport_cTest.Tpo $(DEPDIR)/CppUTestExtTests-MockSupport_cTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestGTestConvertor.cpp' object='CppUTestExtTests-TestGTestConvertor.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/MockSupport_cTest.cpp' object='CppUTestExtTests-MockSupport_cTest.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestGTestConvertor.o `test -f 'tests/CppUTestExt/TestGTestConvertor.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestGTestConvertor.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-MockSupport_cTest.obj `if test -f 'tests/CppUTestExt/MockSupport_cTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/MockSupport_cTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/MockSupport_cTest.cpp'; fi`
 
-CppUTestExtTests-TestGTestConvertor.obj: tests/CppUTestExt/TestGTestConvertor.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestGTestConvertor.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestGTestConvertor.Tpo -c -o CppUTestExtTests-TestGTestConvertor.obj `if test -f 'tests/CppUTestExt/TestGTestConvertor.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestGTestConvertor.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestGTestConvertor.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestGTestConvertor.Tpo $(DEPDIR)/CppUTestExtTests-TestGTestConvertor.Po
+CppUTestExtTests-OrderedTestTest.o: tests/CppUTestExt/OrderedTestTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-OrderedTestTest.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-OrderedTestTest.Tpo -c -o CppUTestExtTests-OrderedTestTest.o `test -f 'tests/CppUTestExt/OrderedTestTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/OrderedTestTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-OrderedTestTest.Tpo $(DEPDIR)/CppUTestExtTests-OrderedTestTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestGTestConvertor.cpp' object='CppUTestExtTests-TestGTestConvertor.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/OrderedTestTest.cpp' object='CppUTestExtTests-OrderedTestTest.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestGTestConvertor.obj `if test -f 'tests/CppUTestExt/TestGTestConvertor.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestGTestConvertor.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestGTestConvertor.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-OrderedTestTest.o `test -f 'tests/CppUTestExt/OrderedTestTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/OrderedTestTest.cpp
 
-CppUTestExtTests-TestMockExpectedFunctionsList.o: tests/CppUTestExt/TestMockExpectedFunctionsList.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestMockExpectedFunctionsList.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestMockExpectedFunctionsList.Tpo -c -o CppUTestExtTests-TestMockExpectedFunctionsList.o `test -f 'tests/CppUTestExt/TestMockExpectedFunctionsList.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestMockExpectedFunctionsList.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestMockExpectedFunctionsList.Tpo $(DEPDIR)/CppUTestExtTests-TestMockExpectedFunctionsList.Po
+CppUTestExtTests-OrderedTestTest.obj: tests/CppUTestExt/OrderedTestTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-OrderedTestTest.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-OrderedTestTest.Tpo -c -o CppUTestExtTests-OrderedTestTest.obj `if test -f 'tests/CppUTestExt/OrderedTestTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/OrderedTestTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/OrderedTestTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-OrderedTestTest.Tpo $(DEPDIR)/CppUTestExtTests-OrderedTestTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestMockExpectedFunctionsList.cpp' object='CppUTestExtTests-TestMockExpectedFunctionsList.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/OrderedTestTest.cpp' object='CppUTestExtTests-OrderedTestTest.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestMockExpectedFunctionsList.o `test -f 'tests/CppUTestExt/TestMockExpectedFunctionsList.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestMockExpectedFunctionsList.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-OrderedTestTest.obj `if test -f 'tests/CppUTestExt/OrderedTestTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/OrderedTestTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/OrderedTestTest.cpp'; fi`
 
-CppUTestExtTests-TestMockExpectedFunctionsList.obj: tests/CppUTestExt/TestMockExpectedFunctionsList.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestMockExpectedFunctionsList.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestMockExpectedFunctionsList.Tpo -c -o CppUTestExtTests-TestMockExpectedFunctionsList.obj `if test -f 'tests/CppUTestExt/TestMockExpectedFunctionsList.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestMockExpectedFunctionsList.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestMockExpectedFunctionsList.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestMockExpectedFunctionsList.Tpo $(DEPDIR)/CppUTestExtTests-TestMockExpectedFunctionsList.Po
+CppUTestTests-AllocationInCppFile.o: tests/AllocationInCppFile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-AllocationInCppFile.o -MD -MP -MF $(DEPDIR)/CppUTestTests-AllocationInCppFile.Tpo -c -o CppUTestTests-AllocationInCppFile.o `test -f 'tests/AllocationInCppFile.cpp' || echo '$(srcdir)/'`tests/AllocationInCppFile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-AllocationInCppFile.Tpo $(DEPDIR)/CppUTestTests-AllocationInCppFile.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestMockExpectedFunctionsList.cpp' object='CppUTestExtTests-TestMockExpectedFunctionsList.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/AllocationInCppFile.cpp' object='CppUTestTests-AllocationInCppFile.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestMockExpectedFunctionsList.obj `if test -f 'tests/CppUTestExt/TestMockExpectedFunctionsList.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestMockExpectedFunctionsList.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestMockExpectedFunctionsList.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-AllocationInCppFile.o `test -f 'tests/AllocationInCppFile.cpp' || echo '$(srcdir)/'`tests/AllocationInCppFile.cpp
 
-CppUTestExtTests-TestMemoryReportAllocator.o: tests/CppUTestExt/TestMemoryReportAllocator.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestMemoryReportAllocator.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestMemoryReportAllocator.Tpo -c -o CppUTestExtTests-TestMemoryReportAllocator.o `test -f 'tests/CppUTestExt/TestMemoryReportAllocator.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestMemoryReportAllocator.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestMemoryReportAllocator.Tpo $(DEPDIR)/CppUTestExtTests-TestMemoryReportAllocator.Po
+CppUTestTests-AllocationInCppFile.obj: tests/AllocationInCppFile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-AllocationInCppFile.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-AllocationInCppFile.Tpo -c -o CppUTestTests-AllocationInCppFile.obj `if test -f 'tests/AllocationInCppFile.cpp'; then $(CYGPATH_W) 'tests/AllocationInCppFile.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/AllocationInCppFile.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-AllocationInCppFile.Tpo $(DEPDIR)/CppUTestTests-AllocationInCppFile.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestMemoryReportAllocator.cpp' object='CppUTestExtTests-TestMemoryReportAllocator.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/AllocationInCppFile.cpp' object='CppUTestTests-AllocationInCppFile.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestMemoryReportAllocator.o `test -f 'tests/CppUTestExt/TestMemoryReportAllocator.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestMemoryReportAllocator.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-AllocationInCppFile.obj `if test -f 'tests/AllocationInCppFile.cpp'; then $(CYGPATH_W) 'tests/AllocationInCppFile.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/AllocationInCppFile.cpp'; fi`
 
-CppUTestExtTests-TestMemoryReportAllocator.obj: tests/CppUTestExt/TestMemoryReportAllocator.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestMemoryReportAllocator.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestMemoryReportAllocator.Tpo -c -o CppUTestExtTests-TestMemoryReportAllocator.obj `if test -f 'tests/CppUTestExt/TestMemoryReportAllocator.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestMemoryReportAllocator.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestMemoryReportAllocator.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestMemoryReportAllocator.Tpo $(DEPDIR)/CppUTestExtTests-TestMemoryReportAllocator.Po
+CppUTestTests-AllocLetTestFreeTest.o: tests/AllocLetTestFreeTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-AllocLetTestFreeTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-AllocLetTestFreeTest.Tpo -c -o CppUTestTests-AllocLetTestFreeTest.o `test -f 'tests/AllocLetTestFreeTest.cpp' || echo '$(srcdir)/'`tests/AllocLetTestFreeTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-AllocLetTestFreeTest.Tpo $(DEPDIR)/CppUTestTests-AllocLetTestFreeTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestMemoryReportAllocator.cpp' object='CppUTestExtTests-TestMemoryReportAllocator.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/AllocLetTestFreeTest.cpp' object='CppUTestTests-AllocLetTestFreeTest.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestMemoryReportAllocator.obj `if test -f 'tests/CppUTestExt/TestMemoryReportAllocator.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestMemoryReportAllocator.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestMemoryReportAllocator.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-AllocLetTestFreeTest.o `test -f 'tests/AllocLetTestFreeTest.cpp' || echo '$(srcdir)/'`tests/AllocLetTestFreeTest.cpp
 
-CppUTestExtTests-TestMockFailure.o: tests/CppUTestExt/TestMockFailure.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestMockFailure.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestMockFailure.Tpo -c -o CppUTestExtTests-TestMockFailure.o `test -f 'tests/CppUTestExt/TestMockFailure.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestMockFailure.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestMockFailure.Tpo $(DEPDIR)/CppUTestExtTests-TestMockFailure.Po
+CppUTestTests-AllocLetTestFreeTest.obj: tests/AllocLetTestFreeTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-AllocLetTestFreeTest.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-AllocLetTestFreeTest.Tpo -c -o CppUTestTests-AllocLetTestFreeTest.obj `if test -f 'tests/AllocLetTestFreeTest.cpp'; then $(CYGPATH_W) 'tests/AllocLetTestFreeTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/AllocLetTestFreeTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-AllocLetTestFreeTest.Tpo $(DEPDIR)/CppUTestTests-AllocLetTestFreeTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestMockFailure.cpp' object='CppUTestExtTests-TestMockFailure.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/AllocLetTestFreeTest.cpp' object='CppUTestTests-AllocLetTestFreeTest.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestMockFailure.o `test -f 'tests/CppUTestExt/TestMockFailure.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestMockFailure.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-AllocLetTestFreeTest.obj `if test -f 'tests/AllocLetTestFreeTest.cpp'; then $(CYGPATH_W) 'tests/AllocLetTestFreeTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/AllocLetTestFreeTest.cpp'; fi`
 
-CppUTestExtTests-TestMockFailure.obj: tests/CppUTestExt/TestMockFailure.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestMockFailure.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestMockFailure.Tpo -c -o CppUTestExtTests-TestMockFailure.obj `if test -f 'tests/CppUTestExt/TestMockFailure.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestMockFailure.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestMockFailure.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestMockFailure.Tpo $(DEPDIR)/CppUTestExtTests-TestMockFailure.Po
+CppUTestTests-AllTests.o: tests/AllTests.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-AllTests.o -MD -MP -MF $(DEPDIR)/CppUTestTests-AllTests.Tpo -c -o CppUTestTests-AllTests.o `test -f 'tests/AllTests.cpp' || echo '$(srcdir)/'`tests/AllTests.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-AllTests.Tpo $(DEPDIR)/CppUTestTests-AllTests.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestMockFailure.cpp' object='CppUTestExtTests-TestMockFailure.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/AllTests.cpp' object='CppUTestTests-AllTests.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestMockFailure.obj `if test -f 'tests/CppUTestExt/TestMockFailure.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestMockFailure.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestMockFailure.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-AllTests.o `test -f 'tests/AllTests.cpp' || echo '$(srcdir)/'`tests/AllTests.cpp
 
-CppUTestExtTests-TestOrderedTest.o: tests/CppUTestExt/TestOrderedTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestOrderedTest.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestOrderedTest.Tpo -c -o CppUTestExtTests-TestOrderedTest.o `test -f 'tests/CppUTestExt/TestOrderedTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestOrderedTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestOrderedTest.Tpo $(DEPDIR)/CppUTestExtTests-TestOrderedTest.Po
+CppUTestTests-AllTests.obj: tests/AllTests.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-AllTests.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-AllTests.Tpo -c -o CppUTestTests-AllTests.obj `if test -f 'tests/AllTests.cpp'; then $(CYGPATH_W) 'tests/AllTests.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/AllTests.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-AllTests.Tpo $(DEPDIR)/CppUTestTests-AllTests.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestOrderedTest.cpp' object='CppUTestExtTests-TestOrderedTest.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/AllTests.cpp' object='CppUTestTests-AllTests.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestOrderedTest.o `test -f 'tests/CppUTestExt/TestOrderedTest.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestOrderedTest.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-AllTests.obj `if test -f 'tests/AllTests.cpp'; then $(CYGPATH_W) 'tests/AllTests.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/AllTests.cpp'; fi`
 
-CppUTestExtTests-TestOrderedTest.obj: tests/CppUTestExt/TestOrderedTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestOrderedTest.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestOrderedTest.Tpo -c -o CppUTestExtTests-TestOrderedTest.obj `if test -f 'tests/CppUTestExt/TestOrderedTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestOrderedTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestOrderedTest.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestOrderedTest.Tpo $(DEPDIR)/CppUTestExtTests-TestOrderedTest.Po
+CppUTestTests-CheatSheetTest.o: tests/CheatSheetTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-CheatSheetTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-CheatSheetTest.Tpo -c -o CppUTestTests-CheatSheetTest.o `test -f 'tests/CheatSheetTest.cpp' || echo '$(srcdir)/'`tests/CheatSheetTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-CheatSheetTest.Tpo $(DEPDIR)/CppUTestTests-CheatSheetTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestOrderedTest.cpp' object='CppUTestExtTests-TestOrderedTest.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CheatSheetTest.cpp' object='CppUTestTests-CheatSheetTest.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestOrderedTest.obj `if test -f 'tests/CppUTestExt/TestOrderedTest.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestOrderedTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestOrderedTest.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-CheatSheetTest.o `test -f 'tests/CheatSheetTest.cpp' || echo '$(srcdir)/'`tests/CheatSheetTest.cpp
 
-CppUTestExtTests-TestMemoryReportFormatter.o: tests/CppUTestExt/TestMemoryReportFormatter.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestMemoryReportFormatter.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestMemoryReportFormatter.Tpo -c -o CppUTestExtTests-TestMemoryReportFormatter.o `test -f 'tests/CppUTestExt/TestMemoryReportFormatter.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestMemoryReportFormatter.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestMemoryReportFormatter.Tpo $(DEPDIR)/CppUTestExtTests-TestMemoryReportFormatter.Po
+CppUTestTests-CheatSheetTest.obj: tests/CheatSheetTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-CheatSheetTest.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-CheatSheetTest.Tpo -c -o CppUTestTests-CheatSheetTest.obj `if test -f 'tests/CheatSheetTest.cpp'; then $(CYGPATH_W) 'tests/CheatSheetTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CheatSheetTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-CheatSheetTest.Tpo $(DEPDIR)/CppUTestTests-CheatSheetTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestMemoryReportFormatter.cpp' object='CppUTestExtTests-TestMemoryReportFormatter.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CheatSheetTest.cpp' object='CppUTestTests-CheatSheetTest.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestMemoryReportFormatter.o `test -f 'tests/CppUTestExt/TestMemoryReportFormatter.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestMemoryReportFormatter.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-CheatSheetTest.obj `if test -f 'tests/CheatSheetTest.cpp'; then $(CYGPATH_W) 'tests/CheatSheetTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CheatSheetTest.cpp'; fi`
 
-CppUTestExtTests-TestMemoryReportFormatter.obj: tests/CppUTestExt/TestMemoryReportFormatter.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestMemoryReportFormatter.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestMemoryReportFormatter.Tpo -c -o CppUTestExtTests-TestMemoryReportFormatter.obj `if test -f 'tests/CppUTestExt/TestMemoryReportFormatter.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestMemoryReportFormatter.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestMemoryReportFormatter.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestMemoryReportFormatter.Tpo $(DEPDIR)/CppUTestExtTests-TestMemoryReportFormatter.Po
+CppUTestTests-CommandLineArgumentsTest.o: tests/CommandLineArgumentsTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-CommandLineArgumentsTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-CommandLineArgumentsTest.Tpo -c -o CppUTestTests-CommandLineArgumentsTest.o `test -f 'tests/CommandLineArgumentsTest.cpp' || echo '$(srcdir)/'`tests/CommandLineArgumentsTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-CommandLineArgumentsTest.Tpo $(DEPDIR)/CppUTestTests-CommandLineArgumentsTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestMemoryReportFormatter.cpp' object='CppUTestExtTests-TestMemoryReportFormatter.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CommandLineArgumentsTest.cpp' object='CppUTestTests-CommandLineArgumentsTest.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestMemoryReportFormatter.obj `if test -f 'tests/CppUTestExt/TestMemoryReportFormatter.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestMemoryReportFormatter.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestMemoryReportFormatter.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-CommandLineArgumentsTest.o `test -f 'tests/CommandLineArgumentsTest.cpp' || echo '$(srcdir)/'`tests/CommandLineArgumentsTest.cpp
 
-CppUTestExtTests-TestMemoryReporterPlugin.o: tests/CppUTestExt/TestMemoryReporterPlugin.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestMemoryReporterPlugin.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestMemoryReporterPlugin.Tpo -c -o CppUTestExtTests-TestMemoryReporterPlugin.o `test -f 'tests/CppUTestExt/TestMemoryReporterPlugin.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestMemoryReporterPlugin.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestMemoryReporterPlugin.Tpo $(DEPDIR)/CppUTestExtTests-TestMemoryReporterPlugin.Po
+CppUTestTests-CommandLineArgumentsTest.obj: tests/CommandLineArgumentsTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-CommandLineArgumentsTest.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-CommandLineArgumentsTest.Tpo -c -o CppUTestTests-CommandLineArgumentsTest.obj `if test -f 'tests/CommandLineArgumentsTest.cpp'; then $(CYGPATH_W) 'tests/CommandLineArgumentsTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CommandLineArgumentsTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-CommandLineArgumentsTest.Tpo $(DEPDIR)/CppUTestTests-CommandLineArgumentsTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestMemoryReporterPlugin.cpp' object='CppUTestExtTests-TestMemoryReporterPlugin.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CommandLineArgumentsTest.cpp' object='CppUTestTests-CommandLineArgumentsTest.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestMemoryReporterPlugin.o `test -f 'tests/CppUTestExt/TestMemoryReporterPlugin.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestMemoryReporterPlugin.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-CommandLineArgumentsTest.obj `if test -f 'tests/CommandLineArgumentsTest.cpp'; then $(CYGPATH_W) 'tests/CommandLineArgumentsTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CommandLineArgumentsTest.cpp'; fi`
 
-CppUTestExtTests-TestMemoryReporterPlugin.obj: tests/CppUTestExt/TestMemoryReporterPlugin.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestMemoryReporterPlugin.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestMemoryReporterPlugin.Tpo -c -o CppUTestExtTests-TestMemoryReporterPlugin.obj `if test -f 'tests/CppUTestExt/TestMemoryReporterPlugin.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestMemoryReporterPlugin.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestMemoryReporterPlugin.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestMemoryReporterPlugin.Tpo $(DEPDIR)/CppUTestExtTests-TestMemoryReporterPlugin.Po
+CppUTestTests-CommandLineTestRunnerTest.o: tests/CommandLineTestRunnerTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-CommandLineTestRunnerTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-CommandLineTestRunnerTest.Tpo -c -o CppUTestTests-CommandLineTestRunnerTest.o `test -f 'tests/CommandLineTestRunnerTest.cpp' || echo '$(srcdir)/'`tests/CommandLineTestRunnerTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-CommandLineTestRunnerTest.Tpo $(DEPDIR)/CppUTestTests-CommandLineTestRunnerTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestMemoryReporterPlugin.cpp' object='CppUTestExtTests-TestMemoryReporterPlugin.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CommandLineTestRunnerTest.cpp' object='CppUTestTests-CommandLineTestRunnerTest.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestMemoryReporterPlugin.obj `if test -f 'tests/CppUTestExt/TestMemoryReporterPlugin.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestMemoryReporterPlugin.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestMemoryReporterPlugin.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-CommandLineTestRunnerTest.o `test -f 'tests/CommandLineTestRunnerTest.cpp' || echo '$(srcdir)/'`tests/CommandLineTestRunnerTest.cpp
 
-CppUTestExtTests-TestMockPlugin.o: tests/CppUTestExt/TestMockPlugin.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestMockPlugin.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestMockPlugin.Tpo -c -o CppUTestExtTests-TestMockPlugin.o `test -f 'tests/CppUTestExt/TestMockPlugin.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestMockPlugin.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestMockPlugin.Tpo $(DEPDIR)/CppUTestExtTests-TestMockPlugin.Po
+CppUTestTests-CommandLineTestRunnerTest.obj: tests/CommandLineTestRunnerTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-CommandLineTestRunnerTest.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-CommandLineTestRunnerTest.Tpo -c -o CppUTestTests-CommandLineTestRunnerTest.obj `if test -f 'tests/CommandLineTestRunnerTest.cpp'; then $(CYGPATH_W) 'tests/CommandLineTestRunnerTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CommandLineTestRunnerTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-CommandLineTestRunnerTest.Tpo $(DEPDIR)/CppUTestTests-CommandLineTestRunnerTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestMockPlugin.cpp' object='CppUTestExtTests-TestMockPlugin.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CommandLineTestRunnerTest.cpp' object='CppUTestTests-CommandLineTestRunnerTest.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestMockPlugin.o `test -f 'tests/CppUTestExt/TestMockPlugin.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/TestMockPlugin.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-CommandLineTestRunnerTest.obj `if test -f 'tests/CommandLineTestRunnerTest.cpp'; then $(CYGPATH_W) 'tests/CommandLineTestRunnerTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CommandLineTestRunnerTest.cpp'; fi`
 
-CppUTestExtTests-TestMockPlugin.obj: tests/CppUTestExt/TestMockPlugin.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-TestMockPlugin.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-TestMockPlugin.Tpo -c -o CppUTestExtTests-TestMockPlugin.obj `if test -f 'tests/CppUTestExt/TestMockPlugin.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestMockPlugin.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestMockPlugin.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-TestMockPlugin.Tpo $(DEPDIR)/CppUTestExtTests-TestMockPlugin.Po
+CppUTestTests-JUnitOutputTest.o: tests/JUnitOutputTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-JUnitOutputTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-JUnitOutputTest.Tpo -c -o CppUTestTests-JUnitOutputTest.o `test -f 'tests/JUnitOutputTest.cpp' || echo '$(srcdir)/'`tests/JUnitOutputTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-JUnitOutputTest.Tpo $(DEPDIR)/CppUTestTests-JUnitOutputTest.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/JUnitOutputTest.cpp' object='CppUTestTests-JUnitOutputTest.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-JUnitOutputTest.o `test -f 'tests/JUnitOutputTest.cpp' || echo '$(srcdir)/'`tests/JUnitOutputTest.cpp
+
+CppUTestTests-JUnitOutputTest.obj: tests/JUnitOutputTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-JUnitOutputTest.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-JUnitOutputTest.Tpo -c -o CppUTestTests-JUnitOutputTest.obj `if test -f 'tests/JUnitOutputTest.cpp'; then $(CYGPATH_W) 'tests/JUnitOutputTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/JUnitOutputTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-JUnitOutputTest.Tpo $(DEPDIR)/CppUTestTests-JUnitOutputTest.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/JUnitOutputTest.cpp' object='CppUTestTests-JUnitOutputTest.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-JUnitOutputTest.obj `if test -f 'tests/JUnitOutputTest.cpp'; then $(CYGPATH_W) 'tests/JUnitOutputTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/JUnitOutputTest.cpp'; fi`
+
+CppUTestTests-MemoryLeakDetectorTest.o: tests/MemoryLeakDetectorTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-MemoryLeakDetectorTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-MemoryLeakDetectorTest.Tpo -c -o CppUTestTests-MemoryLeakDetectorTest.o `test -f 'tests/MemoryLeakDetectorTest.cpp' || echo '$(srcdir)/'`tests/MemoryLeakDetectorTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-MemoryLeakDetectorTest.Tpo $(DEPDIR)/CppUTestTests-MemoryLeakDetectorTest.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/MemoryLeakDetectorTest.cpp' object='CppUTestTests-MemoryLeakDetectorTest.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-MemoryLeakDetectorTest.o `test -f 'tests/MemoryLeakDetectorTest.cpp' || echo '$(srcdir)/'`tests/MemoryLeakDetectorTest.cpp
+
+CppUTestTests-MemoryLeakDetectorTest.obj: tests/MemoryLeakDetectorTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-MemoryLeakDetectorTest.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-MemoryLeakDetectorTest.Tpo -c -o CppUTestTests-MemoryLeakDetectorTest.obj `if test -f 'tests/MemoryLeakDetectorTest.cpp'; then $(CYGPATH_W) 'tests/MemoryLeakDetectorTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/MemoryLeakDetectorTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-MemoryLeakDetectorTest.Tpo $(DEPDIR)/CppUTestTests-MemoryLeakDetectorTest.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/MemoryLeakDetectorTest.cpp' object='CppUTestTests-MemoryLeakDetectorTest.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-MemoryLeakDetectorTest.obj `if test -f 'tests/MemoryLeakDetectorTest.cpp'; then $(CYGPATH_W) 'tests/MemoryLeakDetectorTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/MemoryLeakDetectorTest.cpp'; fi`
+
+CppUTestTests-MemoryLeakOperatorOverloadsTest.o: tests/MemoryLeakOperatorOverloadsTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-MemoryLeakOperatorOverloadsTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-MemoryLeakOperatorOverloadsTest.Tpo -c -o CppUTestTests-MemoryLeakOperatorOverloadsTest.o `test -f 'tests/MemoryLeakOperatorOverloadsTest.cpp' || echo '$(srcdir)/'`tests/MemoryLeakOperatorOverloadsTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-MemoryLeakOperatorOverloadsTest.Tpo $(DEPDIR)/CppUTestTests-MemoryLeakOperatorOverloadsTest.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/MemoryLeakOperatorOverloadsTest.cpp' object='CppUTestTests-MemoryLeakOperatorOverloadsTest.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-MemoryLeakOperatorOverloadsTest.o `test -f 'tests/MemoryLeakOperatorOverloadsTest.cpp' || echo '$(srcdir)/'`tests/MemoryLeakOperatorOverloadsTest.cpp
+
+CppUTestTests-MemoryLeakOperatorOverloadsTest.obj: tests/MemoryLeakOperatorOverloadsTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-MemoryLeakOperatorOverloadsTest.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-MemoryLeakOperatorOverloadsTest.Tpo -c -o CppUTestTests-MemoryLeakOperatorOverloadsTest.obj `if test -f 'tests/MemoryLeakOperatorOverloadsTest.cpp'; then $(CYGPATH_W) 'tests/MemoryLeakOperatorOverloadsTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/MemoryLeakOperatorOverloadsTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-MemoryLeakOperatorOverloadsTest.Tpo $(DEPDIR)/CppUTestTests-MemoryLeakOperatorOverloadsTest.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/MemoryLeakOperatorOverloadsTest.cpp' object='CppUTestTests-MemoryLeakOperatorOverloadsTest.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-MemoryLeakOperatorOverloadsTest.obj `if test -f 'tests/MemoryLeakOperatorOverloadsTest.cpp'; then $(CYGPATH_W) 'tests/MemoryLeakOperatorOverloadsTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/MemoryLeakOperatorOverloadsTest.cpp'; fi`
+
+CppUTestTests-MemoryLeakWarningTest.o: tests/MemoryLeakWarningTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-MemoryLeakWarningTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-MemoryLeakWarningTest.Tpo -c -o CppUTestTests-MemoryLeakWarningTest.o `test -f 'tests/MemoryLeakWarningTest.cpp' || echo '$(srcdir)/'`tests/MemoryLeakWarningTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-MemoryLeakWarningTest.Tpo $(DEPDIR)/CppUTestTests-MemoryLeakWarningTest.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/MemoryLeakWarningTest.cpp' object='CppUTestTests-MemoryLeakWarningTest.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-MemoryLeakWarningTest.o `test -f 'tests/MemoryLeakWarningTest.cpp' || echo '$(srcdir)/'`tests/MemoryLeakWarningTest.cpp
+
+CppUTestTests-MemoryLeakWarningTest.obj: tests/MemoryLeakWarningTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-MemoryLeakWarningTest.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-MemoryLeakWarningTest.Tpo -c -o CppUTestTests-MemoryLeakWarningTest.obj `if test -f 'tests/MemoryLeakWarningTest.cpp'; then $(CYGPATH_W) 'tests/MemoryLeakWarningTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/MemoryLeakWarningTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-MemoryLeakWarningTest.Tpo $(DEPDIR)/CppUTestTests-MemoryLeakWarningTest.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/MemoryLeakWarningTest.cpp' object='CppUTestTests-MemoryLeakWarningTest.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-MemoryLeakWarningTest.obj `if test -f 'tests/MemoryLeakWarningTest.cpp'; then $(CYGPATH_W) 'tests/MemoryLeakWarningTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/MemoryLeakWarningTest.cpp'; fi`
+
+CppUTestTests-NullTestTest.o: tests/NullTestTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-NullTestTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-NullTestTest.Tpo -c -o CppUTestTests-NullTestTest.o `test -f 'tests/NullTestTest.cpp' || echo '$(srcdir)/'`tests/NullTestTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-NullTestTest.Tpo $(DEPDIR)/CppUTestTests-NullTestTest.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/NullTestTest.cpp' object='CppUTestTests-NullTestTest.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-NullTestTest.o `test -f 'tests/NullTestTest.cpp' || echo '$(srcdir)/'`tests/NullTestTest.cpp
+
+CppUTestTests-NullTestTest.obj: tests/NullTestTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-NullTestTest.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-NullTestTest.Tpo -c -o CppUTestTests-NullTestTest.obj `if test -f 'tests/NullTestTest.cpp'; then $(CYGPATH_W) 'tests/NullTestTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/NullTestTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-NullTestTest.Tpo $(DEPDIR)/CppUTestTests-NullTestTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/TestMockPlugin.cpp' object='CppUTestExtTests-TestMockPlugin.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/NullTestTest.cpp' object='CppUTestTests-NullTestTest.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-TestMockPlugin.obj `if test -f 'tests/CppUTestExt/TestMockPlugin.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/TestMockPlugin.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/TestMockPlugin.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-NullTestTest.obj `if test -f 'tests/NullTestTest.cpp'; then $(CYGPATH_W) 'tests/NullTestTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/NullTestTest.cpp'; fi`
 
-CppUTestExtTests-AllTests.o: tests/CppUTestExt/AllTests.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-AllTests.o -MD -MP -MF $(DEPDIR)/CppUTestExtTests-AllTests.Tpo -c -o CppUTestExtTests-AllTests.o `test -f 'tests/CppUTestExt/AllTests.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/AllTests.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-AllTests.Tpo $(DEPDIR)/CppUTestExtTests-AllTests.Po
+CppUTestTests-PluginTest.o: tests/PluginTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-PluginTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-PluginTest.Tpo -c -o CppUTestTests-PluginTest.o `test -f 'tests/PluginTest.cpp' || echo '$(srcdir)/'`tests/PluginTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-PluginTest.Tpo $(DEPDIR)/CppUTestTests-PluginTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/AllTests.cpp' object='CppUTestExtTests-AllTests.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/PluginTest.cpp' object='CppUTestTests-PluginTest.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-AllTests.o `test -f 'tests/CppUTestExt/AllTests.cpp' || echo '$(srcdir)/'`tests/CppUTestExt/AllTests.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-PluginTest.o `test -f 'tests/PluginTest.cpp' || echo '$(srcdir)/'`tests/PluginTest.cpp
 
-CppUTestExtTests-AllTests.obj: tests/CppUTestExt/AllTests.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestExtTests-AllTests.obj -MD -MP -MF $(DEPDIR)/CppUTestExtTests-AllTests.Tpo -c -o CppUTestExtTests-AllTests.obj `if test -f 'tests/CppUTestExt/AllTests.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/AllTests.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/AllTests.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestExtTests-AllTests.Tpo $(DEPDIR)/CppUTestExtTests-AllTests.Po
+CppUTestTests-PluginTest.obj: tests/PluginTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-PluginTest.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-PluginTest.Tpo -c -o CppUTestTests-PluginTest.obj `if test -f 'tests/PluginTest.cpp'; then $(CYGPATH_W) 'tests/PluginTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/PluginTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-PluginTest.Tpo $(DEPDIR)/CppUTestTests-PluginTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CppUTestExt/AllTests.cpp' object='CppUTestExtTests-AllTests.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/PluginTest.cpp' object='CppUTestTests-PluginTest.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestExtTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestExtTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestExtTests-AllTests.obj `if test -f 'tests/CppUTestExt/AllTests.cpp'; then $(CYGPATH_W) 'tests/CppUTestExt/AllTests.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CppUTestExt/AllTests.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-PluginTest.obj `if test -f 'tests/PluginTest.cpp'; then $(CYGPATH_W) 'tests/PluginTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/PluginTest.cpp'; fi`
 
-CppUTestTests-AllTests.o: tests/AllTests.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-AllTests.o -MD -MP -MF $(DEPDIR)/CppUTestTests-AllTests.Tpo -c -o CppUTestTests-AllTests.o `test -f 'tests/AllTests.cpp' || echo '$(srcdir)/'`tests/AllTests.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-AllTests.Tpo $(DEPDIR)/CppUTestTests-AllTests.Po
+CppUTestTests-PreprocessorTest.o: tests/PreprocessorTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-PreprocessorTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-PreprocessorTest.Tpo -c -o CppUTestTests-PreprocessorTest.o `test -f 'tests/PreprocessorTest.cpp' || echo '$(srcdir)/'`tests/PreprocessorTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-PreprocessorTest.Tpo $(DEPDIR)/CppUTestTests-PreprocessorTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/AllTests.cpp' object='CppUTestTests-AllTests.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/PreprocessorTest.cpp' object='CppUTestTests-PreprocessorTest.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-AllTests.o `test -f 'tests/AllTests.cpp' || echo '$(srcdir)/'`tests/AllTests.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-PreprocessorTest.o `test -f 'tests/PreprocessorTest.cpp' || echo '$(srcdir)/'`tests/PreprocessorTest.cpp
 
-CppUTestTests-AllTests.obj: tests/AllTests.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-AllTests.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-AllTests.Tpo -c -o CppUTestTests-AllTests.obj `if test -f 'tests/AllTests.cpp'; then $(CYGPATH_W) 'tests/AllTests.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/AllTests.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-AllTests.Tpo $(DEPDIR)/CppUTestTests-AllTests.Po
+CppUTestTests-PreprocessorTest.obj: tests/PreprocessorTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-PreprocessorTest.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-PreprocessorTest.Tpo -c -o CppUTestTests-PreprocessorTest.obj `if test -f 'tests/PreprocessorTest.cpp'; then $(CYGPATH_W) 'tests/PreprocessorTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/PreprocessorTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-PreprocessorTest.Tpo $(DEPDIR)/CppUTestTests-PreprocessorTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/AllTests.cpp' object='CppUTestTests-AllTests.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/PreprocessorTest.cpp' object='CppUTestTests-PreprocessorTest.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-AllTests.obj `if test -f 'tests/AllTests.cpp'; then $(CYGPATH_W) 'tests/AllTests.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/AllTests.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-PreprocessorTest.obj `if test -f 'tests/PreprocessorTest.cpp'; then $(CYGPATH_W) 'tests/PreprocessorTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/PreprocessorTest.cpp'; fi`
 
 CppUTestTests-SetPluginTest.o: tests/SetPluginTest.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-SetPluginTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-SetPluginTest.Tpo -c -o CppUTestTests-SetPluginTest.o `test -f 'tests/SetPluginTest.cpp' || echo '$(srcdir)/'`tests/SetPluginTest.cpp
@@ -1672,22 +1863,6 @@ CppUTestTests-SetPluginTest.obj: tests/SetPluginTest.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-SetPluginTest.obj `if test -f 'tests/SetPluginTest.cpp'; then $(CYGPATH_W) 'tests/SetPluginTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/SetPluginTest.cpp'; fi`
 
-CppUTestTests-CheatSheetTest.o: tests/CheatSheetTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-CheatSheetTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-CheatSheetTest.Tpo -c -o CppUTestTests-CheatSheetTest.o `test -f 'tests/CheatSheetTest.cpp' || echo '$(srcdir)/'`tests/CheatSheetTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-CheatSheetTest.Tpo $(DEPDIR)/CppUTestTests-CheatSheetTest.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CheatSheetTest.cpp' object='CppUTestTests-CheatSheetTest.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-CheatSheetTest.o `test -f 'tests/CheatSheetTest.cpp' || echo '$(srcdir)/'`tests/CheatSheetTest.cpp
-
-CppUTestTests-CheatSheetTest.obj: tests/CheatSheetTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-CheatSheetTest.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-CheatSheetTest.Tpo -c -o CppUTestTests-CheatSheetTest.obj `if test -f 'tests/CheatSheetTest.cpp'; then $(CYGPATH_W) 'tests/CheatSheetTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CheatSheetTest.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-CheatSheetTest.Tpo $(DEPDIR)/CppUTestTests-CheatSheetTest.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CheatSheetTest.cpp' object='CppUTestTests-CheatSheetTest.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-CheatSheetTest.obj `if test -f 'tests/CheatSheetTest.cpp'; then $(CYGPATH_W) 'tests/CheatSheetTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CheatSheetTest.cpp'; fi`
-
 CppUTestTests-SimpleStringTest.o: tests/SimpleStringTest.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-SimpleStringTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-SimpleStringTest.Tpo -c -o CppUTestTests-SimpleStringTest.o `test -f 'tests/SimpleStringTest.cpp' || echo '$(srcdir)/'`tests/SimpleStringTest.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-SimpleStringTest.Tpo $(DEPDIR)/CppUTestTests-SimpleStringTest.Po
@@ -1704,38 +1879,6 @@ CppUTestTests-SimpleStringTest.obj: tests/SimpleStringTest.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-SimpleStringTest.obj `if test -f 'tests/SimpleStringTest.cpp'; then $(CYGPATH_W) 'tests/SimpleStringTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/SimpleStringTest.cpp'; fi`
 
-CppUTestTests-CommandLineArgumentsTest.o: tests/CommandLineArgumentsTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-CommandLineArgumentsTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-CommandLineArgumentsTest.Tpo -c -o CppUTestTests-CommandLineArgumentsTest.o `test -f 'tests/CommandLineArgumentsTest.cpp' || echo '$(srcdir)/'`tests/CommandLineArgumentsTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-CommandLineArgumentsTest.Tpo $(DEPDIR)/CppUTestTests-CommandLineArgumentsTest.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CommandLineArgumentsTest.cpp' object='CppUTestTests-CommandLineArgumentsTest.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-CommandLineArgumentsTest.o `test -f 'tests/CommandLineArgumentsTest.cpp' || echo '$(srcdir)/'`tests/CommandLineArgumentsTest.cpp
-
-CppUTestTests-CommandLineArgumentsTest.obj: tests/CommandLineArgumentsTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-CommandLineArgumentsTest.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-CommandLineArgumentsTest.Tpo -c -o CppUTestTests-CommandLineArgumentsTest.obj `if test -f 'tests/CommandLineArgumentsTest.cpp'; then $(CYGPATH_W) 'tests/CommandLineArgumentsTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CommandLineArgumentsTest.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-CommandLineArgumentsTest.Tpo $(DEPDIR)/CppUTestTests-CommandLineArgumentsTest.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CommandLineArgumentsTest.cpp' object='CppUTestTests-CommandLineArgumentsTest.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-CommandLineArgumentsTest.obj `if test -f 'tests/CommandLineArgumentsTest.cpp'; then $(CYGPATH_W) 'tests/CommandLineArgumentsTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CommandLineArgumentsTest.cpp'; fi`
-
-CppUTestTests-TestFailureTest.o: tests/TestFailureTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-TestFailureTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-TestFailureTest.Tpo -c -o CppUTestTests-TestFailureTest.o `test -f 'tests/TestFailureTest.cpp' || echo '$(srcdir)/'`tests/TestFailureTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-TestFailureTest.Tpo $(DEPDIR)/CppUTestTests-TestFailureTest.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/TestFailureTest.cpp' object='CppUTestTests-TestFailureTest.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-TestFailureTest.o `test -f 'tests/TestFailureTest.cpp' || echo '$(srcdir)/'`tests/TestFailureTest.cpp
-
-CppUTestTests-TestFailureTest.obj: tests/TestFailureTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-TestFailureTest.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-TestFailureTest.Tpo -c -o CppUTestTests-TestFailureTest.obj `if test -f 'tests/TestFailureTest.cpp'; then $(CYGPATH_W) 'tests/TestFailureTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/TestFailureTest.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-TestFailureTest.Tpo $(DEPDIR)/CppUTestTests-TestFailureTest.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/TestFailureTest.cpp' object='CppUTestTests-TestFailureTest.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-TestFailureTest.obj `if test -f 'tests/TestFailureTest.cpp'; then $(CYGPATH_W) 'tests/TestFailureTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/TestFailureTest.cpp'; fi`
-
 CppUTestTests-TestFailureNaNTest.o: tests/TestFailureNaNTest.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-TestFailureNaNTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-TestFailureNaNTest.Tpo -c -o CppUTestTests-TestFailureNaNTest.o `test -f 'tests/TestFailureNaNTest.cpp' || echo '$(srcdir)/'`tests/TestFailureNaNTest.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-TestFailureNaNTest.Tpo $(DEPDIR)/CppUTestTests-TestFailureNaNTest.Po
@@ -1752,21 +1895,21 @@ CppUTestTests-TestFailureNaNTest.obj: tests/TestFailureNaNTest.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-TestFailureNaNTest.obj `if test -f 'tests/TestFailureNaNTest.cpp'; then $(CYGPATH_W) 'tests/TestFailureNaNTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/TestFailureNaNTest.cpp'; fi`
 
-CppUTestTests-CommandLineTestRunnerTest.o: tests/CommandLineTestRunnerTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-CommandLineTestRunnerTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-CommandLineTestRunnerTest.Tpo -c -o CppUTestTests-CommandLineTestRunnerTest.o `test -f 'tests/CommandLineTestRunnerTest.cpp' || echo '$(srcdir)/'`tests/CommandLineTestRunnerTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-CommandLineTestRunnerTest.Tpo $(DEPDIR)/CppUTestTests-CommandLineTestRunnerTest.Po
+CppUTestTests-TestFailureTest.o: tests/TestFailureTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-TestFailureTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-TestFailureTest.Tpo -c -o CppUTestTests-TestFailureTest.o `test -f 'tests/TestFailureTest.cpp' || echo '$(srcdir)/'`tests/TestFailureTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-TestFailureTest.Tpo $(DEPDIR)/CppUTestTests-TestFailureTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CommandLineTestRunnerTest.cpp' object='CppUTestTests-CommandLineTestRunnerTest.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/TestFailureTest.cpp' object='CppUTestTests-TestFailureTest.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-CommandLineTestRunnerTest.o `test -f 'tests/CommandLineTestRunnerTest.cpp' || echo '$(srcdir)/'`tests/CommandLineTestRunnerTest.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-TestFailureTest.o `test -f 'tests/TestFailureTest.cpp' || echo '$(srcdir)/'`tests/TestFailureTest.cpp
 
-CppUTestTests-CommandLineTestRunnerTest.obj: tests/CommandLineTestRunnerTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-CommandLineTestRunnerTest.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-CommandLineTestRunnerTest.Tpo -c -o CppUTestTests-CommandLineTestRunnerTest.obj `if test -f 'tests/CommandLineTestRunnerTest.cpp'; then $(CYGPATH_W) 'tests/CommandLineTestRunnerTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CommandLineTestRunnerTest.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-CommandLineTestRunnerTest.Tpo $(DEPDIR)/CppUTestTests-CommandLineTestRunnerTest.Po
+CppUTestTests-TestFailureTest.obj: tests/TestFailureTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-TestFailureTest.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-TestFailureTest.Tpo -c -o CppUTestTests-TestFailureTest.obj `if test -f 'tests/TestFailureTest.cpp'; then $(CYGPATH_W) 'tests/TestFailureTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/TestFailureTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-TestFailureTest.Tpo $(DEPDIR)/CppUTestTests-TestFailureTest.Po
 @am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/CommandLineTestRunnerTest.cpp' object='CppUTestTests-CommandLineTestRunnerTest.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/TestFailureTest.cpp' object='CppUTestTests-TestFailureTest.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-CommandLineTestRunnerTest.obj `if test -f 'tests/CommandLineTestRunnerTest.cpp'; then $(CYGPATH_W) 'tests/CommandLineTestRunnerTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/CommandLineTestRunnerTest.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-TestFailureTest.obj `if test -f 'tests/TestFailureTest.cpp'; then $(CYGPATH_W) 'tests/TestFailureTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/TestFailureTest.cpp'; fi`
 
 CppUTestTests-TestFilterTest.o: tests/TestFilterTest.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-TestFilterTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-TestFilterTest.Tpo -c -o CppUTestTests-TestFilterTest.o `test -f 'tests/TestFilterTest.cpp' || echo '$(srcdir)/'`tests/TestFilterTest.cpp
@@ -1800,38 +1943,6 @@ CppUTestTests-TestHarness_cTest.obj: tests/TestHarness_cTest.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-TestHarness_cTest.obj `if test -f 'tests/TestHarness_cTest.cpp'; then $(CYGPATH_W) 'tests/TestHarness_cTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/TestHarness_cTest.cpp'; fi`
 
-CppUTestTests-JUnitOutputTest.o: tests/JUnitOutputTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-JUnitOutputTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-JUnitOutputTest.Tpo -c -o CppUTestTests-JUnitOutputTest.o `test -f 'tests/JUnitOutputTest.cpp' || echo '$(srcdir)/'`tests/JUnitOutputTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-JUnitOutputTest.Tpo $(DEPDIR)/CppUTestTests-JUnitOutputTest.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/JUnitOutputTest.cpp' object='CppUTestTests-JUnitOutputTest.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-JUnitOutputTest.o `test -f 'tests/JUnitOutputTest.cpp' || echo '$(srcdir)/'`tests/JUnitOutputTest.cpp
-
-CppUTestTests-JUnitOutputTest.obj: tests/JUnitOutputTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-JUnitOutputTest.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-JUnitOutputTest.Tpo -c -o CppUTestTests-JUnitOutputTest.obj `if test -f 'tests/JUnitOutputTest.cpp'; then $(CYGPATH_W) 'tests/JUnitOutputTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/JUnitOutputTest.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-JUnitOutputTest.Tpo $(DEPDIR)/CppUTestTests-JUnitOutputTest.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/JUnitOutputTest.cpp' object='CppUTestTests-JUnitOutputTest.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-JUnitOutputTest.obj `if test -f 'tests/JUnitOutputTest.cpp'; then $(CYGPATH_W) 'tests/JUnitOutputTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/JUnitOutputTest.cpp'; fi`
-
-CppUTestTests-MemoryLeakDetectorTest.o: tests/MemoryLeakDetectorTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-MemoryLeakDetectorTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-MemoryLeakDetectorTest.Tpo -c -o CppUTestTests-MemoryLeakDetectorTest.o `test -f 'tests/MemoryLeakDetectorTest.cpp' || echo '$(srcdir)/'`tests/MemoryLeakDetectorTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-MemoryLeakDetectorTest.Tpo $(DEPDIR)/CppUTestTests-MemoryLeakDetectorTest.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/MemoryLeakDetectorTest.cpp' object='CppUTestTests-MemoryLeakDetectorTest.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-MemoryLeakDetectorTest.o `test -f 'tests/MemoryLeakDetectorTest.cpp' || echo '$(srcdir)/'`tests/MemoryLeakDetectorTest.cpp
-
-CppUTestTests-MemoryLeakDetectorTest.obj: tests/MemoryLeakDetectorTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-MemoryLeakDetectorTest.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-MemoryLeakDetectorTest.Tpo -c -o CppUTestTests-MemoryLeakDetectorTest.obj `if test -f 'tests/MemoryLeakDetectorTest.cpp'; then $(CYGPATH_W) 'tests/MemoryLeakDetectorTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/MemoryLeakDetectorTest.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-MemoryLeakDetectorTest.Tpo $(DEPDIR)/CppUTestTests-MemoryLeakDetectorTest.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/MemoryLeakDetectorTest.cpp' object='CppUTestTests-MemoryLeakDetectorTest.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-MemoryLeakDetectorTest.obj `if test -f 'tests/MemoryLeakDetectorTest.cpp'; then $(CYGPATH_W) 'tests/MemoryLeakDetectorTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/MemoryLeakDetectorTest.cpp'; fi`
-
 CppUTestTests-TestInstallerTest.o: tests/TestInstallerTest.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-TestInstallerTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-TestInstallerTest.Tpo -c -o CppUTestTests-TestInstallerTest.o `test -f 'tests/TestInstallerTest.cpp' || echo '$(srcdir)/'`tests/TestInstallerTest.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-TestInstallerTest.Tpo $(DEPDIR)/CppUTestTests-TestInstallerTest.Po
@@ -1848,22 +1959,6 @@ CppUTestTests-TestInstallerTest.obj: tests/TestInstallerTest.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-TestInstallerTest.obj `if test -f 'tests/TestInstallerTest.cpp'; then $(CYGPATH_W) 'tests/TestInstallerTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/TestInstallerTest.cpp'; fi`
 
-CppUTestTests-MemoryLeakOperatorOverloadsTest.o: tests/MemoryLeakOperatorOverloadsTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-MemoryLeakOperatorOverloadsTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-MemoryLeakOperatorOverloadsTest.Tpo -c -o CppUTestTests-MemoryLeakOperatorOverloadsTest.o `test -f 'tests/MemoryLeakOperatorOverloadsTest.cpp' || echo '$(srcdir)/'`tests/MemoryLeakOperatorOverloadsTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-MemoryLeakOperatorOverloadsTest.Tpo $(DEPDIR)/CppUTestTests-MemoryLeakOperatorOverloadsTest.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/MemoryLeakOperatorOverloadsTest.cpp' object='CppUTestTests-MemoryLeakOperatorOverloadsTest.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-MemoryLeakOperatorOverloadsTest.o `test -f 'tests/MemoryLeakOperatorOverloadsTest.cpp' || echo '$(srcdir)/'`tests/MemoryLeakOperatorOverloadsTest.cpp
-
-CppUTestTests-MemoryLeakOperatorOverloadsTest.obj: tests/MemoryLeakOperatorOverloadsTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-MemoryLeakOperatorOverloadsTest.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-MemoryLeakOperatorOverloadsTest.Tpo -c -o CppUTestTests-MemoryLeakOperatorOverloadsTest.obj `if test -f 'tests/MemoryLeakOperatorOverloadsTest.cpp'; then $(CYGPATH_W) 'tests/MemoryLeakOperatorOverloadsTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/MemoryLeakOperatorOverloadsTest.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-MemoryLeakOperatorOverloadsTest.Tpo $(DEPDIR)/CppUTestTests-MemoryLeakOperatorOverloadsTest.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/MemoryLeakOperatorOverloadsTest.cpp' object='CppUTestTests-MemoryLeakOperatorOverloadsTest.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-MemoryLeakOperatorOverloadsTest.obj `if test -f 'tests/MemoryLeakOperatorOverloadsTest.cpp'; then $(CYGPATH_W) 'tests/MemoryLeakOperatorOverloadsTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/MemoryLeakOperatorOverloadsTest.cpp'; fi`
-
 CppUTestTests-TestMemoryAllocatorTest.o: tests/TestMemoryAllocatorTest.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-TestMemoryAllocatorTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-TestMemoryAllocatorTest.Tpo -c -o CppUTestTests-TestMemoryAllocatorTest.o `test -f 'tests/TestMemoryAllocatorTest.cpp' || echo '$(srcdir)/'`tests/TestMemoryAllocatorTest.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-TestMemoryAllocatorTest.Tpo $(DEPDIR)/CppUTestTests-TestMemoryAllocatorTest.Po
@@ -1880,22 +1975,6 @@ CppUTestTests-TestMemoryAllocatorTest.obj: tests/TestMemoryAllocatorTest.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-TestMemoryAllocatorTest.obj `if test -f 'tests/TestMemoryAllocatorTest.cpp'; then $(CYGPATH_W) 'tests/TestMemoryAllocatorTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/TestMemoryAllocatorTest.cpp'; fi`
 
-CppUTestTests-MemoryLeakWarningTest.o: tests/MemoryLeakWarningTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-MemoryLeakWarningTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-MemoryLeakWarningTest.Tpo -c -o CppUTestTests-MemoryLeakWarningTest.o `test -f 'tests/MemoryLeakWarningTest.cpp' || echo '$(srcdir)/'`tests/MemoryLeakWarningTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-MemoryLeakWarningTest.Tpo $(DEPDIR)/CppUTestTests-MemoryLeakWarningTest.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/MemoryLeakWarningTest.cpp' object='CppUTestTests-MemoryLeakWarningTest.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-MemoryLeakWarningTest.o `test -f 'tests/MemoryLeakWarningTest.cpp' || echo '$(srcdir)/'`tests/MemoryLeakWarningTest.cpp
-
-CppUTestTests-MemoryLeakWarningTest.obj: tests/MemoryLeakWarningTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-MemoryLeakWarningTest.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-MemoryLeakWarningTest.Tpo -c -o CppUTestTests-MemoryLeakWarningTest.obj `if test -f 'tests/MemoryLeakWarningTest.cpp'; then $(CYGPATH_W) 'tests/MemoryLeakWarningTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/MemoryLeakWarningTest.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-MemoryLeakWarningTest.Tpo $(DEPDIR)/CppUTestTests-MemoryLeakWarningTest.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/MemoryLeakWarningTest.cpp' object='CppUTestTests-MemoryLeakWarningTest.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-MemoryLeakWarningTest.obj `if test -f 'tests/MemoryLeakWarningTest.cpp'; then $(CYGPATH_W) 'tests/MemoryLeakWarningTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/MemoryLeakWarningTest.cpp'; fi`
-
 CppUTestTests-TestOutputTest.o: tests/TestOutputTest.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-TestOutputTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-TestOutputTest.Tpo -c -o CppUTestTests-TestOutputTest.o `test -f 'tests/TestOutputTest.cpp' || echo '$(srcdir)/'`tests/TestOutputTest.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-TestOutputTest.Tpo $(DEPDIR)/CppUTestTests-TestOutputTest.Po
@@ -1912,38 +1991,6 @@ CppUTestTests-TestOutputTest.obj: tests/TestOutputTest.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-TestOutputTest.obj `if test -f 'tests/TestOutputTest.cpp'; then $(CYGPATH_W) 'tests/TestOutputTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/TestOutputTest.cpp'; fi`
 
-CppUTestTests-AllocLetTestFreeTest.o: tests/AllocLetTestFreeTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-AllocLetTestFreeTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-AllocLetTestFreeTest.Tpo -c -o CppUTestTests-AllocLetTestFreeTest.o `test -f 'tests/AllocLetTestFreeTest.cpp' || echo '$(srcdir)/'`tests/AllocLetTestFreeTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-AllocLetTestFreeTest.Tpo $(DEPDIR)/CppUTestTests-AllocLetTestFreeTest.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/AllocLetTestFreeTest.cpp' object='CppUTestTests-AllocLetTestFreeTest.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-AllocLetTestFreeTest.o `test -f 'tests/AllocLetTestFreeTest.cpp' || echo '$(srcdir)/'`tests/AllocLetTestFreeTest.cpp
-
-CppUTestTests-AllocLetTestFreeTest.obj: tests/AllocLetTestFreeTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-AllocLetTestFreeTest.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-AllocLetTestFreeTest.Tpo -c -o CppUTestTests-AllocLetTestFreeTest.obj `if test -f 'tests/AllocLetTestFreeTest.cpp'; then $(CYGPATH_W) 'tests/AllocLetTestFreeTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/AllocLetTestFreeTest.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-AllocLetTestFreeTest.Tpo $(DEPDIR)/CppUTestTests-AllocLetTestFreeTest.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/AllocLetTestFreeTest.cpp' object='CppUTestTests-AllocLetTestFreeTest.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-AllocLetTestFreeTest.obj `if test -f 'tests/AllocLetTestFreeTest.cpp'; then $(CYGPATH_W) 'tests/AllocLetTestFreeTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/AllocLetTestFreeTest.cpp'; fi`
-
-CppUTestTests-NullTestTest.o: tests/NullTestTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-NullTestTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-NullTestTest.Tpo -c -o CppUTestTests-NullTestTest.o `test -f 'tests/NullTestTest.cpp' || echo '$(srcdir)/'`tests/NullTestTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-NullTestTest.Tpo $(DEPDIR)/CppUTestTests-NullTestTest.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/NullTestTest.cpp' object='CppUTestTests-NullTestTest.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-NullTestTest.o `test -f 'tests/NullTestTest.cpp' || echo '$(srcdir)/'`tests/NullTestTest.cpp
-
-CppUTestTests-NullTestTest.obj: tests/NullTestTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-NullTestTest.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-NullTestTest.Tpo -c -o CppUTestTests-NullTestTest.obj `if test -f 'tests/NullTestTest.cpp'; then $(CYGPATH_W) 'tests/NullTestTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/NullTestTest.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-NullTestTest.Tpo $(DEPDIR)/CppUTestTests-NullTestTest.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/NullTestTest.cpp' object='CppUTestTests-NullTestTest.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-NullTestTest.obj `if test -f 'tests/NullTestTest.cpp'; then $(CYGPATH_W) 'tests/NullTestTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/NullTestTest.cpp'; fi`
-
 CppUTestTests-TestRegistryTest.o: tests/TestRegistryTest.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-TestRegistryTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-TestRegistryTest.Tpo -c -o CppUTestTests-TestRegistryTest.o `test -f 'tests/TestRegistryTest.cpp' || echo '$(srcdir)/'`tests/TestRegistryTest.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-TestRegistryTest.Tpo $(DEPDIR)/CppUTestTests-TestRegistryTest.Po
@@ -1960,22 +2007,6 @@ CppUTestTests-TestRegistryTest.obj: tests/TestRegistryTest.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-TestRegistryTest.obj `if test -f 'tests/TestRegistryTest.cpp'; then $(CYGPATH_W) 'tests/TestRegistryTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/TestRegistryTest.cpp'; fi`
 
-CppUTestTests-PluginTest.o: tests/PluginTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-PluginTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-PluginTest.Tpo -c -o CppUTestTests-PluginTest.o `test -f 'tests/PluginTest.cpp' || echo '$(srcdir)/'`tests/PluginTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-PluginTest.Tpo $(DEPDIR)/CppUTestTests-PluginTest.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/PluginTest.cpp' object='CppUTestTests-PluginTest.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-PluginTest.o `test -f 'tests/PluginTest.cpp' || echo '$(srcdir)/'`tests/PluginTest.cpp
-
-CppUTestTests-PluginTest.obj: tests/PluginTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-PluginTest.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-PluginTest.Tpo -c -o CppUTestTests-PluginTest.obj `if test -f 'tests/PluginTest.cpp'; then $(CYGPATH_W) 'tests/PluginTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/PluginTest.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-PluginTest.Tpo $(DEPDIR)/CppUTestTests-PluginTest.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/PluginTest.cpp' object='CppUTestTests-PluginTest.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-PluginTest.obj `if test -f 'tests/PluginTest.cpp'; then $(CYGPATH_W) 'tests/PluginTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/PluginTest.cpp'; fi`
-
 CppUTestTests-TestResultTest.o: tests/TestResultTest.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-TestResultTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-TestResultTest.Tpo -c -o CppUTestTests-TestResultTest.o `test -f 'tests/TestResultTest.cpp' || echo '$(srcdir)/'`tests/TestResultTest.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-TestResultTest.Tpo $(DEPDIR)/CppUTestTests-TestResultTest.Po
@@ -1992,22 +2023,6 @@ CppUTestTests-TestResultTest.obj: tests/TestResultTest.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-TestResultTest.obj `if test -f 'tests/TestResultTest.cpp'; then $(CYGPATH_W) 'tests/TestResultTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/TestResultTest.cpp'; fi`
 
-CppUTestTests-PreprocessorTest.o: tests/PreprocessorTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-PreprocessorTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-PreprocessorTest.Tpo -c -o CppUTestTests-PreprocessorTest.o `test -f 'tests/PreprocessorTest.cpp' || echo '$(srcdir)/'`tests/PreprocessorTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-PreprocessorTest.Tpo $(DEPDIR)/CppUTestTests-PreprocessorTest.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/PreprocessorTest.cpp' object='CppUTestTests-PreprocessorTest.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-PreprocessorTest.o `test -f 'tests/PreprocessorTest.cpp' || echo '$(srcdir)/'`tests/PreprocessorTest.cpp
-
-CppUTestTests-PreprocessorTest.obj: tests/PreprocessorTest.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-PreprocessorTest.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-PreprocessorTest.Tpo -c -o CppUTestTests-PreprocessorTest.obj `if test -f 'tests/PreprocessorTest.cpp'; then $(CYGPATH_W) 'tests/PreprocessorTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/PreprocessorTest.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-PreprocessorTest.Tpo $(DEPDIR)/CppUTestTests-PreprocessorTest.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/PreprocessorTest.cpp' object='CppUTestTests-PreprocessorTest.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-PreprocessorTest.obj `if test -f 'tests/PreprocessorTest.cpp'; then $(CYGPATH_W) 'tests/PreprocessorTest.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/PreprocessorTest.cpp'; fi`
-
 CppUTestTests-TestUTestMacro.o: tests/TestUTestMacro.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-TestUTestMacro.o -MD -MP -MF $(DEPDIR)/CppUTestTests-TestUTestMacro.Tpo -c -o CppUTestTests-TestUTestMacro.o `test -f 'tests/TestUTestMacro.cpp' || echo '$(srcdir)/'`tests/TestUTestMacro.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-TestUTestMacro.Tpo $(DEPDIR)/CppUTestTests-TestUTestMacro.Po
@@ -2024,22 +2039,6 @@ CppUTestTests-TestUTestMacro.obj: tests/TestUTestMacro.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-TestUTestMacro.obj `if test -f 'tests/TestUTestMacro.cpp'; then $(CYGPATH_W) 'tests/TestUTestMacro.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/TestUTestMacro.cpp'; fi`
 
-CppUTestTests-AllocationInCppFile.o: tests/AllocationInCppFile.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-AllocationInCppFile.o -MD -MP -MF $(DEPDIR)/CppUTestTests-AllocationInCppFile.Tpo -c -o CppUTestTests-AllocationInCppFile.o `test -f 'tests/AllocationInCppFile.cpp' || echo '$(srcdir)/'`tests/AllocationInCppFile.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-AllocationInCppFile.Tpo $(DEPDIR)/CppUTestTests-AllocationInCppFile.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/AllocationInCppFile.cpp' object='CppUTestTests-AllocationInCppFile.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-AllocationInCppFile.o `test -f 'tests/AllocationInCppFile.cpp' || echo '$(srcdir)/'`tests/AllocationInCppFile.cpp
-
-CppUTestTests-AllocationInCppFile.obj: tests/AllocationInCppFile.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-AllocationInCppFile.obj -MD -MP -MF $(DEPDIR)/CppUTestTests-AllocationInCppFile.Tpo -c -o CppUTestTests-AllocationInCppFile.obj `if test -f 'tests/AllocationInCppFile.cpp'; then $(CYGPATH_W) 'tests/AllocationInCppFile.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/AllocationInCppFile.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-AllocationInCppFile.Tpo $(DEPDIR)/CppUTestTests-AllocationInCppFile.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tests/AllocationInCppFile.cpp' object='CppUTestTests-AllocationInCppFile.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -c -o CppUTestTests-AllocationInCppFile.obj `if test -f 'tests/AllocationInCppFile.cpp'; then $(CYGPATH_W) 'tests/AllocationInCppFile.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/AllocationInCppFile.cpp'; fi`
-
 CppUTestTests-UtestTest.o: tests/UtestTest.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CppUTestTests_CPPFLAGS) $(CPPFLAGS) $(CppUTestTests_CXXFLAGS) $(CXXFLAGS) -MT CppUTestTests-UtestTest.o -MD -MP -MF $(DEPDIR)/CppUTestTests-UtestTest.Tpo -c -o CppUTestTests-UtestTest.o `test -f 'tests/UtestTest.cpp' || echo '$(srcdir)/'`tests/UtestTest.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CppUTestTests-UtestTest.Tpo $(DEPDIR)/CppUTestTests-UtestTest.Po
diff --git a/examples/AllTests/AllTests.dsp b/examples/AllTests/AllTests.dsp
deleted file mode 100644
index a3b827d0f..000000000
--- a/examples/AllTests/AllTests.dsp
+++ /dev/null
@@ -1,115 +0,0 @@
-# Microsoft Developer Studio Project File - Name="AllTests" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=AllTests - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "AllTests.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "AllTests.mak" CFG="AllTests - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "AllTests - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "AllTests - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "AllTests - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "AllTests - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "AllTests___Win32_Debug"
-# PROP BASE Intermediate_Dir "AllTests___Win32_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../../include" /I "../../include/Platforms/VisualCpp" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ../../lib/CppUTest.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib   /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# SUBTRACT LINK32 /incremental:no
-
-!ENDIF 
-
-# Begin Target
-
-# Name "AllTests - Win32 Release"
-# Name "AllTests - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\AllTests.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\ApplicationLib\CircularBufferTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\ApplicationLib\HelloTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\ApplicationLib\PrinterTest.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/examples/ApplicationLib/ApplicationLib.dsp b/examples/ApplicationLib/ApplicationLib.dsp
deleted file mode 100644
index 114f05900..000000000
--- a/examples/ApplicationLib/ApplicationLib.dsp
+++ /dev/null
@@ -1,125 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ApplicationLib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=ApplicationLib - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ApplicationLib.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ApplicationLib.mak" CFG="ApplicationLib - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ApplicationLib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "ApplicationLib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ApplicationLib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "ApplicationLib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../../include" /I "../../include/Platforms/VisualCpp" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ApplicationLib - Win32 Release"
-# Name "ApplicationLib - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\CircularBuffer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\hello.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\Printer.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\AllTests.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CircularBuffer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\hello.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\MockPrinter.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Printer.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/src/CppUTest/UnitTestHarness.dsp b/src/CppUTest/UnitTestHarness.dsp
deleted file mode 100644
index 2114cd49f..000000000
--- a/src/CppUTest/UnitTestHarness.dsp
+++ /dev/null
@@ -1,224 +0,0 @@
-# Microsoft Developer Studio Project File - Name="UnitTestHarness" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=UnitTestHarness - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "UnitTestHarness.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "UnitTestHarness.mak" CFG="UnitTestHarness - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "UnitTestHarness - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "UnitTestHarness - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "UnitTestHarness - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "UnitTestHarness - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\Platforms\VisualCpp" /I ".." /I "$(CPP_TEST_TOOLS)" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FR /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=copy Debug\*.lib ..\lib
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "UnitTestHarness - Win32 Release"
-# Name "UnitTestHarness - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\CommandLineTestRunner.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\EqualsFailure.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Failure.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\FailureTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\MemoryLeakWarningTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\NullTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\NullTestTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\SimpleString.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\SimpleStringTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Test.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\TestInstaller.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\TestInstallerTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\TestOutput.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\TestOutputTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\TestRegistry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\TestResult.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\TestTest.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\CommandLineTestRunner.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\EqualsFailure.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Failure.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\MemoryLeakWarning.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\MockPrinter.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\NullTest.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\RealPrinter.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\SimpleString.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Test.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\TestHarness.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\TestInstaller.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\TestOutput.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\TestRegistry.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\TestResult.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\UnitTestHarnessTests.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/tests/AllTests.dep b/tests/AllTests.dep
deleted file mode 100644
index e650ba39a..000000000
--- a/tests/AllTests.dep
+++ /dev/null
@@ -1,2 +0,0 @@
-# Microsoft Developer Studio Generated Dependency File, included by AllTests.mak
-
diff --git a/tests/AllTests.dsp b/tests/AllTests.dsp
deleted file mode 100644
index 4e9b7d368..000000000
--- a/tests/AllTests.dsp
+++ /dev/null
@@ -1,211 +0,0 @@
-# Microsoft Developer Studio Project File - Name="AllTests" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=AllTests - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "AllTests.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "AllTests.mak" CFG="AllTests - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "AllTests - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "AllTests - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "AllTests - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "AllTests - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\include" /I "..\include\Platforms\VisualCpp" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /FR /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ..\lib\CppUTest.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# SUBTRACT LINK32 /incremental:no
-
-!ENDIF 
-
-# Begin Target
-
-# Name "AllTests - Win32 Release"
-# Name "AllTests - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\AllocationInCFile.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\AllocationInCppFile.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\AllTests.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CheatSheetTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CommandLineArgumentsTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CommandLineTestRunnerTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\JUnitOutputTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\MemoryLeakDetectorTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\MemoryLeakOperatorOverloadsTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\MemoryLeakWarningTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\NullTestTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\PluginTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\PreprocessorTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\SetPluginTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\SimpleStringTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\TestFailureTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\TestFilterTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\TestHarness_cTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\TestHarness_cTestCFile.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\TestInstallerTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\TestMemoryAllocatorTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\TestOutputTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\TestRegistryTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\TestResultTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\UtestTest.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\AllocationInCFile.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\AllocationInCppFile.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\AllTests.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/tests/AllTests.mak b/tests/AllTests.mak
deleted file mode 100644
index 8f54d3c2c..000000000
--- a/tests/AllTests.mak
+++ /dev/null
@@ -1,685 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on AllTests.dsp
-!IF "$(CFG)" == ""
-CFG=AllTests - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to AllTests - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "AllTests - Win32 Release" && "$(CFG)" != "AllTests - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "AllTests.mak" CFG="AllTests - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "AllTests - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "AllTests - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "AllTests - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\AllTests.exe"
-
-!ELSE 
-
-ALL : "CppUTest - Win32 Release" "$(OUTDIR)\AllTests.exe"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"CppUTest - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\AllocationInCFile.obj"
-	-@erase "$(INTDIR)\AllocationInCppFile.obj"
-	-@erase "$(INTDIR)\AllTests.obj"
-	-@erase "$(INTDIR)\CommandLineArgumentsTest.obj"
-	-@erase "$(INTDIR)\CommandLineTestRunnerTest.obj"
-	-@erase "$(INTDIR)\FailureTest.obj"
-	-@erase "$(INTDIR)\JUnitOutputTest.obj"
-	-@erase "$(INTDIR)\MemoryLeakAllocator.obj"
-	-@erase "$(INTDIR)\MemoryLeakAllocatorTest.obj"
-	-@erase "$(INTDIR)\MemoryLeakDetectorTest.obj"
-	-@erase "$(INTDIR)\MemoryLeakOperatorOverloadsTest.obj"
-	-@erase "$(INTDIR)\MemoryLeakWarningTest.obj"
-	-@erase "$(INTDIR)\NullTestTest.obj"
-	-@erase "$(INTDIR)\PluginTest.obj"
-	-@erase "$(INTDIR)\SetPluginTest.obj"
-	-@erase "$(INTDIR)\SimpleStringTest.obj"
-	-@erase "$(INTDIR)\TestHarness_cTest.obj"
-	-@erase "$(INTDIR)\TestInstallerTest.obj"
-	-@erase "$(INTDIR)\TestOutputTest.obj"
-	-@erase "$(INTDIR)\TestRegistryTest.obj"
-	-@erase "$(INTDIR)\TestResultTest.obj"
-	-@erase "$(INTDIR)\UtestTest.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(OUTDIR)\AllTests.exe"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\AllTests.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\AllTests.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\AllTests.pdb" /machine:I386 /out:"$(OUTDIR)\AllTests.exe" 
-LINK32_OBJS= \
-	"$(INTDIR)\AllTests.obj" \
-	"$(INTDIR)\CommandLineArgumentsTest.obj" \
-	"$(INTDIR)\CommandLineTestRunnerTest.obj" \
-	"$(INTDIR)\FailureTest.obj" \
-	"$(INTDIR)\JUnitOutputTest.obj" \
-	"$(INTDIR)\MemoryLeakAllocator.obj" \
-	"$(INTDIR)\MemoryLeakAllocatorTest.obj" \
-	"$(INTDIR)\MemoryLeakDetectorTest.obj" \
-	"$(INTDIR)\MemoryLeakWarningTest.obj" \
-	"$(INTDIR)\NullTestTest.obj" \
-	"$(INTDIR)\PluginTest.obj" \
-	"$(INTDIR)\SetPluginTest.obj" \
-	"$(INTDIR)\SimpleStringTest.obj" \
-	"$(INTDIR)\TestHarness_cTest.obj" \
-	"$(INTDIR)\TestInstallerTest.obj" \
-	"$(INTDIR)\TestOutputTest.obj" \
-	"$(INTDIR)\TestRegistryTest.obj" \
-	"$(INTDIR)\TestResultTest.obj" \
-	"$(INTDIR)\UtestTest.obj" \
-	"$(INTDIR)\AllocationInCppFile.obj" \
-	"$(INTDIR)\MemoryLeakOperatorOverloadsTest.obj" \
-	"$(INTDIR)\AllocationInCFile.obj" \
-	"..\Release\CppUTest.lib"
-
-"$(OUTDIR)\AllTests.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "AllTests - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\AllTests.exe" "$(OUTDIR)\AllTests.bsc"
-
-!ELSE 
-
-ALL : "CppUTest - Win32 Debug" "$(OUTDIR)\AllTests.exe" "$(OUTDIR)\AllTests.bsc"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"CppUTest - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\AllocationInCFile.obj"
-	-@erase "$(INTDIR)\AllocationInCFile.sbr"
-	-@erase "$(INTDIR)\AllocationInCppFile.obj"
-	-@erase "$(INTDIR)\AllocationInCppFile.sbr"
-	-@erase "$(INTDIR)\AllTests.obj"
-	-@erase "$(INTDIR)\AllTests.sbr"
-	-@erase "$(INTDIR)\CommandLineArgumentsTest.obj"
-	-@erase "$(INTDIR)\CommandLineArgumentsTest.sbr"
-	-@erase "$(INTDIR)\CommandLineTestRunnerTest.obj"
-	-@erase "$(INTDIR)\CommandLineTestRunnerTest.sbr"
-	-@erase "$(INTDIR)\FailureTest.obj"
-	-@erase "$(INTDIR)\FailureTest.sbr"
-	-@erase "$(INTDIR)\JUnitOutputTest.obj"
-	-@erase "$(INTDIR)\JUnitOutputTest.sbr"
-	-@erase "$(INTDIR)\MemoryLeakAllocator.obj"
-	-@erase "$(INTDIR)\MemoryLeakAllocator.sbr"
-	-@erase "$(INTDIR)\MemoryLeakAllocatorTest.obj"
-	-@erase "$(INTDIR)\MemoryLeakAllocatorTest.sbr"
-	-@erase "$(INTDIR)\MemoryLeakDetectorTest.obj"
-	-@erase "$(INTDIR)\MemoryLeakDetectorTest.sbr"
-	-@erase "$(INTDIR)\MemoryLeakOperatorOverloadsTest.obj"
-	-@erase "$(INTDIR)\MemoryLeakOperatorOverloadsTest.sbr"
-	-@erase "$(INTDIR)\MemoryLeakWarningTest.obj"
-	-@erase "$(INTDIR)\MemoryLeakWarningTest.sbr"
-	-@erase "$(INTDIR)\NullTestTest.obj"
-	-@erase "$(INTDIR)\NullTestTest.sbr"
-	-@erase "$(INTDIR)\PluginTest.obj"
-	-@erase "$(INTDIR)\PluginTest.sbr"
-	-@erase "$(INTDIR)\SetPluginTest.obj"
-	-@erase "$(INTDIR)\SetPluginTest.sbr"
-	-@erase "$(INTDIR)\SimpleStringTest.obj"
-	-@erase "$(INTDIR)\SimpleStringTest.sbr"
-	-@erase "$(INTDIR)\TestHarness_cTest.obj"
-	-@erase "$(INTDIR)\TestHarness_cTest.sbr"
-	-@erase "$(INTDIR)\TestInstallerTest.obj"
-	-@erase "$(INTDIR)\TestInstallerTest.sbr"
-	-@erase "$(INTDIR)\TestOutputTest.obj"
-	-@erase "$(INTDIR)\TestOutputTest.sbr"
-	-@erase "$(INTDIR)\TestRegistryTest.obj"
-	-@erase "$(INTDIR)\TestRegistryTest.sbr"
-	-@erase "$(INTDIR)\TestResultTest.obj"
-	-@erase "$(INTDIR)\TestResultTest.sbr"
-	-@erase "$(INTDIR)\UtestTest.obj"
-	-@erase "$(INTDIR)\UtestTest.sbr"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\vc60.pdb"
-	-@erase "$(OUTDIR)\AllTests.bsc"
-	-@erase "$(OUTDIR)\AllTests.exe"
-	-@erase "$(OUTDIR)\AllTests.ilk"
-	-@erase "$(OUTDIR)\AllTests.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo /MDd /W3 /GX /ZI /Od /I "..\include" /I "..\include\Platforms\VisualCpp" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\AllTests.bsc" 
-BSC32_SBRS= \
-	"$(INTDIR)\AllTests.sbr" \
-	"$(INTDIR)\CommandLineArgumentsTest.sbr" \
-	"$(INTDIR)\CommandLineTestRunnerTest.sbr" \
-	"$(INTDIR)\FailureTest.sbr" \
-	"$(INTDIR)\JUnitOutputTest.sbr" \
-	"$(INTDIR)\MemoryLeakAllocator.sbr" \
-	"$(INTDIR)\MemoryLeakAllocatorTest.sbr" \
-	"$(INTDIR)\MemoryLeakDetectorTest.sbr" \
-	"$(INTDIR)\MemoryLeakWarningTest.sbr" \
-	"$(INTDIR)\NullTestTest.sbr" \
-	"$(INTDIR)\PluginTest.sbr" \
-	"$(INTDIR)\SetPluginTest.sbr" \
-	"$(INTDIR)\SimpleStringTest.sbr" \
-	"$(INTDIR)\TestHarness_cTest.sbr" \
-	"$(INTDIR)\TestInstallerTest.sbr" \
-	"$(INTDIR)\TestOutputTest.sbr" \
-	"$(INTDIR)\TestRegistryTest.sbr" \
-	"$(INTDIR)\TestResultTest.sbr" \
-	"$(INTDIR)\UtestTest.sbr" \
-	"$(INTDIR)\AllocationInCppFile.sbr" \
-	"$(INTDIR)\MemoryLeakOperatorOverloadsTest.sbr" \
-	"$(INTDIR)\AllocationInCFile.sbr"
-
-"$(OUTDIR)\AllTests.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
-    $(BSC32) @<<
-  $(BSC32_FLAGS) $(BSC32_SBRS)
-<<
-
-LINK32=link.exe
-LINK32_FLAGS=..\lib\CppUTest.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\AllTests.pdb" /debug /machine:I386 /out:"$(OUTDIR)\AllTests.exe" /pdbtype:sept 
-LINK32_OBJS= \
-	"$(INTDIR)\AllTests.obj" \
-	"$(INTDIR)\CommandLineArgumentsTest.obj" \
-	"$(INTDIR)\CommandLineTestRunnerTest.obj" \
-	"$(INTDIR)\FailureTest.obj" \
-	"$(INTDIR)\JUnitOutputTest.obj" \
-	"$(INTDIR)\MemoryLeakAllocator.obj" \
-	"$(INTDIR)\MemoryLeakAllocatorTest.obj" \
-	"$(INTDIR)\MemoryLeakDetectorTest.obj" \
-	"$(INTDIR)\MemoryLeakWarningTest.obj" \
-	"$(INTDIR)\NullTestTest.obj" \
-	"$(INTDIR)\PluginTest.obj" \
-	"$(INTDIR)\SetPluginTest.obj" \
-	"$(INTDIR)\SimpleStringTest.obj" \
-	"$(INTDIR)\TestHarness_cTest.obj" \
-	"$(INTDIR)\TestInstallerTest.obj" \
-	"$(INTDIR)\TestOutputTest.obj" \
-	"$(INTDIR)\TestRegistryTest.obj" \
-	"$(INTDIR)\TestResultTest.obj" \
-	"$(INTDIR)\UtestTest.obj" \
-	"$(INTDIR)\AllocationInCppFile.obj" \
-	"$(INTDIR)\MemoryLeakOperatorOverloadsTest.obj" \
-	"$(INTDIR)\AllocationInCFile.obj" \
-	"..\lib\CppUTest.lib"
-
-"$(OUTDIR)\AllTests.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("AllTests.dep")
-!INCLUDE "AllTests.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "AllTests.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "AllTests - Win32 Release" || "$(CFG)" == "AllTests - Win32 Debug"
-SOURCE=.\AllocationInCFile.c
-
-!IF  "$(CFG)" == "AllTests - Win32 Release"
-
-
-"$(INTDIR)\AllocationInCFile.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "AllTests - Win32 Debug"
-
-
-"$(INTDIR)\AllocationInCFile.obj"	"$(INTDIR)\AllocationInCFile.sbr" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\AllocationInCppFile.cpp
-
-!IF  "$(CFG)" == "AllTests - Win32 Release"
-
-
-"$(INTDIR)\AllocationInCppFile.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "AllTests - Win32 Debug"
-
-
-"$(INTDIR)\AllocationInCppFile.obj"	"$(INTDIR)\AllocationInCppFile.sbr" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\AllTests.cpp
-
-!IF  "$(CFG)" == "AllTests - Win32 Release"
-
-
-"$(INTDIR)\AllTests.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "AllTests - Win32 Debug"
-
-
-"$(INTDIR)\AllTests.obj"	"$(INTDIR)\AllTests.sbr" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\CommandLineArgumentsTest.cpp
-
-!IF  "$(CFG)" == "AllTests - Win32 Release"
-
-
-"$(INTDIR)\CommandLineArgumentsTest.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "AllTests - Win32 Debug"
-
-
-"$(INTDIR)\CommandLineArgumentsTest.obj"	"$(INTDIR)\CommandLineArgumentsTest.sbr" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\CommandLineTestRunnerTest.cpp
-
-!IF  "$(CFG)" == "AllTests - Win32 Release"
-
-
-"$(INTDIR)\CommandLineTestRunnerTest.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "AllTests - Win32 Debug"
-
-
-"$(INTDIR)\CommandLineTestRunnerTest.obj"	"$(INTDIR)\CommandLineTestRunnerTest.sbr" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\FailureTest.cpp
-
-!IF  "$(CFG)" == "AllTests - Win32 Release"
-
-
-"$(INTDIR)\FailureTest.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "AllTests - Win32 Debug"
-
-
-"$(INTDIR)\FailureTest.obj"	"$(INTDIR)\FailureTest.sbr" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\JUnitOutputTest.cpp
-
-!IF  "$(CFG)" == "AllTests - Win32 Release"
-
-
-"$(INTDIR)\JUnitOutputTest.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "AllTests - Win32 Debug"
-
-
-"$(INTDIR)\JUnitOutputTest.obj"	"$(INTDIR)\JUnitOutputTest.sbr" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=..\src\CppUTest\MemoryLeakAllocator.cpp
-
-!IF  "$(CFG)" == "AllTests - Win32 Release"
-
-
-"$(INTDIR)\MemoryLeakAllocator.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "AllTests - Win32 Debug"
-
-
-"$(INTDIR)\MemoryLeakAllocator.obj"	"$(INTDIR)\MemoryLeakAllocator.sbr" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\MemoryLeakAllocatorTest.cpp
-
-!IF  "$(CFG)" == "AllTests - Win32 Release"
-
-
-"$(INTDIR)\MemoryLeakAllocatorTest.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "AllTests - Win32 Debug"
-
-
-"$(INTDIR)\MemoryLeakAllocatorTest.obj"	"$(INTDIR)\MemoryLeakAllocatorTest.sbr" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\MemoryLeakDetectorTest.cpp
-
-!IF  "$(CFG)" == "AllTests - Win32 Release"
-
-
-"$(INTDIR)\MemoryLeakDetectorTest.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "AllTests - Win32 Debug"
-
-
-"$(INTDIR)\MemoryLeakDetectorTest.obj"	"$(INTDIR)\MemoryLeakDetectorTest.sbr" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\MemoryLeakOperatorOverloadsTest.cpp
-
-!IF  "$(CFG)" == "AllTests - Win32 Release"
-
-
-"$(INTDIR)\MemoryLeakOperatorOverloadsTest.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "AllTests - Win32 Debug"
-
-
-"$(INTDIR)\MemoryLeakOperatorOverloadsTest.obj"	"$(INTDIR)\MemoryLeakOperatorOverloadsTest.sbr" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\MemoryLeakWarningTest.cpp
-
-!IF  "$(CFG)" == "AllTests - Win32 Release"
-
-
-"$(INTDIR)\MemoryLeakWarningTest.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "AllTests - Win32 Debug"
-
-
-"$(INTDIR)\MemoryLeakWarningTest.obj"	"$(INTDIR)\MemoryLeakWarningTest.sbr" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\NullTestTest.cpp
-
-!IF  "$(CFG)" == "AllTests - Win32 Release"
-
-
-"$(INTDIR)\NullTestTest.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "AllTests - Win32 Debug"
-
-
-"$(INTDIR)\NullTestTest.obj"	"$(INTDIR)\NullTestTest.sbr" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\PluginTest.cpp
-
-!IF  "$(CFG)" == "AllTests - Win32 Release"
-
-
-"$(INTDIR)\PluginTest.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "AllTests - Win32 Debug"
-
-
-"$(INTDIR)\PluginTest.obj"	"$(INTDIR)\PluginTest.sbr" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\SetPluginTest.cpp
-
-!IF  "$(CFG)" == "AllTests - Win32 Release"
-
-
-"$(INTDIR)\SetPluginTest.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "AllTests - Win32 Debug"
-
-
-"$(INTDIR)\SetPluginTest.obj"	"$(INTDIR)\SetPluginTest.sbr" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\SimpleStringTest.cpp
-
-!IF  "$(CFG)" == "AllTests - Win32 Release"
-
-
-"$(INTDIR)\SimpleStringTest.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "AllTests - Win32 Debug"
-
-
-"$(INTDIR)\SimpleStringTest.obj"	"$(INTDIR)\SimpleStringTest.sbr" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\TestHarness_cTest.cpp
-
-!IF  "$(CFG)" == "AllTests - Win32 Release"
-
-
-"$(INTDIR)\TestHarness_cTest.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "AllTests - Win32 Debug"
-
-
-"$(INTDIR)\TestHarness_cTest.obj"	"$(INTDIR)\TestHarness_cTest.sbr" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\TestInstallerTest.cpp
-
-!IF  "$(CFG)" == "AllTests - Win32 Release"
-
-
-"$(INTDIR)\TestInstallerTest.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "AllTests - Win32 Debug"
-
-
-"$(INTDIR)\TestInstallerTest.obj"	"$(INTDIR)\TestInstallerTest.sbr" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\TestOutputTest.cpp
-
-!IF  "$(CFG)" == "AllTests - Win32 Release"
-
-
-"$(INTDIR)\TestOutputTest.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "AllTests - Win32 Debug"
-
-
-"$(INTDIR)\TestOutputTest.obj"	"$(INTDIR)\TestOutputTest.sbr" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\TestRegistryTest.cpp
-
-!IF  "$(CFG)" == "AllTests - Win32 Release"
-
-
-"$(INTDIR)\TestRegistryTest.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "AllTests - Win32 Debug"
-
-
-"$(INTDIR)\TestRegistryTest.obj"	"$(INTDIR)\TestRegistryTest.sbr" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\TestResultTest.cpp
-
-!IF  "$(CFG)" == "AllTests - Win32 Release"
-
-
-"$(INTDIR)\TestResultTest.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "AllTests - Win32 Debug"
-
-
-"$(INTDIR)\TestResultTest.obj"	"$(INTDIR)\TestResultTest.sbr" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\UtestTest.cpp
-
-!IF  "$(CFG)" == "AllTests - Win32 Release"
-
-
-"$(INTDIR)\UtestTest.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "AllTests - Win32 Debug"
-
-
-"$(INTDIR)\UtestTest.obj"	"$(INTDIR)\UtestTest.sbr" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-!IF  "$(CFG)" == "AllTests - Win32 Release"
-
-"CppUTest - Win32 Release" : 
-   cd "\workspace\CppUTest"
-   $(MAKE) /$(MAKEFLAGS) /F .\CppUTest.mak CFG="CppUTest - Win32 Release" 
-   cd ".\tests"
-
-"CppUTest - Win32 ReleaseCLEAN" : 
-   cd "\workspace\CppUTest"
-   $(MAKE) /$(MAKEFLAGS) /F .\CppUTest.mak CFG="CppUTest - Win32 Release" RECURSE=1 CLEAN 
-   cd ".\tests"
-
-!ELSEIF  "$(CFG)" == "AllTests - Win32 Debug"
-
-"CppUTest - Win32 Debug" : 
-   cd "\workspace\CppUTest"
-   $(MAKE) /$(MAKEFLAGS) /F .\CppUTest.mak CFG="CppUTest - Win32 Debug" 
-   cd ".\tests"
-
-"CppUTest - Win32 DebugCLEAN" : 
-   cd "\workspace\CppUTest"
-   $(MAKE) /$(MAKEFLAGS) /F .\CppUTest.mak CFG="CppUTest - Win32 Debug" RECURSE=1 CLEAN 
-   cd ".\tests"
-
-!ENDIF 
-
-
-!ENDIF 
-
diff --git a/tests/AllTests.vcproj b/tests/AllTests.vcproj
index b27c1323e..768ec5e8f 100644
--- a/tests/AllTests.vcproj
+++ b/tests/AllTests.vcproj
@@ -45,7 +45,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\include;..\include\Platforms\VisualCpp;..\include\CppUTestExt\CppUTestGMock;..\include\CppUTestExt\CppUTestGTest"
+				AdditionalIncludeDirectories="..\include;..\include\Platforms\VisualCpp;..\include\CppUTestExt\CppUTestGMock"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -333,75 +333,75 @@
 			Name="ext"
 			>
 			<File
-				RelativePath=".\CppUTestExt\TestCodeMemoryReportFormatter.cpp"
+				RelativePath=".\CppUTestExt\CodeMemoryReportFormatterTest.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CppUTestExt\TestGMock.cpp"
+				RelativePath=".\CppUTestExt\GMockTest.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CppUTestExt\TestGTest.cpp"
+				RelativePath=".\CppUTestExt\GTest1Test.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CppUTestExt\TestMemoryReportAllocator.cpp"
+				RelativePath=".\CppUTestExt\MemoryReportAllocatorTest.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CppUTestExt\TestMemoryReporterPlugin.cpp"
+				RelativePath=".\CppUTestExt\MemoryReporterPluginTest.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CppUTestExt\TestMemoryReportFormatter.cpp"
+				RelativePath=".\CppUTestExt\MemoryReportFormatterTest.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CppUTestExt\TestMockActualFunctionCall.cpp"
+				RelativePath=".\CppUTestExt\MockActualCallTest.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CppUTestExt\TestMockCheatSheet.cpp"
+				RelativePath=".\CppUTestExt\MockCheatSheetTest.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CppUTestExt\TestMockExpectedFunctionCall.cpp"
+				RelativePath=".\CppUTestExt\MockExpectedCallTest.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CppUTestExt\TestMockExpectedFunctionsList.cpp"
+				RelativePath=".\CppUTestExt\MockExpectedFunctionsListTest.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CppUTestExt\TestMockFailure.cpp"
+				RelativePath=".\CppUTestExt\MockFailureTest.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CppUTestExt\TestMockFailure.h"
+				RelativePath=".\CppUTestExt\MockFailureTest.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CppUTestExt\TestMockPlugin.cpp"
+				RelativePath=".\CppUTestExt\MockPluginTest.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CppUTestExt\TestMockSupport.cpp"
+				RelativePath=".\CppUTestExt\MockSupportTest.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CppUTestExt\TestMockSupport_c.cpp"
+				RelativePath=".\CppUTestExt\MockSupport_cTest.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CppUTestExt\TestMockSupport_cCFile.c"
+				RelativePath=".\CppUTestExt\MockSupport_cTestCFile.c"
 				>
 			</File>
 			<File
-				RelativePath=".\CppUTestExt\TestMockSupport_cCFile.h"
+				RelativePath=".\CppUTestExt\MockSupport_cTestCFile.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CppUTestExt\TestOrderedTest.cpp"
+				RelativePath=".\CppUTestExt\OrderedTestTest.cpp"
 				>
 			</File>
 		</Filter>
diff --git a/tests/AllTests.vcxproj b/tests/AllTests.vcxproj
index 3730018fd..6fcdfcada 100644
--- a/tests/AllTests.vcxproj
+++ b/tests/AllTests.vcxproj
@@ -148,22 +148,22 @@
     <ClCompile Include="CommandLineArgumentsTest.cpp" />
     <ClCompile Include="CommandLineTestRunnerTest.cpp" />
     <ClCompile Include="CppUTestExt\AllTests.cpp" />
-    <ClCompile Include="CppUTestExt\TestCodeMemoryReportFormatter.cpp" />
-    <ClCompile Include="CppUTestExt\TestGMock.cpp" />
-    <ClCompile Include="CppUTestExt\TestGTest.cpp" />
-    <ClCompile Include="CppUTestExt\TestMemoryReportAllocator.cpp" />
-    <ClCompile Include="CppUTestExt\TestMemoryReporterPlugin.cpp" />
-    <ClCompile Include="CppUTestExt\TestMemoryReportFormatter.cpp" />
-    <ClCompile Include="CppUTestExt\TestMockActualFunctionCall.cpp" />
-    <ClCompile Include="CppUTestExt\TestMockCheatSheet.cpp" />
-    <ClCompile Include="CppUTestExt\TestMockExpectedFunctionCall.cpp" />
-    <ClCompile Include="CppUTestExt\TestMockExpectedFunctionsList.cpp" />
-    <ClCompile Include="CppUTestExt\TestMockFailure.cpp" />
-    <ClCompile Include="CppUTestExt\TestMockPlugin.cpp" />
-    <ClCompile Include="CppUTestExt\TestMockSupport.cpp" />
-    <ClCompile Include="CppUTestExt\TestMockSupport_c.cpp" />
-    <ClCompile Include="CppUTestExt\TestMockSupport_cCFile.c" />
-    <ClCompile Include="CppUTestExt\TestOrderedTest.cpp" />
+    <ClCompile Include="CppUTestExt\CodeMemoryReportFormatterTest.cpp" />
+    <ClCompile Include="CppUTestExt\GMockTest.cpp" />
+    <ClCompile Include="CppUTestExt\GTest1Test.cpp" />
+    <ClCompile Include="CppUTestExt\MemoryReportAllocatorTest.cpp" />
+    <ClCompile Include="CppUTestExt\MemoryReporterPluginTest.cpp" />
+    <ClCompile Include="CppUTestExt\MemoryReportFormatterTest.cpp" />
+    <ClCompile Include="CppUTestExt\MockActualCallTest.cpp" />
+    <ClCompile Include="CppUTestExt\MockCheatSheetTest.cpp" />
+    <ClCompile Include="CppUTestExt\MockExpectedCallTest.cpp" />
+    <ClCompile Include="CppUTestExt\MockExpectedFunctionsListTest.cpp" />
+    <ClCompile Include="CppUTestExt\MockFailureTest.cpp" />
+    <ClCompile Include="CppUTestExt\MockPluginTest.cpp" />
+    <ClCompile Include="CppUTestExt\MockSupportTest.cpp" />
+    <ClCompile Include="CppUTestExt\MockSupport_cTest.cpp" />
+    <ClCompile Include="CppUTestExt\MockSupport_cTestCFile.c" />
+    <ClCompile Include="CppUTestExt\OrderedTestTest.cpp" />
     <ClCompile Include="JUnitOutputTest.cpp" />
     <ClCompile Include="MemoryLeakDetectorTest.cpp" />
     <ClCompile Include="MemoryLeakOperatorOverloadsTest.cpp" />
@@ -188,8 +188,8 @@
     <ClInclude Include="AllocationInCFile.h" />
     <ClInclude Include="AllocationInCppFile.h" />
     <ClInclude Include="AllTests.h" />
-    <ClInclude Include="CppUTestExt\TestMockFailure.h" />
-    <ClInclude Include="CppUTestExt\TestMockSupport_cCFile.h" />
+    <ClInclude Include="CppUTestExt\MockFailureTest.h" />
+    <ClInclude Include="CppUTestExt\MockSupport_cTestCFile.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/tests/CppUTestExt/CMakeLists.txt b/tests/CppUTestExt/CMakeLists.txt
index f7c863972..abfcf04de 100644
--- a/tests/CppUTestExt/CMakeLists.txt
+++ b/tests/CppUTestExt/CMakeLists.txt
@@ -1,21 +1,21 @@
 set(CppUTestExtTests_src
         AllTests.cpp
-        TestMockActualFunctionCall.cpp
-        TestMockSupport.cpp
-        TestCodeMemoryReportFormatter.cpp
-        TestMockCheatSheet.cpp
-        TestMockSupport_c.cpp
-        TestGMock.cpp
-        TestMockExpectedFunctionCall.cpp
-        TestMockSupport_cCFile.c
-        TestGTest.cpp
-        TestMockExpectedFunctionsList.cpp
-        TestMemoryReportAllocator.cpp
-        TestMockFailure.cpp
-        TestOrderedTest.cpp
-        TestMemoryReportFormatter.cpp
-        TestMemoryReporterPlugin.cpp
-        TestMockPlugin.cpp
+        CodeMemoryReportFormatterTest.cpp
+        GMockTest.cpp
+        GTest1Test.cpp
+        MemoryReportAllocatorTest.cpp
+        MemoryReporterPluginTest.cpp
+        MemoryReportFormatterTest.cpp
+        MockActualCallTest.cpp
+        MockCheatSheetTest.cpp
+        MockExpectedCallTest.cpp
+        MockExpectedFunctionsListTest.cpp
+        MockFailureTest.cpp
+        MockPluginTest.cpp
+        MockSupportTest.cpp
+        MockSupport_cTestCFile.c
+        MockSupport_cTest.cpp
+        OrderedTestTest.cpp
 )
 
 add_executable(CppUTestExtTests ${CppUTestExtTests_src})
diff --git a/tests/CppUTestExt/TestCodeMemoryReportFormatter.cpp b/tests/CppUTestExt/CodeMemoryReportFormatterTest.cpp
similarity index 100%
rename from tests/CppUTestExt/TestCodeMemoryReportFormatter.cpp
rename to tests/CppUTestExt/CodeMemoryReportFormatterTest.cpp
diff --git a/tests/CppUTestExt/TestGMock.cpp b/tests/CppUTestExt/GMockTest.cpp
similarity index 100%
rename from tests/CppUTestExt/TestGMock.cpp
rename to tests/CppUTestExt/GMockTest.cpp
diff --git a/tests/CppUTestExt/TestGTest.cpp b/tests/CppUTestExt/GTest1Test.cpp
similarity index 100%
rename from tests/CppUTestExt/TestGTest.cpp
rename to tests/CppUTestExt/GTest1Test.cpp
diff --git a/tests/CppUTestExt/TestGTestConvertor.cpp b/tests/CppUTestExt/GTest2ConvertorTest.cpp
similarity index 100%
rename from tests/CppUTestExt/TestGTestConvertor.cpp
rename to tests/CppUTestExt/GTest2ConvertorTest.cpp
diff --git a/tests/CppUTestExt/TestMemoryReportAllocator.cpp b/tests/CppUTestExt/MemoryReportAllocatorTest.cpp
similarity index 100%
rename from tests/CppUTestExt/TestMemoryReportAllocator.cpp
rename to tests/CppUTestExt/MemoryReportAllocatorTest.cpp
diff --git a/tests/CppUTestExt/TestMemoryReportFormatter.cpp b/tests/CppUTestExt/MemoryReportFormatterTest.cpp
similarity index 100%
rename from tests/CppUTestExt/TestMemoryReportFormatter.cpp
rename to tests/CppUTestExt/MemoryReportFormatterTest.cpp
diff --git a/tests/CppUTestExt/TestMemoryReporterPlugin.cpp b/tests/CppUTestExt/MemoryReporterPluginTest.cpp
similarity index 100%
rename from tests/CppUTestExt/TestMemoryReporterPlugin.cpp
rename to tests/CppUTestExt/MemoryReporterPluginTest.cpp
diff --git a/tests/CppUTestExt/TestMockActualFunctionCall.cpp b/tests/CppUTestExt/MockActualCallTest.cpp
similarity index 99%
rename from tests/CppUTestExt/TestMockActualFunctionCall.cpp
rename to tests/CppUTestExt/MockActualCallTest.cpp
index b661cbcf6..0fb4dd092 100644
--- a/tests/CppUTestExt/TestMockActualFunctionCall.cpp
+++ b/tests/CppUTestExt/MockActualCallTest.cpp
@@ -30,7 +30,7 @@
 #include "CppUTestExt/MockCheckedExpectedCall.h"
 #include "CppUTestExt/MockExpectedFunctionsList.h"
 #include "CppUTestExt/MockFailure.h"
-#include "TestMockFailure.h"
+#include "MockFailureTest.h"
 
 TEST_GROUP(MockCheckedActualCall)
 {
diff --git a/tests/CppUTestExt/TestMockCheatSheet.cpp b/tests/CppUTestExt/MockCheatSheetTest.cpp
similarity index 100%
rename from tests/CppUTestExt/TestMockCheatSheet.cpp
rename to tests/CppUTestExt/MockCheatSheetTest.cpp
diff --git a/tests/CppUTestExt/TestMockExpectedFunctionCall.cpp b/tests/CppUTestExt/MockExpectedCallTest.cpp
similarity index 99%
rename from tests/CppUTestExt/TestMockExpectedFunctionCall.cpp
rename to tests/CppUTestExt/MockExpectedCallTest.cpp
index aa64f5d09..b293a70db 100644
--- a/tests/CppUTestExt/TestMockExpectedFunctionCall.cpp
+++ b/tests/CppUTestExt/MockExpectedCallTest.cpp
@@ -28,7 +28,7 @@
 #include "CppUTest/TestHarness.h"
 #include "CppUTestExt/MockCheckedExpectedCall.h"
 #include "CppUTestExt/MockFailure.h"
-#include "TestMockFailure.h"
+#include "MockFailureTest.h"
 
 class TypeForTestingExpectedFunctionCall
 {
diff --git a/tests/CppUTestExt/TestMockExpectedFunctionsList.cpp b/tests/CppUTestExt/MockExpectedFunctionsListTest.cpp
similarity index 99%
rename from tests/CppUTestExt/TestMockExpectedFunctionsList.cpp
rename to tests/CppUTestExt/MockExpectedFunctionsListTest.cpp
index 7fbc8a261..af8853a0c 100644
--- a/tests/CppUTestExt/TestMockExpectedFunctionsList.cpp
+++ b/tests/CppUTestExt/MockExpectedFunctionsListTest.cpp
@@ -29,7 +29,7 @@
 #include "CppUTestExt/MockExpectedFunctionsList.h"
 #include "CppUTestExt/MockCheckedExpectedCall.h"
 #include "CppUTestExt/MockFailure.h"
-#include "TestMockFailure.h"
+#include "MockFailureTest.h"
 
 TEST_GROUP(MockExpectedFunctionsList)
 {
diff --git a/tests/CppUTestExt/TestMockFailure.cpp b/tests/CppUTestExt/MockFailureTest.cpp
similarity index 99%
rename from tests/CppUTestExt/TestMockFailure.cpp
rename to tests/CppUTestExt/MockFailureTest.cpp
index eee76127b..837f5b588 100644
--- a/tests/CppUTestExt/TestMockFailure.cpp
+++ b/tests/CppUTestExt/MockFailureTest.cpp
@@ -29,7 +29,7 @@
 #include "CppUTestExt/MockFailure.h"
 #include "CppUTestExt/MockCheckedExpectedCall.h"
 #include "CppUTestExt/MockExpectedFunctionsList.h"
-#include "TestMockFailure.h"
+#include "MockFailureTest.h"
 
 MockFailureReporterForTest* MockFailureReporterForTest::getReporter()
 {
diff --git a/tests/CppUTestExt/TestMockFailure.h b/tests/CppUTestExt/MockFailureTest.h
similarity index 100%
rename from tests/CppUTestExt/TestMockFailure.h
rename to tests/CppUTestExt/MockFailureTest.h
diff --git a/tests/CppUTestExt/TestMockPlugin.cpp b/tests/CppUTestExt/MockPluginTest.cpp
similarity index 99%
rename from tests/CppUTestExt/TestMockPlugin.cpp
rename to tests/CppUTestExt/MockPluginTest.cpp
index 9f238f8f6..cce47aecb 100644
--- a/tests/CppUTestExt/TestMockPlugin.cpp
+++ b/tests/CppUTestExt/MockPluginTest.cpp
@@ -28,7 +28,7 @@
 #include "CppUTest/TestOutput.h"
 #include "CppUTestExt/MockSupport.h"
 #include "CppUTestExt/MockSupportPlugin.h"
-#include "TestMockFailure.h"
+#include "MockFailureTest.h"
 
 TEST_GROUP(MockPlugin)
 {
diff --git a/tests/CppUTestExt/TestMockSupport.cpp b/tests/CppUTestExt/MockSupportTest.cpp
similarity index 99%
rename from tests/CppUTestExt/TestMockSupport.cpp
rename to tests/CppUTestExt/MockSupportTest.cpp
index 03771d039..3e404868f 100644
--- a/tests/CppUTestExt/TestMockSupport.cpp
+++ b/tests/CppUTestExt/MockSupportTest.cpp
@@ -29,7 +29,7 @@
 #include "CppUTestExt/MockSupport.h"
 #include "CppUTestExt/MockExpectedCall.h"
 #include "CppUTestExt/MockFailure.h"
-#include "TestMockFailure.h"
+#include "MockFailureTest.h"
 
 TEST_GROUP(MockSupportTest)
 {
diff --git a/tests/CppUTestExt/TestMockSupport_c.cpp b/tests/CppUTestExt/MockSupport_cTest.cpp
similarity index 99%
rename from tests/CppUTestExt/TestMockSupport_c.cpp
rename to tests/CppUTestExt/MockSupport_cTest.cpp
index 1e109feac..129d1d020 100644
--- a/tests/CppUTestExt/TestMockSupport_c.cpp
+++ b/tests/CppUTestExt/MockSupport_cTest.cpp
@@ -29,7 +29,7 @@
 #include "CppUTest/TestHarness_c.h"
 #include "CppUTest/TestTestingFixture.h"
 #include "CppUTestExt/MockSupport_c.h"
-#include "TestMockSupport_cCFile.h"
+#include "MockSupport_cTestCFile.h"
 
 TEST_GROUP(MockSupport_c)
 {
diff --git a/tests/CppUTestExt/TestMockSupport_cCFile.c b/tests/CppUTestExt/MockSupport_cTestCFile.c
similarity index 98%
rename from tests/CppUTestExt/TestMockSupport_cCFile.c
rename to tests/CppUTestExt/MockSupport_cTestCFile.c
index a39d7181e..d2d0dfd7b 100644
--- a/tests/CppUTestExt/TestMockSupport_cCFile.c
+++ b/tests/CppUTestExt/MockSupport_cTestCFile.c
@@ -26,7 +26,7 @@
  */
 
 #include "CppUTestExt/MockSupport_c.h"
-#include "TestMockSupport_cCFile.h"
+#include "MockSupport_cTestCFile.h"
 
 static int typeNameIsEqual(const void* object1, const void* object2)
 {
diff --git a/tests/CppUTestExt/TestMockSupport_cCFile.h b/tests/CppUTestExt/MockSupport_cTestCFile.h
similarity index 100%
rename from tests/CppUTestExt/TestMockSupport_cCFile.h
rename to tests/CppUTestExt/MockSupport_cTestCFile.h
diff --git a/tests/CppUTestExt/TestOrderedTest.cpp b/tests/CppUTestExt/OrderedTestTest.cpp
similarity index 100%
rename from tests/CppUTestExt/TestOrderedTest.cpp
rename to tests/CppUTestExt/OrderedTestTest.cpp