* automake.in: Treat `.class' files as Java source.

	(lang_java_finish): Handle `.class' files.

diff --git a/ChangeLog b/ChangeLog
index 3f92b94ef0814b64780ce47bbeaa359ca4dab17b..0aa3bd34b8b82dc1c9d2f530405158a41d3ae703 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-04-19  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in: Treat `.class' files as Java source.
+       (lang_java_finish): Handle `.class' files.
+
 1999-04-18  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
        * m4/lispdir.m4: Match only `/(share|lib)/x?emacs/site-lisp/*$'.

diff --git a/automake.in b/automake.in
index 7105b6168f36c912695c1e434d04e346f8831ffc..2c532a71fadbe98b447ec56621329cf0c35df4ba 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -341,8 +341,9 @@ $obsolete_rx = '(' . join ('|', keys %obsolete_macros) . ')';
                    'F');
 &register_language ('ratfor', 'linker=F77LINK',
                    'r');
+# FIXME: what about zip and jar?
 &register_language ('java', 'linker=GCJLINK', 'autodep=GCJ',
-                   'java');
+                   'java', 'class');
 
 
 # Parse command line.
@@ -5188,7 +5189,8 @@ sub lang_objc_finish
 
 sub lang_java_finish
 {
-    push (@suffixes, '.java');
+    local (@java_list) = &lang_extensions ('java');
+    push (@suffixes, @java_list);
 
     local ($ltcompile, $ltlink) = &libtool_compiler;
 
@@ -5199,16 +5201,20 @@ sub lang_java_finish
     &define_variable ('GCJLD', '$(GCJ)');
     &define_variable ('GCJLINK', $ltlink . '$(GCJLD) $(AM_GCJFLAGS) $(GCJFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@');
 
-    # All known Java compilers support -c and -o together.
-    $output_rules .= (".java.o:\n"
-                      . "\t\$(GCJCOMPILE) -c -o \$\@ \$<\n");
-    # FIXME: Using cygpath should be somehow conditional.
-    $output_rules .= (".java.obj:\n"
-                      . "\t\$(GCJCOMPILE) -c -o \$\@ `cygpath -w \$<`\n")
-        if ($seen_objext);
-    $output_rules .= (".java.lo:\n"
-                      . "\t\$(LTGCJCOMPILE) -c -o \$\@ \$<\n")
-        if ($seen_libtool);
+    local ($ext);
+    foreach $ext (@java_list)
+    {
+       # All known Java compilers support -c and -o together.
+       $output_rules .= (".${ext}.o:\n"
+                         . "\t\$(GCJCOMPILE) -c -o \$\@ \$<\n");
+       # FIXME: Using cygpath should be somehow conditional.
+       $output_rules .= (".${ext}.obj:\n"
+                         . "\t\$(GCJCOMPILE) -c -o \$\@ `cygpath -w \$<`\n")
+           if $seen_objext;
+       $output_rules .= (".${ext}.lo:\n"
+                         . "\t\$(LTGCJCOMPILE) -c -o \$\@ \$<\n")
+           if $seen_libtool;
+    }
 
     if (! defined $configure_vars{'GCJ'})
     {

diff --git a/stamp-vti b/stamp-vti
index 27436269e4d379ab52043c468201ebe3ac28ae35..947c4ce6276542b51cf8d13c9de198c29dc5bbce 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,3 +1,3 @@
-@set UPDATED 9 April 1999
+@set UPDATED 13 April 1999
 @set EDITION 1.4a
 @set VERSION 1.4a

diff --git a/version.texi b/version.texi
index 27436269e4d379ab52043c468201ebe3ac28ae35..947c4ce6276542b51cf8d13c9de198c29dc5bbce 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 9 April 1999
+@set UPDATED 13 April 1999
 @set EDITION 1.4a
 @set VERSION 1.4a