diff options
| author | Tom Tromey <tromey@redhat.com> | 2005-04-05 21:11:49 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2005-04-05 21:11:49 +0000 |
| commit | 3078e92940f084a2cdd51ca556d291680594b3e5 (patch) | |
| tree | af47e598c013b1725e462dae6ce0209b52df0702 /libjava/Makefile.am | |
| parent | dbb9a00fc97c26d5c3237ce456a4dfbec5ffef10 (diff) | |
| download | gcc-3078e92940f084a2cdd51ca556d291680594b3e5.tar.gz gcc-3078e92940f084a2cdd51ca556d291680594b3e5.tar.bz2 gcc-3078e92940f084a2cdd51ca556d291680594b3e5.zip | |
Makefile.in: Rebuilt.
* Makefile.in: Rebuilt.
* Makefile.am (lib_gnu_java_awt_peer_gtk_la_SOURCES): Removed
gtk_awt_peer_sources.
(lib_gnu_java_awt_peer_gtk_la_LIBADD): Added gtk-awt-peer.lo.
(lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES): Likewise.
($(gtk_awt_peer_sources:.java=.lo)): Removed.
(gtk-awt-peer.lo): New target.
From-SVN: r97656
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 7afbe199eb9..4368cddc8da 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -474,7 +474,6 @@ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.lo: $(top_builddir)/jniinclude/ $(lib_gnu_java_awt_peer_gtk_la_OBJECTS): $(lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES) lib_gnu_java_awt_peer_gtk_la_SOURCES = \ -$(gtk_awt_peer_sources) \ $(gtk_c_source_files) \ jni/gtk-peer/gthread-jni.h \ jni/gtk-peer/gtkpeer.h \ @@ -485,8 +484,8 @@ lib_gnu_java_awt_peer_gtk_la_CFLAGS = \ -I$(srcdir)/jni/gtk-peer $(PEDANTIC_CFLAGS) $(GTK_CFLAGS) $(LIBART_CFLAGS) \ $(X_CFLAGS) $(CAIRO_CFLAGS) $(PANGOFT2_CFLAGS) lib_gnu_java_awt_peer_gtk_la_GCJFLAGS = $(AM_GCJFLAGS) -fjni -lib_gnu_java_awt_peer_gtk_la_LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(LIBART_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS) -lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES = $(gtk_jni_headers) libgcj-$(gcc_version).jar libgcj.la libgcj.spec +lib_gnu_java_awt_peer_gtk_la_LIBADD = gtk-awt-peer.lo $(GTK_LIBS) $(GLIB_LIBS) $(LIBART_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS) +lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES = gtk-awt-peer.lo $(gtk_jni_headers) libgcj-$(gcc_version).jar libgcj.la libgcj.spec ## The mysterious backslash in the grep pattern is consumed by make. lib_gnu_java_awt_peer_gtk_la_LDFLAGS = \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) $(X_LIBS) -lXtst @@ -622,9 +621,6 @@ SUFFIXES = .class .java .h .properties $(javao_files) $(xlib_javao_files): %.lo: %.java $(LTGCJCOMPILE) -o $@ -c $< -$(gtk_awt_peer_sources:.java=.lo): %.lo: %.java - $(LTGCJCOMPILE) -fjni -o $@ -c $< - ## Pass the list of object files to libtool in a temporary file to ## avoid tripping platform command line length limits. libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES) @@ -692,6 +688,17 @@ gnu-java-beans.lo: $(gnu_java_beans_source_files) $(LTGCJCOMPILE) -findirect-dispatch -c -o gnu-java-beans.lo \ `find gnu/java/beans -name '*.class' -print` +## Depend on the sources, even though we are going to compile the +## classes. +gtk-awt-peer.lo: $(gtk_awt_peer_sources) +## FIXME: this is ugly. We want to make sure the .class files have +## been built, but we don't want a real dependency on them as this +## would cause our target to be rebuilt whenever any .java file is +## touched. + $(MAKE) classes.stamp + $(LTGCJCOMPILE) -findirect-dispatch -fjni -c -o gtk-awt-peer.lo \ + `find gnu/java/awt/peer/gtk -name '*.class' -print` + ## ################################################################ ## |