From 632e46babf41c56892575990dd898150fc772671 Mon Sep 17 00:00:00 2001 From: fitzsim Date: Mon, 14 Feb 2005 21:08:08 +0000 Subject: 2005-02-14 Thomas Fitzsimmons * jawt.c: New file. * include/jawt.h: Likewise. * include/jawt_md.h: Likewise. * include/Makefile.am (tool_include__HEADERS): Add jawt.h and jawt_md.h files. * include/Makefile.in: Regenerate. * jni/classpath/classpath_jawt.h: Likewise. * jni/gtk-peer/gtk_jawt.c: Likewise. * Makefile.am: Build libjawt.so. * Makefile.in: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@95047 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/Makefile.am | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'libjava/Makefile.am') diff --git a/libjava/Makefile.am b/libjava/Makefile.am index ba40f654675..249388eabde 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -102,12 +102,14 @@ endif if GTK_AWT cond_gtk_ltlibrary = lib-gnu-java-awt-peer-gtk.la +cond_gtk_jawt_ltlibrary = libjawt.la else cond_gtk_ltlibrary = +cond_gtk_jawt_ltlibrary = endif toolexeclib_LTLIBRARIES = libgcj.la libgij.la \ - $(cond_gtk_ltlibrary) $(cond_xlib_ltlibrary) + $(cond_gtk_ltlibrary) $(cond_gtk_jawt_ltlibrary) $(cond_xlib_ltlibrary) toolexecmainlib_DATA = libgcj.spec pkgconfigdir = $(libdir)/pkgconfig @@ -290,6 +292,7 @@ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c \ jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c \ jni/gtk-peer/gthread-jni.c \ +jni/gtk-peer/gtk_jawt.c \ jni/classpath/jcl.c \ jni/classpath/jnilink.c \ jni/classpath/native_state.c \ @@ -460,6 +463,14 @@ lib_gnu_java_awt_peer_gtk_la_LDFLAGS = \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) lib_gnu_java_awt_peer_gtk_la_LINK = $(LIBLINK) +libjawt_la_SOURCES = jawt.c +libjawt_la_CFLAGS = -I$(srcdir)/jni/classpath $(PEDANTIC_CFLAGS) $(X_CFLAGS) +libjawt_la_LIBADD = lib-gnu-java-awt-peer-gtk.la +libjawt_la_LDFLAGS = \ + -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ + $(LIBGCJ_LD_SYMBOLIC) +libjawt_la_LINK = $(LIBLINK) + lib_gnu_awt_xlib_la_SOURCES = \ $(xlib_java_source_files) \ $(xlib_nat_source_files) -- cgit v1.2.3