diff options
Diffstat (limited to 'libjava/classpath/native/jawt/Makefile.am')
-rw-r--r-- | libjava/classpath/native/jawt/Makefile.am | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/libjava/classpath/native/jawt/Makefile.am b/libjava/classpath/native/jawt/Makefile.am index eae2181..01abf3b 100644 --- a/libjava/classpath/native/jawt/Makefile.am +++ b/libjava/classpath/native/jawt/Makefile.am @@ -1,20 +1,12 @@ -## GCJ LOCAL: install this library in GCJ's versioned library -## directory -gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER) -gcjversionedlibdir = $(libdir)/gcj-$(gcc_version) -gcjversionedlib_LTLIBRARIES = libjawt.la +nativeexeclib_LTLIBRARIES = libjawt.la libjawt_la_SOURCES = jawt.c libjawt_la_LIBADD = $(top_builddir)/native/jni/gtk-peer/libgtkpeer.la -## GCJ LOCAL: encode the library path and use GCJ's library version -libjawt_la_LDFLAGS = -rpath $(gcjversionedlibdir) \ - -version-info `grep -v '^\#' $(top_srcdir)/../libtool-version` - -AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @CAIRO_LIBS@ @PANGOFT2_LIBS@ @X_LIBS@ -lXtst +AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @PANGOFT2_LIBS@ @X_LIBS@ @XTEST_LIBS@ AM_CPPFLAGS = @CLASSPATH_INCLUDES@ # Just the WARNING_CFLAGS. We cannot use the strict flags since the gtk # headers contain broken prototypes (by design, see gtkitemfactory.h). AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ \ - @GTK_CFLAGS@ @CAIRO_CFLAGS@ @PANGOFT2_CFLAGS@ + @GTK_CFLAGS@ @PANGOFT2_CFLAGS@ |