summaryrefslogtreecommitdiff
path: root/libjava/Makefile.am
diff options
context:
space:
mode:
authorfitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4>2005-02-23 01:05:46 +0000
committerfitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4>2005-02-23 01:05:46 +0000
commit5d10514f4d8b6639781f64708fcb2a8b9cfc2068 (patch)
tree881c7e167023419a113c96509d6a7ec7af4ae71f /libjava/Makefile.am
parent8534aa70da8ca3ee7f2d763d5d9ad7cf4e167eee (diff)
downloadgcc-5d10514f4d8b6639781f64708fcb2a8b9cfc2068.tar.gz
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@95428 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/Makefile.am')
-rw-r--r--libjava/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index ed24da3ae0a..14edb061c24 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