diff --git a/projects/SelfTest/makefile b/projects/SelfTest/makefile
index 8c72c076..f828c526 100644
--- a/projects/SelfTest/makefile
+++ b/projects/SelfTest/makefile
@@ -1,21 +1,14 @@
-SOURCES =	ApproxTests.cpp \
-			ClassTests.cpp \
-			ConditionTests.cpp \
-      		ExceptionTests.cpp \
-      		GeneratorTests.cpp \
-      		MessageTests.cpp \
-      		MiscTests.cpp \
-      		TestMain.cpp \
-      		TrickyTests.cpp \
-      		BDDTests.cpp \
-      		VariadicMacrosTests.cpp \
 
-OBJECTS    = $(patsubst %.cpp, %.o, $(SOURCES))
+EXEC=CatchSelfTest
+SOURCES = $(wildcard *.cpp)
+OBJECTS = $(SOURCES:.cpp=.o)
+
 CXX = g++
-CXXFLAGS  = -I../../include
+CXXFLAGS  = -I../../include -I../../include/internal
 
-CatchSelfTest: $(OBJECTS)
+$(EXEC): $(OBJECTS)
 	$(CXX) -o $@ $^
 
 clean:
-	rm -f $(OBJECTS)
+	$(RM) $(OBJECTS)
+	$(RM) $(EXEC)