Fixes PR automake/169.

	* m4/depend.m4 (AM_DEPENDENCIES): Handle GCJ.  Don't assume gcc
	style for OBJC.
	* automake.in (java): Added autodep entry.
	* tests/Makefile.am (TESTS): Added gcj3.test.
	* tests/gcj3.test: New file.

diff --git a/ChangeLog b/ChangeLog
index e92c195f2ec85c803b8be456fb375eb9cb89107e..f6d9f31f78e3c1504b1858c31fe95c4291dcbba8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-05-12  Tom Tromey  <tromey@redhat.com>
+
+       Fixes PR automake/169.
+       * m4/depend.m4 (AM_DEPENDENCIES): Handle GCJ.  Don't assume gcc
+       style for OBJC.
+       * automake.in (java): Added autodep entry.
+       * tests/Makefile.am (TESTS): Added gcj3.test.
+       * tests/gcj3.test: New file.
+
 2001-05-12  Raja R Harinath  <harinath@cs.umn.edu>
 
        * automake.in (ASSIGNMENT_PATTERN): Make variable-name pattern 

diff --git a/automake.in b/automake.in
index 8f3062df983d5a25771943ec39e3771207e85082..a286507a2f997d1aa4527460d2aa0f7b9b2cf67b 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -959,13 +959,12 @@ register_language ('name' => 'ratfor',
                   '_finish' => \&lang_ratfor_finish);
 
 # Java via gcj.
-# FIXME: for now we can't do dependency tracking for Java.
-# autodep=GCJ
 register_language ('name' => 'java',
                   'Name' => 'Java',
                   'config_vars' => ['GCJ'],
                   'linker' => 'GCJLINK',
                   'link' => '$(GCJLD) $(AM_GCJFLAGS) $(GCJFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@',
+                  'autodep' => 'GCJ',
                   'flags' => 'GCJFLAGS',
                   'compile' => '$(GCJ) $(AM_GCJFLAGS) $(GCJFLAGS)',
                   'compiler' => 'GCJCOMPILE',

diff --git a/m4/depend.m4 b/m4/depend.m4
index cb73080a46a4d91033f6af0aa3dc8a8599b884b4..1911b324881f350a4c3240877aa94667ab5a8816 100644 (file)
--- a/m4/depend.m4
+++ b/m4/depend.m4
@@ -14,6 +14,7 @@
 AC_DEFUN([AM_DEPENDENCIES],
 [AC_REQUIRE([AM_SET_DEPDIR])dnl
 AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+am_compiler_list=
 ifelse([$1], CC,
        [AC_REQUIRE([AC_PROG_][CC])dnl
 AC_REQUIRE([AC_PROG_][CPP])
@@ -23,7 +24,12 @@ depcpp="$CPP"],
 AC_REQUIRE([AC_PROG_][CXXCPP])
 depcc="$CXX"
 depcpp="$CXXCPP"],
-       [$1], OBJC, [am_cv_OBJC_dependencies_compiler_type=gcc],
+       [$1], OBJC, [am_compiler_list='gcc gcc3'
+depcc="$OBJC"
+depcpp=""],
+       [$1], GCJ,  [am_compiler_list='gcc gcc3'
+depcc="$GCJ"
+depcpp=""],
        [AC_REQUIRE([AC_PROG_][$1])dnl
 depcc="$$1"
 depcpp=""])
@@ -45,7 +51,10 @@ AC_CACHE_CHECK([dependency style of $depcc],
   cd confdir
 
   am_cv_$1_dependencies_compiler_type=none
-  for depmode in `sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < "./depcomp"`; do
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list="`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`"
+  fi
+  for depmode in $am_compiler_list; do
     # We need to recreate these files for each test, as the compiler may
     # overwrite some of them when testing with obscure command lines.
     # This happens at least with the AIX C compiler.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 51ac2d35a8876bae7531a93ce5ef3719803150c2..314a2c912de3a8eda4468bb829b2bd94f1820ca6 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -123,6 +123,7 @@ fpinst2.test \
 fpinstall.test \
 gcj.test \
 gcj2.test \
+gcj3.test \
 gnits.test \
 header.test \
 implicit.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 9bda144c50f58a14f440856e6de61669c2651eea..93ad14a391c971ce7aac37508957336b532b8a21 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -195,6 +195,7 @@ fpinst2.test \
 fpinstall.test \
 gcj.test \
 gcj2.test \
+gcj3.test \
 gnits.test \
 header.test \
 implicit.test \

diff --git a/tests/gcj3.test b/tests/gcj3.test
new file mode 100755 (executable)
index 0000000..706918d
--- /dev/null
+++ b/tests/gcj3.test
@@ -0,0 +1,21 @@
+#! /bin/sh
+
+# Make sure dependency tracking works for java.
+
+. $srcdir/defs || exit 1
+
+cat >> configure.in << 'END'
+AM_DEPENDENCIES(GCJ)
+AC_SUBST(GCJ)
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = convert
+convert_SOURCES = x/y/convert.java
+END
+
+$ACLOCAL || exit 1
+$AUTOMAKE || exit 1
+
+num=`grep depcomp Makefile.in | wc -l`
+test $num -gt 1