From db693fbb3144759c3eb0f385d5898a483302e2ea Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 24 Apr 1999 17:45:39 +0000 Subject: [PATCH] * automake.in: Treat `.zip' and `.jar' files as Java. --- ChangeLog | 2 ++ TODO | 2 ++ automake.in | 3 +-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 991e8ec5..bd16197f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 1999-04-24 Tom Tromey + * 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 e39c0872..4f1210b0 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 diff --git a/automake.in b/automake.in index 3411dbef..e7c58bf2 100755 --- a/automake.in +++ b/automake.in @@ -342,9 +342,8 @@ $obsolete_rx = '(' . join ('|', keys %obsolete_macros) . ')'; 'F'); ®ister_language ('ratfor', 'linker=F77LINK', 'r'); -# FIXME: what about zip and jar? ®ister_language ('java', 'linker=GCJLINK', 'autodep=GCJ', - 'java', 'class'); + 'java', 'class', 'zip', 'jar'); # Parse command line. -- 2.43.5