-EXTRA_DIST=msg_test_suspend_deployment.xml msg_test_suspend_platform.xml surfxml.dtd
+EXTRA_DIST=suspend_deployment.xml suspend_platform.xml
# Declare sources:
-noinst_JAVA= DreamMaster.java LazyGuy.java SuspendTest.java
+JAVA_SRC=DreamMaster.java LazyGuy.java SuspendTest.java
+JAVA_TESTS=SuspendTest.class
+
+EXTRA_DIST+=$(JAVA_SRC)
# Declare test class
-#if HAVE_JAVA
-TESTS=SuspendTest.class
-#endif
+if HAVE_JAVA
+noinst_JAVA=$(JAVA_SRC)
+TESTS=$(JAVA_TESTS)
+else
+EXTRA_DIST+=$(JAVA_TESTS)
+endif
include $(srcdir)/../java_test.mk
