Hi, On Thu, 2005-07-07 at 22:25 +0200, Mark Wielaard wrote: > On Wed, 2005-07-06 at 15:59 -0600, Tom Tromey wrote: > > >>>>> "Tom" == Tom Tromey <[EMAIL PROTECTED]> writes: > > > > Tom> This patch adds real dependency tracking when compiling with gcj. > > > > I am checking this in. > > This seems to break builddir != srcdir (and make distcheck).
Found it.
2005-07-08 Mark Wielaard <[EMAIL PROTECTED]>
* lib/Makefile.am (FOUND_GCJ): Add top_builddir to compile_classpath.
(EXTRA_DIST): Add Makefile.gcj and split-for-gcj.sh
(clean-local:): Remove lists and Makefile.deps.
This works for builddir == srcdir, builddir != srcdir and for both gcj
4.0 and gcj 3.x.
When you change the build infrastructure please do a make distcheck.
That will find a lot of potential problems.
Committed,
Mark
Index: lib/Makefile.am =================================================================== RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v retrieving revision 1.91 diff -u -r1.91 Makefile.am --- lib/Makefile.am 6 Jul 2005 22:12:18 -0000 1.91 +++ lib/Makefile.am 8 Jul 2005 11:07:58 -0000 @@ -13,8 +13,10 @@ # handling source to bytecode compiler programs like gcj, jikes and kjc if FOUND_GCJ +# Since we don't feed all classes at once gcj needs to know where to find +# the generated classes (in top_builddir). JAVAC = $(srcdir)/split-for-gcj.sh && $(MAKE) -f $(srcdir)/Makefile.gcj \ - GCJ='$(GCJ)' compile_classpath='$(compile_classpath)' + GCJ='$(GCJ)' compile_classpath='$(top_builddir):$(compile_classpath)' else if FOUND_JIKES JAVAC = $(JIKES) +Pno-shadow +Pno-switchcheck +F $(JIKESENCODING) -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(compile_classpath) -d . @classes @@ -116,7 +118,7 @@ $(JAVAC) touch compile-classes -EXTRA_DIST = standard.omit mkcollections.pl.in +EXTRA_DIST = standard.omit mkcollections.pl.in Makefile.gcj split-for-gcj.sh CLEANFILES = compile-classes resources classes \ classes.standard classes.awt classes.standardx classes.xml \ glibj.zip classes.1 \ @@ -129,6 +131,8 @@ -rm -rf javax -rm -rf org -rm -rf META-INF + -rm -rf lists + -rm -f Makefile.deps dist-hook: mkdir -p $(distdir)
signature.asc
Description: This is a digitally signed message part
_______________________________________________ Classpath-patches mailing list [email protected] http://lists.gnu.org/mailman/listinfo/classpath-patches
