correct Makefiles for testing dir

src/Makefile

@@ -21,11 +21,13 @@ clean: $(BUILDDIR)
 	$(MAKE) -C cluster clean
 	$(MAKE) -C sphere clean
 	$(MAKE) -C trapping clean
+	$(MAKE) -C testing clean
 
 wipe: $(BUILDDIR)
 	$(MAKE) -C cluster wipe
 	$(MAKE) -C sphere wipe
 	$(MAKE) -C trapping wipe
+	$(MAKE) -C testing wipe
 	if [ -d $(DOCSDIR)/build/html ]; then rm -r $(DOCSDIR)/build/html; fi
 	if [ -d $(DOCSDIR)/build/latex ]; then rm -r $(DOCSDIR)/build/latex; fi
 

src/testing/Makefile

 ifndef BUILDDIR
-override BUILDDIR=../../build/testing
+override BUILDDIR=../../build
+endif
+ifndef BUILDDIR_TEST
+override BUILDDIR_TEST=$(BUILDDIR)/testing
 endif
 ifndef OBJDIR
 override OBJDIR=../objects
@@ -12,16 +15,19 @@ CXX_TEDF_OBJS=$(OBJDIR)/test_TEDF.o $(OBJDIR)/Configuration.o $(OBJDIR)/file_io.
 
 CXX_TTMS_OBJS=$(OBJDIR)/test_TTMS.o $(OBJDIR)/file_io.o $(OBJDIR)/Parsers.o $(OBJDIR)/TransitionMatrix.o
 
-all: $(BUILDDIR)/test_TEDF $(BUILDDIR)/test_TTMS
+all: $(BUILDDIR_TEST)/test_TEDF $(BUILDDIR_TEST)/test_TTMS
+
+$(BUILDDIR_TEST):
+	mkdir -p $(BUILDDIR_TEST)
 
-$(BUILDDIR)/test_TEDF: $(CXX_TEDF_OBJS)
-	$(CXX) $(CXXFLAGS) -o $(BUILDDIR)/test_TEDF $(CXX_TEDF_OBJS) $(CXXLDFLAGS) 
+$(BUILDDIR_TEST)/test_TEDF: $(CXX_TEDF_OBJS) $(BUILDDIR_TEST)
+	$(CXX) $(CXXFLAGS) -o $(BUILDDIR_TEST)/test_TEDF $(CXX_TEDF_OBJS) $(CXXLDFLAGS) 
 
-$(BUILDDIR)/test_TTMS: $(CXX_TTMS_OBJS)
-	$(CXX) $(CXXFLAGS) -o $(BUILDDIR)/test_TTMS $(CXX_TTMS_OBJS) $(CXXLDFLAGS) 
+$(BUILDDIR_TEST)/test_TTMS: $(CXX_TTMS_OBJS) $(BUILDDIR_TEST)
+	$(CXX) $(CXXFLAGS) -o $(BUILDDIR_TEST)/test_TTMS $(CXX_TTMS_OBJS) $(CXXLDFLAGS) 
 
 clean:
 	rm -f $(CXX_TEDF_OBJS) $(CXX_TTMS_OBJS)
 
 wipe:
-	rm -f $(BUILDDIR)/test_TEDF $(BUILDDIR)/test_TTMS $(CXX_TEDF_OBJS) $(CXX_TTMS_OBJS)
+	rm -f $(BUILDDIR_TEST)/test_TEDF $(BUILDDIR_TEST)/test_TTMS $(CXX_TEDF_OBJS) $(CXX_TTMS_OBJS)