Further project/Makefile structures for tests

Makefile

@@ -21,14 +21,14 @@ endif
 
 .PHONY: all src test clean
 
-all: src test
+all: test
+
+test: src
+	$(MAKE) -C test compile
 
 src:
 	$(MAKE) -C src
 
-test: src
-	$(MAKE) -C test
-
 clean:
 	$(MAKE) -C src clean
 	$(MAKE) -C test clean

test/Basic/Makefile

@@ -1,18 +1,27 @@
 include ../../Makefile.conf
 include ../Makefile.conf
 
-.PHONY: test clean
+JAVA_CLASSES = \
+  Testing.class \
+	SyncCallbacks.class
 
-test: Testing.class SyncCallbacks.class
+.PHONY: compile run test clean
+
+all: compile
+	$(MAKE) run
+
+run: compile
 	HOME=$(PWD) CLASSPATH=$(CLASSPATH) time $(VM) Testing
 
+compile: $(JAVA_CLASSES)
+
 %.class: %.java
 	CLASSPATH=$(CLASSPATH) javac $<
 
 clean:
 	rm -f *.class
 	rm -f *.log
-	rm -f .pEp_*
+	rm -rf .pEp_*
 	rm -Rf .pEp
 	rm -Rf .gnupg
 	rm -Rf .lldb

test/JNI_85/Makefile

@@ -4,12 +4,22 @@ include ../Makefile.conf
 #TODO: Remove when successufuly reproduce the error, and then use it to avoid regression
 $(info This is to be run using pEpJNIAdapter 626)
 
-.PHONY: test clean
+JAVA_CLASSES = \
+	SyncCallbacks.class \
+	Step1.class \
+	Step2.class
 
-test: SyncCallbacks.class Step1.class Step2.class
+.PHONY: compile run test clean
+
+all: compile
+	$(MAKE) run
+
+run: compile
 	-HOME=$(PWD) CLASSPATH=$(CLASSPATH) time $(VM) Step1
 	HOME=$(PWD) CLASSPATH=$(CLASSPATH) time $(VM) Step2
 
+compile: $(JAVA_CLASSES)
+
 %.class: %.java
 	CLASSPATH=$(CLASSPATH) javac $<