Commit 165d9b9c by Mohan Embar Committed by Mohan Embar

Makefile.am: Fixed problems with parallel makes.

	* 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

From-SVN: r70900
parent a1652802
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> 2003-08-28 Tom Tromey <tromey@redhat.com>
* Makefile.in: Rebuilt. * Makefile.in: Rebuilt.
......
...@@ -337,6 +337,8 @@ all_java_source_files = \ ...@@ -337,6 +337,8 @@ all_java_source_files = \
$(gtk_awt_peer_sources) \ $(gtk_awt_peer_sources) \
$(x_java_source_files) $(x_java_source_files)
all_java_class_files = $(all_java_source_files:.java=.class)
libgcj-@gcc_version@.jar: $(all_java_source_files) libgcj-@gcc_version@.jar: $(all_java_source_files)
-@rm -f libgcj-@gcc_version@.jar -@rm -f libgcj-@gcc_version@.jar
@echo Compiling Java sourcefiles... @echo Compiling Java sourcefiles...
...@@ -347,6 +349,13 @@ libgcj-@gcc_version@.jar: $(all_java_source_files) ...@@ -347,6 +349,13 @@ libgcj-@gcc_version@.jar: $(all_java_source_files)
sed -e '/\/\./d' -e '/\/xlib/d' | \ sed -e '/\/\./d' -e '/\/xlib/d' | \
$(ZIP) cfM0E@ $@ $(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) MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files) $(x_javao_files) $(x_nat_files) $(x_nat_headers)
CLEANFILES = libgcj-@gcc_version@.jar CLEANFILES = libgcj-@gcc_version@.jar
......
...@@ -427,6 +427,8 @@ all_java_source_files = \ ...@@ -427,6 +427,8 @@ all_java_source_files = \
$(x_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) MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files) $(x_javao_files) $(x_nat_files) $(x_nat_headers)
CLEANFILES = libgcj-@gcc_version@.jar CLEANFILES = libgcj-@gcc_version@.jar
...@@ -4873,6 +4875,13 @@ libgcj-@gcc_version@.jar: $(all_java_source_files) ...@@ -4873,6 +4875,13 @@ libgcj-@gcc_version@.jar: $(all_java_source_files)
sed -e '/\/\./d' -e '/\/xlib/d' | \ sed -e '/\/\./d' -e '/\/xlib/d' | \
$(ZIP) cfM0E@ $@ $(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: clean-local:
find . -name '*.class' -print | xargs rm -f find . -name '*.class' -print | xargs rm -f
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment