Re: libtool woes

[Jukka Santala <jsantala@tml.hut.fi>]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 2352 bytes --]

On Fri, 1 Feb 2002, Alexandre Petit-Bianco wrote:
> Yes please. Don't include the ChangeLog entries as they often don't
> apply cleanly. Listing the ChangeLog entry and then the relevant hunks
> is the preferred form of patch submission (this is not the reason the
> patch wasn't applied in a timely fashion, BTW. We're all just really
> busy. Sorry about that.)

Yeah, I'm familiar with that convention, but consider it rather silly.
Especially with projects like rhug with literally dozens of ChangeLog's to
maintain, the duplicated effort both on the patch-author and and
patch-applier to deal with separate ChangeLog entries is quite a lot. And
if the patch to a ChangeLog fails to apply cleanly, you're basically left
with the separate entry to paste in anyway.

Ofcourse, the reason all the chunks failed, and not just the ChangeLog
entries, probably has more to do with the CVS diff format than any
ChangeLog changes itself. Some patch utilities apply them cleanly, others
are led to try to apply it to a wrong file if one with the same name
exists in the root directory where it's ran. And remember, this change
involves the Makefile.in file in every one of the 16 directories, each one
with their invidual ChangeLog entries ;) So it's getting to be quite a
drag to do this by diffs.

So anyway, here's the patch again, in plain patch format, which applies
cleanly with -p1 or from the directory with "rhug" tree in it. For what it
is worth, I separated the patches to all the 17 ChangeLog's into a
separate patch, but didn't feel like providing alternate text-copy of each
to go with the chunks they apply to. (Most directories have slightly
different ChangeLog entries or at least different timestamp format(!))

I added the fix for the AM_GCJFLAGS problem (Makefile's using the
user-flag GCJFLAGS instead, preventing the user from giving alternative
flags) as well to avoid the need for a separate patch to apply for that. I
also participated in little historical revisionism, since I didn't feel
like updating the ChangeLog entry timestamp in each affected directory,
since it's practically same anyway. The normal caveats apply; I did
rebuild the build-scripts, but since my tools are different version, that
would generate some ten megabytes of diffs, hence hopefully whoever
applies the patches will re-generate them ;)

 -Jukka Santala

[-- Attachment #2: Type: TEXT/PLAIN, Size: 9266 bytes --]

diff -u -r rhug-clean/BCEL/ChangeLog rhug/BCEL/ChangeLog
--- rhug-clean/BCEL/ChangeLog	Fri Sep 14 04:02:46 2001
+++ rhug/BCEL/ChangeLog	Mon Feb  4 14:20:00 2002
@@ -1,3 +1,10 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+
+	* Makefile.am
+	(AM_GCJFLAGS): Use the proper flags instead of the user-flags.
+	($(JARFILE) rule): Use $(GCJH) instead of hard-coded "gcjh".
+	* Makefile.in: Rebuilt.
+
 Thu Sep 13 17:46:27 2001  Anthony Green  <green@redhat.com>
 
 	* Makefile.am (EXTRA_DIST): Replace VERSION with info.rml.
diff -u -r rhug-clean/BouncyCastle/ChangeLog rhug/BouncyCastle/ChangeLog
--- rhug-clean/BouncyCastle/ChangeLog	Sat Oct 20 00:20:02 2001
+++ rhug/BouncyCastle/ChangeLog	Mon Feb  4 14:56:06 2002
@@ -1,3 +1,8 @@
+2002-01-22  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am: Use $(GCJH) instead of hard-coded "gcjh".
+	* Makefile.in: Rebuilt.
+
 2001-10-19  Tom Tromey  <tromey@redhat.com>
 
 	* Makefile.in: Rebuilt.
diff -u -r rhug-clean/ChangeLog rhug/ChangeLog
--- rhug-clean/ChangeLog	Wed Jan 30 22:37:55 2002
+++ rhug/ChangeLog	Thu Jan 31 15:28:06 2002
@@ -5,6 +5,12 @@
 	* configure: Rebuilt.
 	* configure.in: Generate jasmin/Makefile.
 
+2002-01-22  Jukka Santala  <jsantala@tml.hut.fi>
+
+	* configure.in: Add check for $(GCJH) and re-code $(GCJ) check 
+	for easier support of alternate compiler toolchains.
+	* configure: Rebuilt.
+
 2001-10-24  Tom Tromey  <tromey@redhat.com>
 
 	* configure: Rebuilt.
diff -u -r rhug-clean/bsf/ChangeLog rhug/bsf/ChangeLog
--- rhug-clean/bsf/ChangeLog	Fri Oct 12 10:31:19 2001
+++ rhug/bsf/ChangeLog	Mon Feb  4 14:56:29 2002
@@ -1,3 +1,10 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am
+	(AM_GCJFLAGS): Use the proper flags instead of the user-flags.
+	($(JARFILE) rule): Use $(GCJH) instead of hard-coded "gcjh".
+	* Makefile.in: Rebuilt.
+
 Sun Oct  7 16:41:50 2001  Anthony Green  <green@redhat.com>
 
 	* Makefile.am: New file.
diff -u -r rhug-clean/cup/ChangeLog rhug/cup/ChangeLog
--- rhug-clean/cup/ChangeLog	Fri Sep 14 03:40:32 2001
+++ rhug/cup/ChangeLog	Mon Feb  4 14:56:44 2002
@@ -1,3 +1,10 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am
+	(AM_GCJFLAGS): Use the proper flags instead of the user-flags.
+	($(JARFILE) rule): Use $(GCJH) instead of hard-coded "gcjh".
+	* Makefile.in: Rebuilt.
+
 Thu Sep 13 17:35:47 2001  Anthony Green  <green@redhat.com>
 
 	* info.rml: New file.
diff -u -r rhug-clean/gnu.readline/ChangeLog rhug/gnu.readline/ChangeLog
--- rhug-clean/gnu.readline/ChangeLog	Sat Oct 20 02:40:03 2001
+++ rhug/gnu.readline/ChangeLog	Mon Feb  4 14:54:04 2002
@@ -1,3 +1,12 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am
+	(AM_GCJFLAGS): Use the proper flags instead of the user-flags.
+	(org_gnu_readline_Readline.h): Use $(GCJH) instead of 
+	hard-coded "gcjh".
+	($(JARFILE) rule): Don't try to update jar with no files.
+	* Makefile.in: Rebuilt.
+
 2001-10-15  Alexandre Petit-Bianco  <apbianco@redhat.com>
 	
 	* upstream/src/native/org_gnu_readline_Readline.c (stdio.h): Include.
diff -u -r rhug-clean/gnu.regexp/ChangeLog rhug/gnu.regexp/ChangeLog
--- rhug-clean/gnu.regexp/ChangeLog	Tue Oct  9 00:52:40 2001
+++ rhug/gnu.regexp/ChangeLog	Mon Feb  4 14:57:19 2002
@@ -1,3 +1,11 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am
+	(AM_GCJFLAGS): Use the proper flags instead of the user-flags.
+	($(JARFILE) rule): Use $(GCJH) instead of hard-coded "gcjh".
+	(lib_gnu_regexp_la_DEPENDENCIES): Use $(GCJ) instead of "gcj".
+	* Makefile.in: Rebuilt.
+
 2001-10-08  Alexandre Petit-Bianco  <apbianco@redhat.com>
 
 	* gnu.regexp/rhug.tests/tests.exp: Handle and report individual
diff -u -r rhug-clean/jakarta-log4j/ChangeLog rhug/jakarta-log4j/ChangeLog
--- rhug-clean/jakarta-log4j/ChangeLog	Fri Sep 14 04:04:12 2001
+++ rhug/jakarta-log4j/ChangeLog	Mon Feb  4 14:58:38 2002
@@ -1,3 +1,8 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am: Use the proper flags instead of the user-flags.
+	* Makefile.in: Rebuilt.
+
 Thu Sep 13 17:49:19 2001  Anthony Green  <green@redhat.com>
 
 	* Makefile.am (EXTRA_DIST): Replace VERSION with info.rml.
diff -u -r rhug-clean/jakarta-oro/ChangeLog rhug/jakarta-oro/ChangeLog
--- rhug-clean/jakarta-oro/ChangeLog	Fri Oct 12 23:26:58 2001
+++ rhug/jakarta-oro/ChangeLog	Mon Feb  4 14:58:46 2002
@@ -1,3 +1,8 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am: Use the proper flags instead of the user-flags.
+	* Makefile.in: Rebuilt.
+
 2001-10-12  Alexandre Petit-Bianco  <apbianco@redhat.com>
 
 	* rhug.tests: New directory.
diff -u -r rhug-clean/jakarta-regexp/ChangeLog rhug/jakarta-regexp/ChangeLog
--- rhug-clean/jakarta-regexp/ChangeLog	Fri Sep 14 04:04:12 2001
+++ rhug/jakarta-regexp/ChangeLog	Mon Feb  4 14:58:57 2002
@@ -1,3 +1,11 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am
+	(AM_GCJFLAGS): Use the proper flags instead of the user-flags.
+	($(nobase_include_HEADERS) rule): Use $(GCJH) instead of 
+	hard-coded "gcjh".
+	* Makefile.in: Rebuilt.
+
 Thu Sep 13 17:49:05 2001  Anthony Green  <green@redhat.com>
 
 	* Makefile.am (EXTRA_DIST): Replace VERSION with info.rml.
diff -u -r rhug-clean/jakarta-servletapi/ChangeLog rhug/jakarta-servletapi/ChangeLog
--- rhug-clean/jakarta-servletapi/ChangeLog	Mon Sep 10 04:44:10 2001
+++ rhug/jakarta-servletapi/ChangeLog	Mon Feb  4 14:59:08 2002
@@ -1,3 +1,10 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am
+	(AM_GCJFLAGS): Use the proper flags instead of the user-flags.
+	($(JARFILE) rule): Use $(GCJH) instead of hard-coded "gcjh".
+	* Makefile.in: Rebuilt.
+
 Sun Sep  9 18:39:20 2001  Anthony Green  <green@redhat.com>
 
 	* Makefile.am (install-data-local): Fix for srcdir==builddir.
diff -u -r rhug-clean/jakarta-tomcat/ChangeLog rhug/jakarta-tomcat/ChangeLog
--- rhug-clean/jakarta-tomcat/ChangeLog	Sun Sep  9 21:56:37 2001
+++ rhug/jakarta-tomcat/ChangeLog	Mon Feb  4 14:59:18 2002
@@ -1,3 +1,8 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am: Use the proper flags instead of the user-flags.
+	* Makefile.in: Rebuilt.
+
 Sun Sep  9 11:49:15 2001  Anthony Green  <green@redhat.com>
 
 	* Makefile.am (EXTRA_DIST): Define.
diff -u -r rhug-clean/jython/ChangeLog rhug/jython/ChangeLog
--- rhug-clean/jython/ChangeLog	Thu Oct 25 08:30:32 2001
+++ rhug/jython/ChangeLog	Mon Feb  4 14:58:23 2002
@@ -1,3 +1,8 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am: Use the proper flags instead of the user-flags.
+	* Makefile.in: Rebuilt.
+
 2001-10-24  Alexandre Petit-Bianco  <apbianco@redhat.com>
 
 	* Makefile.in: Rebuilt.
diff -u -r rhug-clean/pgsql-jdbc/ChangeLog rhug/pgsql-jdbc/ChangeLog
--- rhug-clean/pgsql-jdbc/ChangeLog	Wed Oct 10 09:22:54 2001
+++ rhug/pgsql-jdbc/ChangeLog	Mon Feb  4 14:58:02 2002
@@ -1,3 +1,10 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am
+	(AM_GCJFLAGS): Use the proper flags instead of the user-flags.
+	($(JARFILE) rule): Use $(GCJH) instead of hard-coded "gcjh".
+	* Makefile.in: Rebuilt.
+
 Tue Oct  9 23:10:52 2001  Anthony Green  <green@redhat.com>
 
 	* Makefile.am: New file.
diff -u -r rhug-clean/rhino/ChangeLog rhug/rhino/ChangeLog
--- rhug-clean/rhino/ChangeLog	Wed Oct 10 09:27:33 2001
+++ rhug/rhino/ChangeLog	Mon Feb  4 14:58:14 2002
@@ -1,3 +1,10 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am
+	(AM_GCJFLAGS): Use the proper flags instead of the user-flags.
+	($(JARFILE) rule): Use $(GCJH) instead of hard-coded "gcjh".
+	* Makefile.in: Rebuilt.
+
 Tue Oct  9 23:26:19 2001  Anthony Green  <green@redhat.com>
 
 	* Makefile.am: Remove hack work-around for bug fixed by
diff -u -r rhug-clean/xalan/ChangeLog rhug/xalan/ChangeLog
--- rhug-clean/xalan/ChangeLog	Mon Oct  8 02:52:32 2001
+++ rhug/xalan/ChangeLog	Mon Feb  4 14:54:52 2002
@@ -1,3 +1,10 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am
+	(AM_GCJFLAGS): Use the proper flags instead of the user-flags.
+	($(JARFILE) rule): Use $(GCJH) instead of hard-coded "gcjh".
+	* Makefile.in: Rebuilt.
+
 Sun Oct  7 16:30:42 2001  Anthony Green  <green@redhat.com>
 
 	* Makefile.am: Fix bug in how core properties are named.
diff -u -r rhug-clean/xerces/ChangeLog rhug/xerces/ChangeLog
--- rhug-clean/xerces/ChangeLog	Tue Oct 23 09:46:49 2001
+++ rhug/xerces/ChangeLog	Mon Feb  4 14:55:23 2002
@@ -1,3 +1,11 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am
+	(AM_GCJFLAGS): Use the proper flags instead of the user-flags.
+	($(JARFILE) rule): Use $(GCJH) instead of hard-coded "gcjh".
+	(lib_org_apache_xerces_la_DEPENDENCIES): Use $(GCJ) instead of gcj.
+	* Makefile.in: Rebuilt.
+
 2001-10-22  Alexandre Petit-Bianco  <apbianco@redhat.com>
 
 	* Makefile.am (CLASSFILES): Fixed typo.

[-- Attachment #3: Type: TEXT/PLAIN, Size: 17757 bytes --]

diff -u -r rhug-clean/BCEL/Makefile.am rhug/BCEL/Makefile.am
--- rhug-clean/BCEL/Makefile.am	Fri Sep 14 04:02:46 2001
+++ rhug/BCEL/Makefile.am	Mon Feb  4 15:24:57 2002
@@ -659,7 +659,7 @@
 ## Compilers and compilation flags.
 ##
 
-GCJFLAGS = --encoding=8859_1 -fassume-compiled -fCLASSPATH=upstream:$(srcdir)/upstream:../gnu.regexp/upstream/src  -O2
+AM_GCJFLAGS = --encoding=8859_1 -fassume-compiled -fCLASSPATH=upstream:$(srcdir)/upstream:../gnu.regexp/upstream/src  -O2
 
 ## ################################################################
 
@@ -965,7 +965,7 @@
 CLASSFILES = $(lib_de_fub_bytecode_la_SOURCES:.java=.class)
 
 $(JARFILE): $(CLASSFILES)
-	(cd upstream; for x in `find ./ -name \*.class`; do gcjh `echo $$x | sed "s/\.\///g" | sed "s/\.class//g"`; done;)
+	(cd upstream; for x in `find ./ -name \*.class`; do $(GCJH) `echo $$x | sed "s/\.\///g" | sed "s/\.class//g"`; done;)
 	(cd upstream; jar cf ../$@ `find ./ -name \*.class`)
 
 ## Install the headers.  It is fairly ugly that we have to do this by
diff -u -r rhug-clean/BouncyCastle/Makefile.am rhug/BouncyCastle/Makefile.am
--- rhug-clean/BouncyCastle/Makefile.am	Sat Oct 20 00:20:02 2001
+++ rhug/BouncyCastle/Makefile.am	Tue Jan 22 16:13:45 2002
@@ -465,7 +465,7 @@
 BC_CLASSFILES = $(lib_org_bouncycastle_la_SOURCES:.java=.class)
 
 $(JARFILE): $(JAVAX_CLASSFILES) $(BC_CLASSFILES)
-	(cd upstream/src; for x in `find ./ -name \*.class`; do gcjh `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;)
+	(cd upstream/src; for x in `find ./ -name \*.class`; do $(GCJH) `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;)
 	(cd upstream/src; jar cf ../../$@ `find ./ -name \*.class`)
 
 ## Install the headers.  It is fairly ugly that we have to do this by
diff -u -r rhug-clean/bsf/Makefile.am rhug/bsf/Makefile.am
--- rhug-clean/bsf/Makefile.am	Fri Oct 12 10:31:19 2001
+++ rhug/bsf/Makefile.am	Mon Feb  4 15:25:13 2002
@@ -36,7 +36,7 @@
 ## Compilers and compilation flags.
 ##
 
-GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=upstream/src:../rhino/rhino-1.5R2.jar:../xalan/xalan-1.4.2.jar -O2
+AM_GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=upstream/src:../rhino/rhino-1.5R2.jar:../xalan/xalan-1.4.2.jar -O2
 
 ## ################################################################
 
@@ -138,7 +138,7 @@
 CLASSFILES = $(lib_com_ibm_bsf_la_SOURCES:.java=.class)
 
 $(JARFILE): $(CLASSFILES)
-	(cd upstream/src; for x in `find ./ -name \*.class`; do gcjh `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;)
+	(cd upstream/src; for x in `find ./ -name \*.class`; do $(GCJH) `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;)
 	(cd upstream/src; jar cf ../../$@ `find ./ -name \*.class`)
 	(here=`pwd`; cd $(srcdir)/upstream/src; jar uf $$here/$@ com/ibm/bsf/Languages.properties)
 
diff -u -r rhug-clean/configure.in rhug/configure.in
--- rhug-clean/configure.in	Wed Jan 30 22:37:55 2002
+++ rhug/configure.in	Thu Jan 31 15:51:11 2002
@@ -4,10 +4,21 @@
 
 AM_INIT_AUTOMAKE(rhug,1.0)
 
+AM_PROG_LIBTOOL
+
+# AM_PROG_GCJ isn't good enough, we have to roll our own.
+AC_CHECK_TOOL(GCJ, gcj)
+test -z "$GCJ" && AC_MSG_ERROR([no acceptable gcj found in \$PATH])
+if test "x${GCJFLAGS-unset}" = xunset; then
+   GCJFLAGS="-g -O2"
+fi
+AC_SUBST(GCJFLAGS)
+
+AC_CHECK_TOOL(GCJH, gcjh)
+test -z "$GCJH" && AC_MSG_ERROR([no acceptable gcjh found in \$PATH])
+
 _AM_DEPENDENCIES(GCJ)
 
-AC_PROG_LIBTOOL
-AM_PROG_GCJ
 AC_PROG_INSTALL
 AC_PROG_LN_S
 
diff -u -r rhug-clean/cup/Makefile.am rhug/cup/Makefile.am
--- rhug-clean/cup/Makefile.am	Sun Sep  2 11:08:20 2001
+++ rhug/cup/Makefile.am	Mon Feb  4 15:25:26 2002
@@ -87,7 +87,7 @@
 ## Compilers and compilation flags.
 ##
 
-GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=upstream:$(srcdir)/upstream -O2
+AM_GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=upstream:$(srcdir)/upstream -O2
 
 ## ################################################################
 
@@ -147,7 +147,7 @@
 CLASSFILES = $(lib_java_cup_runtime_la_SOURCES:.java=.class)
 
 $(JARFILE): $(CLASSFILES)
-	(cd upstream; for x in `find ./ -name \*.class`; do gcjh `echo $$x | sed "s/\.\///g" | sed "s/\.class//g"`; done;)
+	(cd upstream; for x in `find ./ -name \*.class`; do $(GCJH) `echo $$x | sed "s/\.\///g" | sed "s/\.class//g"`; done;)
 	(cd upstream; jar cf ../$@ `find ./ -name \*.class`)
 
 ## Install the headers.  It is fairly ugly that we have to do this by
diff -u -r rhug-clean/gnu.readline/Makefile.am rhug/gnu.readline/Makefile.am
--- rhug-clean/gnu.readline/Makefile.am	Fri Nov  9 07:29:55 2001
+++ rhug/gnu.readline/Makefile.am	Mon Feb  4 15:34:20 2002
@@ -27,7 +27,7 @@
 ## Compilers and compilation flags.
 ##
 
-GCJFLAGS = -fjni --encoding=8859_1 -fassume-compiled -fCLASSPATH=$(srcdir)/upstream/src -O2
+AM_GCJFLAGS = -fjni --encoding=8859_1 -fassume-compiled -fCLASSPATH=$(srcdir)/upstream/src -O2
 
 # The flags are preparing the native file to be compiled properly
 # JavaReadLine and JavaEditLine  should be set according to what
@@ -51,7 +51,7 @@
 # There's probably a cleaner generic way to handle this situation
 
 org_gnu_readline_Readline.h: $(lib_org_gnu_readline_la_DEPENDENCIES)
-	gcjh -jni `echo $(lib_org_gnu_readline_la_DEPENDENCIES) | sed 's/\.class//g'` -o $@
+	$(GCJH) -jni `echo $(lib_org_gnu_readline_la_DEPENDENCIES) | sed 's/\.class//g'` -o $@
 ./upstream/src/native/org_gnu_readline_Readline.c: org_gnu_readline_Readline.h
 
 # Building the tests
@@ -69,9 +69,8 @@
 	$(GCJ) -C --encoding=UTF-8 -fCLASSPATH=$(srcdir)/upstream/src -d upstream/src $<
 
 $(JARFILE): $(CLASSFILES)
-	(cd upstream/src; for x in `find ./ -name \*.class`; do gcjh `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;)
+	(cd upstream/src; for x in `find ./ -name \*.class`; do $(GCJH) `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;)
 	(cd upstream/src; jar cf ../../$@ `find ./ -name \*.class`)
-	(here=`pwd`; cd $(srcdir)/upstream/src; jar uf $$here/$@)
 
 MOSTLYCLEANFILES = $(JARFILE)
 
diff -u -r rhug-clean/gnu.regexp/Makefile.am rhug/gnu.regexp/Makefile.am
--- rhug-clean/gnu.regexp/Makefile.am	Fri Sep 14 04:04:12 2001
+++ rhug/gnu.regexp/Makefile.am	Mon Feb  4 15:26:32 2002
@@ -111,7 +111,7 @@
 ## Compilers and compilation flags.
 ##
 
-GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=upstream/src -O2
+AM_GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=upstream/src -O2
 
 ## ################################################################
 
@@ -150,7 +150,7 @@
 lib_gnu_regexp_la_DEPENDENCIES = props.o
 
 props.o: $(srcdir)/upstream/src/gnu/regexp/MessagesBundle.properties
-	gcj -fPIC -R gnu/regexp/MessagesBundle.properties -o props.o -c $<
+	$(GCJ) -fPIC -R gnu/regexp/MessagesBundle.properties -o props.o -c $<
 
 lib_gnu_regexp_la_LIBADD = props.o
 
@@ -168,7 +168,7 @@
 CLASSFILES = $(lib_gnu_regexp_la_SOURCES:.java=.class)
 
 $(JARFILE): $(CLASSFILES)
-	(cd upstream/src; for x in `find ./ -name \*.class`; do gcjh `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;)
+	(cd upstream/src; for x in `find ./ -name \*.class`; do $(GCJH) `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;)
 	(cd upstream/src; jar cf ../../$@ `find ./ -name \*.class`)
 	(here=`pwd`; cd $(srcdir)/upstream/src; jar uf $$here/$@ gnu/regexp/MessagesBundle.properties)
 
diff -u -r rhug-clean/jakarta-log4j/Makefile.am rhug/jakarta-log4j/Makefile.am
--- rhug-clean/jakarta-log4j/Makefile.am	Fri Sep 14 04:04:12 2001
+++ rhug/jakarta-log4j/Makefile.am	Mon Feb  4 15:27:03 2002
@@ -995,7 +995,7 @@
 ## Compilers and compilation flags.
 ##
 
-GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=$(srcdir)/upstream/src/java:$(srcdir)/../xerces/upstream/src -O2
+AM_GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=$(srcdir)/upstream/src/java:$(srcdir)/../xerces/upstream/src -O2
 
 ## ################################################################
 
diff -u -r rhug-clean/jakarta-oro/Makefile.am rhug/jakarta-oro/Makefile.am
--- rhug-clean/jakarta-oro/Makefile.am	Fri Oct 12 23:26:58 2001
+++ rhug/jakarta-oro/Makefile.am	Mon Feb  4 13:47:13 2002
@@ -207,7 +207,7 @@
 ## Compilers and compilation flags.
 ##
 
-GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=$(srcdir)/upstream/src/java -O2
+AM_GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=$(srcdir)/upstream/src/java -O2
 
 lib_org_apache_oro_la_SOURCES = \
 upstream/src/java/org/apache/oro/io/AwkFilenameFilter.java \
diff -u -r rhug-clean/jakarta-regexp/Makefile.am rhug/jakarta-regexp/Makefile.am
--- rhug-clean/jakarta-regexp/Makefile.am	Fri Sep 14 04:04:12 2001
+++ rhug/jakarta-regexp/Makefile.am	Mon Feb  4 15:27:14 2002
@@ -103,7 +103,7 @@
 ## Compilers and compilation flags.
 ##
 
-GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=$(srcdir)/upstream/src/java -O2
+AM_GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=$(srcdir)/upstream/src/java -O2
 
 ## ################################################################
 
@@ -144,6 +144,6 @@
 	$(LN_S) upstream/src/java/org org
 
 $(nobase_include_HEADERS): org upstream/jakarta-regexp-1.2.jar
-	gcjh -classpath $(srcdir)/upstream/jakarta-regexp-1.2.jar -d upstream/src/java $(@:.h=)
+	$(GCJH) -classpath $(srcdir)/upstream/jakarta-regexp-1.2.jar -d upstream/src/java $(@:.h=)
 
 CLEANFILES = org
diff -u -r rhug-clean/jakarta-servletapi/Makefile.am rhug/jakarta-servletapi/Makefile.am
--- rhug-clean/jakarta-servletapi/Makefile.am	Mon Sep 10 04:44:10 2001
+++ rhug/jakarta-servletapi/Makefile.am	Mon Feb  4 13:47:43 2002
@@ -86,7 +86,7 @@
 ## Compilers and compilation flags.
 ##
 
-GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=upstream/src/share -O2
+AM_GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=upstream/src/share -O2
 
 ## ################################################################
 
@@ -156,7 +156,7 @@
 CLASSFILES = $(lib_javax_servlet_la_SOURCES:.java=.class)
 
 $(JARFILE): $(CLASSFILES)
-	(cd upstream/src/share; for x in `find ./ -name \*.class`; do gcjh `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;)
+	(cd upstream/src/share; for x in `find ./ -name \*.class`; do $(GCJH) `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;)
 	(cd upstream/src/share; jar cf ../../../$@ `find ./ -name \*.class`)
 	(here=`pwd`; cd $(srcdir)/upstream/src/share; jar uf $$here/$@ javax/servlet/http/LocalStrings.properties javax/servlet/http/LocalStrings_es.properties javax/servlet/LocalStrings.properties)
 
diff -u -r rhug-clean/jakarta-tomcat/Makefile.am rhug/jakarta-tomcat/Makefile.am
--- rhug-clean/jakarta-tomcat/Makefile.am	Sun Sep  9 21:56:37 2001
+++ rhug/jakarta-tomcat/Makefile.am	Mon Feb  4 15:27:37 2002
@@ -894,7 +894,7 @@
 ## Compilers and compilation flags.
 ##
 
-GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=$(srcdir)/upstream/src/share:../jakarta-servletapi/upstream/src/share:../xerces/xerces-1.4.2.jar -O2
+AM_GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=$(srcdir)/upstream/src/share:../jakarta-servletapi/upstream/src/share:../xerces/xerces-1.4.2.jar -O2
 
 ## ################################################################
 
diff -u -r rhug-clean/jython/Makefile.am rhug/jython/Makefile.am
--- rhug-clean/jython/Makefile.am	Thu Oct 25 08:30:32 2001
+++ rhug/jython/Makefile.am	Mon Feb  4 15:25:37 2002
@@ -44,7 +44,7 @@
 ##
 
 GCJFLAGS_BASIC = --encoding=8859_1 -fassume-compiled -fCLASSPATH=$(srcdir)/upstream/src:$(srcdir)/../gnu.readline/upstream/src:$(srcdir)/../jakarta-servletapi/upstream/src/share:$(srcdir)/../jakarta-oro/upstream/src/java
-GCJFLAGS = $(GCJFLAGS_BASIC) -O2
+AM_GCJFLAGS = $(GCJFLAGS_BASIC) -O2
 
 lib_org_jython_la_SOURCES = \
 upstream/src/Lib/jxxload_help/DiscardHelp.java \
diff -u -r rhug-clean/pgsql-jdbc/Makefile.am rhug/pgsql-jdbc/Makefile.am
--- rhug-clean/pgsql-jdbc/Makefile.am	Wed Oct 10 09:22:54 2001
+++ rhug/pgsql-jdbc/Makefile.am	Mon Feb  4 13:48:52 2002
@@ -30,7 +30,7 @@
 ## Compilers and compilation flags.
 ##
 
-GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=upstream -O2
+AM_GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=upstream -O2
 
 ## ################################################################
 
@@ -91,7 +91,7 @@
 CLASSFILES = $(lib_org_postgresql_la_SOURCES:.java=.class)
 
 $(JARFILE): $(CLASSFILES)
-	(cd upstream; for x in `find ./ -name \*.class`; do gcjh `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;)
+	(cd upstream; for x in `find ./ -name \*.class`; do $(GCJH) `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;)
 	(cd upstream; jar cf ../$@ `find ./ -name \*.class`)
 
 ## Install the headers.  It is fairly ugly that we have to do this by
diff -u -r rhug-clean/rhino/Makefile.am rhug/rhino/Makefile.am
--- rhug-clean/rhino/Makefile.am	Sat Oct 20 20:08:19 2001
+++ rhug/rhino/Makefile.am	Mon Feb  4 15:26:21 2002
@@ -32,7 +32,7 @@
 ## Compilers and compilation flags.
 ##
 
-GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=upstream/src:$(srcdir)/upstream/toolsrc:$(srcdir)/../gnu.readline/upstream/src -O2
+AM_GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=upstream/src:$(srcdir)/upstream/toolsrc:$(srcdir)/../gnu.readline/upstream/src -O2
 
 ## ################################################################
 
@@ -190,7 +190,7 @@
 CLASSFILES = $(lib_org_mozilla_la_SOURCES:.java=.class)
 
 $(JARFILE): $(CLASSFILES)
-	(cd upstream/src; for x in `find ./ -name \*.class`; do gcjh `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;)
+	(cd upstream/src; for x in `find ./ -name \*.class`; do $(GCJH) `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;)
 	(cd upstream/src; jar cf ../../$@ `find ./ -name \*.class`)
 	(here=`pwd`; cd $(srcdir)/upstream/src; jar uf $$here/$@ org/mozilla/javascript/resources/Messages.properties org/mozilla/javascript/resources/Security.properties)
 
diff -u -r rhug-clean/xalan/Makefile.am rhug/xalan/Makefile.am
--- rhug-clean/xalan/Makefile.am	Mon Oct  8 02:52:30 2001
+++ rhug/xalan/Makefile.am	Mon Feb  4 15:27:26 2002
@@ -34,7 +34,7 @@
 
 CLASSPATH = -fCLASSPATH=upstream/src:../xerces/upstream/src:../BCEL/upstream:../cup/upstream:$(srcdir)/upstream/src
 
-GCJFLAGS = --encoding=8859_1 -fassume-compiled $(CLASSPATH) -O2
+AM_GCJFLAGS = --encoding=8859_1 -fassume-compiled $(CLASSPATH) -O2
 
 ## ################################################################
 
@@ -754,7 +754,7 @@
 $(lib_org_apache_xpath_la_SOURCES:.java=.class)
 
 $(JARFILE): $(CLASSFILES)
-	(cd upstream/src; for x in `find ./ -name \*.class`; do gcjh `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;)
+	(cd upstream/src; for x in `find ./ -name \*.class`; do $(GCJH) `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;)
 	(cd upstream/src; jar cf ../../$@ `find ./ -name \*.class`)
 
 ## Install the headers.  It is fairly ugly that we have to do this by
diff -u -r rhug-clean/xerces/Makefile.am rhug/xerces/Makefile.am
--- rhug-clean/xerces/Makefile.am	Tue Oct 23 09:46:49 2001
+++ rhug/xerces/Makefile.am	Mon Feb  4 15:38:48 2002
@@ -671,7 +671,7 @@
 ## Compilers and compilation flags.
 ##
 
-GCJFLAGS = --encoding=8859_1 -fassume-compiled -O2
+AM_GCJFLAGS = --encoding=8859_1 -fassume-compiled -O2
 
 LIBCLASSPATH = -fCLASSPATH=upstream/src:$(srcdir)/upstream/src -O2
 
@@ -681,7 +681,7 @@
 lib_org_apache_xml_serialize_la_GCJFLAGS = $(LIBCLASSPATH)
 lib_org_w3c_dom_html_la_GCJFLAGS = $(LIBCLASSPATH)
 lib_org_w3c_dom_events_la_GCJFLAGS = $(LIBCLASSPATH)
-lib_org_apache_xerces_la_GCJFLAGS = $(LIBCLASSPATH)
+lib_org_apache_xerces_la_GCJFLAGS = $(LIBCLASSPATH) -save-temps -dp -v
 
 ## ################################################################
 
@@ -842,13 +842,13 @@
 lib_org_apache_xerces_la_DEPENDENCIES = mprops.o mprops_fr.o mprops_ja.o lib-javax-xml-parsers.la lib-org-w3c-dom-html.la lib-org-w3c-dom-events.la
 
 mprops.o: upstream/src/org/apache/xerces/utils/regex/message.properties
-	gcj -fPIC -R org/apache/xerces/utils/regex/message.properties -o $@ -c $<
+	$(GCJ) -fPIC -R org/apache/xerces/utils/regex/message.properties -o $@ -c $<
 
 mprops_fr.o: upstream/src/org/apache/xerces/utils/regex/message_fr.properties
-	gcj -fPIC -R org/apache/xerces/utils/regex/message_fr.properties -o $@ -c $<
+	$(GCJ) -fPIC -R org/apache/xerces/utils/regex/message_fr.properties -o $@ -c $<
 
 mprops_ja.o: upstream/src/org/apache/xerces/utils/regex/message_ja.properties
-	gcj -fPIC -R org/apache/xerces/utils/regex/message_ja.properties -o $@ -c $<
+	$(GCJ) -fPIC -R org/apache/xerces/utils/regex/message_ja.properties -o $@ -c $<
 
 lib_org_apache_xerces_la_LIBADD = mprops.o mprops_fr.o mprops_ja.o -L. -l-javax-xml-parsers -l-org-w3c-dom-html -l-org-w3c-dom-events
 
@@ -1150,7 +1150,7 @@
 CLASSFILES = $(lib_javax_xml_parsers_la_SOURCES:.java=.class) $(lib_org_apache_html_la_SOURCES:.java=.class) $(lib_org_apache_wml_la_SOURCES:.java=.class) $(lib_org_apache_xerces_la_SOURCES:.java=.class) $(lib_org_apache_xml_serialize_la_SOURCES:.java=.class) $(lib_org_w3c_dom_events_la_SOURCES:.java=.class) $(lib_org_w3c_dom_html_la_SOURCES:.java=.class)
 
 $(JARFILE): $(CLASSFILES)
-	(cd upstream/src; for x in `find ./ -name \*.class`; do gcjh `echo $$x | sed "s/\.\///g" | sed "s/\.class//g"`; done;)
+	(cd upstream/src; for x in `find ./ -name \*.class`; do $(GCJH) `echo $$x | sed "s/\.\///g" | sed "s/\.class//g"`; done;)
 	(cd upstream/src; jar cf ../../$@ `find ./ -name \*.class`)
 
 ## Install the headers.  It is fairly ugly that we have to do this by