diff options
| author | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-05-12 23:45:17 +0000 |
|---|---|---|
| committer | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-05-12 23:45:17 +0000 |
| commit | 415e5fd7fbd9d33a813df3ea90940c957de58f6a (patch) | |
| tree | f92093d67640ea0bc7bebf02be7e2aed4fc36d73 /libjava/Makefile.am | |
| parent | bfbfacd5b9e44d43aee7f5e9caeb94e1a1a365e0 (diff) | |
| download | ppe42-gcc-415e5fd7fbd9d33a813df3ea90940c957de58f6a.tar.gz ppe42-gcc-415e5fd7fbd9d33a813df3ea90940c957de58f6a.zip | |
2005-05-12 Thomas Fitzsimmons <fitzsim@redhat.com>
* Makefile.am (cond_gtk_gcjawt_ltlibrary): Rename libjawt.la
libgcjawt.la.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@99636 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index a17f7cce2bf..be1affd0fce 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -105,14 +105,14 @@ endif if GTK_AWT cond_gtk_ltlibrary = lib-gnu-java-awt-peer-gtk.la -cond_gtk_jawt_ltlibrary = libjawt.la +cond_gtk_gcjawt_ltlibrary = libgcjawt.la else cond_gtk_ltlibrary = -cond_gtk_jawt_ltlibrary = +cond_gtk_gcjawt_ltlibrary = endif toolexeclib_LTLIBRARIES = libgcj.la libgij.la \ - $(cond_gtk_ltlibrary) $(cond_gtk_jawt_ltlibrary) $(cond_xlib_ltlibrary) + $(cond_gtk_ltlibrary) $(cond_gtk_gcjawt_ltlibrary) $(cond_xlib_ltlibrary) toolexecmainlib_DATA = libgcj.spec pkgconfigdir = $(libdir)/pkgconfig @@ -501,14 +501,14 @@ lib_gnu_java_awt_peer_gtk_la_LDFLAGS = \ -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 -libjawt_la_CFLAGS = -I$(srcdir)/jni/classpath $(PEDANTIC_CFLAGS) $(X_CFLAGS) +libgcjawt_la_SOURCES = jawt.c +libgcjawt_la_CFLAGS = -I$(srcdir)/jni/classpath $(PEDANTIC_CFLAGS) $(X_CFLAGS) ## See jv_convert_LDADD. -libjawt_la_LIBADD = -L$(here)/.libs lib-gnu-java-awt-peer-gtk.la -libjawt_la_LDFLAGS = \ +libgcjawt_la_LIBADD = -L$(here)/.libs lib-gnu-java-awt-peer-gtk.la +libgcjawt_la_LDFLAGS = \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ $(LIBGCJ_LD_SYMBOLIC) -libjawt_la_LINK = $(LIBLINK) +libgcjawt_la_LINK = $(LIBLINK) lib_gnu_awt_xlib_la_SOURCES = \ $(xlib_java_source_files) \ |
