diff options
| author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2005-02-23 01:05:46 +0000 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@gcc.gnu.org> | 2005-02-23 01:05:46 +0000 |
| commit | 3f8dfdd4dff477332819e8050733ddc3c66740c0 (patch) | |
| tree | 881c7e167023419a113c96509d6a7ec7af4ae71f /libjava/Makefile.am | |
| parent | 732272ca15e24af9f85739c99c25a302947895f4 (diff) | |
| download | gcc-3f8dfdd4dff477332819e8050733ddc3c66740c0.zip gcc-3f8dfdd4dff477332819e8050733ddc3c66740c0.tar.gz gcc-3f8dfdd4dff477332819e8050733ddc3c66740c0.tar.bz2 | |
re PR awt/20029 (Robot needs XTest)
2005-02-22 Thomas Fitzsimmons <fitzsim@redhat.com>
PR libgcj/20029:
* Makefile.am (lib_gnu_java_awt_peer_gtk_la_CFLAGS): Add X_CFLAGS.
(lib_gnu_java_awt_peer_gtk_la_LDFLAGS): Add X_LIBS and -lXtst.
* Makefile.in: Regenerate.
* configure.ac: Check for libXtst.
* configure: Regenerate.
From-SVN: r95428
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index ed24da3..14edb06 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -456,13 +456,13 @@ jni/classpath/primlib.h lib_gnu_java_awt_peer_gtk_la_CFLAGS = \ -Ijniinclude -I$(srcdir)/jni/classpath \ -I$(srcdir)/jni/gtk-peer $(PEDANTIC_CFLAGS) $(GTK_CFLAGS) $(LIBART_CFLAGS) \ - $(CAIRO_CFLAGS) $(PANGOFT2_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 ## 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) + -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) $(X_LIBS) -lXtst lib_gnu_java_awt_peer_gtk_la_LINK = $(LIBLINK) libjawt_la_SOURCES = jawt.c |