From: Tom Tromey <tromey@redhat.com>
Date: Sat, 24 Apr 1999 17:45:42 +0000 (+0000)
Subject: 	* automake.in: Treat `.zip' and `.jar' files as Java.
X-Git-Tag: merging-into-user-dep-gen~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fcda9570ddd036e09f73a69a4b4f3acdf5001c2;p=thirdparty%2Fautomake.git

	* automake.in: Treat `.zip' and `.jar' files as Java.
---

diff --git a/ChangeLog b/ChangeLog
index 991e8ec54..bd16197f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 1999-04-24  Tom Tromey  <tromey@cygnus.com>
 
+	* automake.in: Treat `.zip' and `.jar' files as Java.
+
 	* automake.in (generate_makefile): Define `subdir' after reading
 	.am file.
 	(read_main_am_file): Give programming error if variable defined
diff --git a/TODO b/TODO
index e39c08720..4f1210b04 100644
--- a/TODO
+++ b/TODO
@@ -13,6 +13,8 @@
 
 * Support subdir-objects with fortran
 
+* Allow creation of Java .zip/.jar files in natural way
+
 * Run automake before libtool.  It will report an error but
   still won't put the file into the disty.  This is wrong.
   From Mark H Wilkinson <mhw@kremvax.demon.co.uk>
diff --git a/automake.in b/automake.in
index 3411dbef8..e7c58bf24 100755
--- a/automake.in
+++ b/automake.in
@@ -342,9 +342,8 @@ $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', 'class');
+		    'java', 'class', 'zip', 'jar');
 
 
 # Parse command line.