diff options
| author | membar <membar@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-08-29 03:11:02 +0000 |
|---|---|---|
| committer | membar <membar@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-08-29 03:11:02 +0000 |
| commit | 78aed12fee6d6c9aa6590afa4aab00c2926c22ed (patch) | |
| tree | 463e3a2bbce362f374899983502c2d7cc52dd520 /libjava | |
| parent | 338c7b53c3747c9e669cfe0d373d42b78b1496c9 (diff) | |
| download | ppe42-gcc-78aed12fee6d6c9aa6590afa4aab00c2926c22ed.tar.gz ppe42-gcc-78aed12fee6d6c9aa6590afa4aab00c2926c22ed.zip | |
* Makefile.am: Fixed problems with parallel makes.
(all_java_class_files): Readded definition.
(all_java_class_files): New target which depends on
libgcj-@gcc_version@.jar
* Makefile.in: Rebuilt
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@70900 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 8 | ||||
| -rw-r--r-- | libjava/Makefile.am | 9 | ||||
| -rw-r--r-- | libjava/Makefile.in | 9 |
3 files changed, 26 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 178a2aa1291..aa3efab1eea 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +2003-08-28 Mohan Embar <gnustuff@thisiscool.com> + + * Makefile.am: Fixed problems with parallel makes. + (all_java_class_files): Readded definition. + (all_java_class_files): New target which depends on + libgcj-@gcc_version@.jar + * Makefile.in: Rebuilt + 2003-08-28 Tom Tromey <tromey@redhat.com> * Makefile.in: Rebuilt. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 4329340972d..f95e5fc02a0 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -337,6 +337,8 @@ all_java_source_files = \ $(gtk_awt_peer_sources) \ $(x_java_source_files) +all_java_class_files = $(all_java_source_files:.java=.class) + libgcj-@gcc_version@.jar: $(all_java_source_files) -@rm -f libgcj-@gcc_version@.jar @echo Compiling Java sourcefiles... @@ -347,6 +349,13 @@ libgcj-@gcc_version@.jar: $(all_java_source_files) sed -e '/\/\./d' -e '/\/xlib/d' | \ $(ZIP) cfM0E@ $@ +# This next rule seems backward, but reflects the fact +# that 1) all classfiles are compiled in one go when the +# libgcj jarfile is built and 2) anything which depends +# on a particular .class file must wait until the jarfile +# is built. +$(all_java_class_files): libgcj-@gcc_version@.jar + MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files) $(x_javao_files) $(x_nat_files) $(x_nat_headers) CLEANFILES = libgcj-@gcc_version@.jar diff --git a/libjava/Makefile.in b/libjava/Makefile.in index df65652ee21..4f00d8b1f09 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -427,6 +427,8 @@ all_java_source_files = \ $(x_java_source_files) +all_java_class_files = $(all_java_source_files:.java=.class) + MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files) $(x_javao_files) $(x_nat_files) $(x_nat_headers) CLEANFILES = libgcj-@gcc_version@.jar @@ -4873,6 +4875,13 @@ libgcj-@gcc_version@.jar: $(all_java_source_files) sed -e '/\/\./d' -e '/\/xlib/d' | \ $(ZIP) cfM0E@ $@ +# This next rule seems backward, but reflects the fact +# that 1) all classfiles are compiled in one go when the +# libgcj jarfile is built and 2) anything which depends +# on a particular .class file must wait until the jarfile +# is built. +$(all_java_class_files): libgcj-@gcc_version@.jar + clean-local: find . -name '*.class' -print | xargs rm -f |
