* lib/am/java.am (class%DIR%.stamp): Don't run $(JAVAC) when there

is no file to compile.
* tests/java2.test: New file.
* tests/Makefile.am (TESTS): Add java2.test.
Reported by Braden N. McDaniel.

diff --git a/ChangeLog b/ChangeLog
index 2daa260d1f8efe258da7fcfa62f2b4c8e08fc8bf..03028f1a78bb3c5a0a450f97cb74b2686d8ca266 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-06-11  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * lib/am/java.am (class%DIR%.stamp): Don't run $(JAVAC) when there
+       is no file to compile.
+       * tests/java2.test: New file.
+       * tests/Makefile.am (TESTS): Add java2.test.
+       Reported by Braden N. McDaniel.
+
 2002-06-11  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * tests/maintclean.test: Don't check for autom4te.cache if

diff --git a/lib/am/java.am b/lib/am/java.am
index c44a4b898eaa32f19e95fd2cd158bd0a27cb57d5..9fb5c72700825ea7df54e4c329237b3400527fa8 100644 (file)
--- a/lib/am/java.am
+++ b/lib/am/java.am
@@ -27,8 +27,11 @@ CLASSPATH_ENV = CLASSPATH=$(JAVAROOT):$(srcdir)/$(JAVAROOT):$$CLASSPATH
 JAVAROOT = $(top_builddir)
 
 class%DIR%.stamp: $(%DIR%_JAVA)
-       $(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) \
-         $(AM_JAVACFLAGS) $(JAVACFLAGS) $?
+       @if test -n "$?"; then \
+         echo '$(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
+         $(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) \
+           $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
+       else :; fi
        echo timestamp > class%DIR%.stamp
 
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 187953d3acbbda0a24c018cc6227e1b2c5157c08..f85ed3bf301c90bb818e77ff79d59d248c80140d 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -186,6 +186,7 @@ instman2.test \
 interp.test \
 interp2.test \
 java.test \
+java2.test \
 javaprim.test \
 javasubst.test \
 ldadd.test \

diff --git a/tests/java2.test b/tests/java2.test
new file mode 100755 (executable)
index 0000000..86d0145
--- /dev/null
+++ b/tests/java2.test
@@ -0,0 +1,35 @@
+#! /bin/sh
+
+# Make sure that Java rules doesn't attempt to run javac when there is
+# no classes to compile.
+# Report from Braden McDaniel.
+
+. $srcdir/defs || exit 1
+
+set -e
+
+cat >> configure.in << 'END'
+AM_CONDITIONAL(WITH_JDK, false)
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+JAVAC = false
+JAVAROOT = $(top_builddir)/java
+
+JAVA_FILES = MyClass1.java
+
+if WITH_JDK
+noinst_JAVA = $(JAVA_FILES)
+endif
+
+EXTRA_DIST = $(JAVA_FILES)
+END
+
+: >MyClass1.java
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE