summaryrefslogtreecommitdiff
path: root/libjava/Makefile.am
diff options
context:
space:
mode:
authorfitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4>2005-03-17 00:59:33 +0000
committerfitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4>2005-03-17 00:59:33 +0000
commit973f878a6193cf4d1dad6a7f75f11fff5348cc4f (patch)
tree4673858cfb2dbae723cc71ed309c9d9a2748e9b4 /libjava/Makefile.am
parent8505931ad7cc2928b51f2b39556faf1cf10f1498 (diff)
downloadgcc-973f878a6193cf4d1dad6a7f75f11fff5348cc4f.tar.gz
2005-03-16 Thomas Fitzsimmons <fitzsim@redhat.com>
* Makefile.am (gtk_c_source_files): Remove jni/classpath/jcl.c, jni/classpath/jnilink.c, jni/classpath/primlib.c. (lib_gnu_java_awt_peer_gtk_la_SOURCES): jni/classpath/jcl.h, jni/classpath/jnilink.h, jni/classpath/primlib.h. * Makefile.in: Regenerate. * aclocal.m4: Regenerate. * external/Makefile.in: Regenerate. * external/sax/Makefile.in: Regenerate. * external/w3c_dom/Makefile.in: Regenerate. * gcj/Makefile.in: Regenerate. * include/Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. * jni/classpath/jcl.h: Remove. * jni/classpath/jcl.c: Likewise. * jni/classpath/jnilink.h: Remove. * jni/classpath/jnilink.c: Likewise. * jni/classpath/primlib.h: Remove. * jni/classpath/primlib.c: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96590 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/Makefile.am')
-rw-r--r--libjava/Makefile.am12
1 files changed, 3 insertions, 9 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 41a262e1d01..a4fd81038fb 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -257,7 +257,7 @@ libgcj_la_LIBADD = \
$(LIBFFI) $(ZLIBS) $(GCLIBS) $(propertyo_files)
libgcj_la_DEPENDENCIES = libgcj-@gcc_version@.jar \
java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h \
- $(libgcj_la_LIBADD)
+ $(LIBLTDL) $(libgcj_la_LIBADD)
libgcj_la_LINK = $(LIBLINK)
@@ -320,10 +320,7 @@ 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 \
-jni/classpath/primlib.c
+jni/classpath/native_state.c
## Java sources for Gtk peers.
gtk_awt_peer_sources = \
@@ -469,10 +466,7 @@ $(gtk_awt_peer_sources) \
$(gtk_c_source_files) \
jni/gtk-peer/gthread-jni.h \
jni/gtk-peer/gtkpeer.h \
-jni/classpath/jcl.h \
-jni/classpath/jnilink.h \
-jni/classpath/native_state.h \
-jni/classpath/primlib.h
+jni/classpath/native_state.h
lib_gnu_java_awt_peer_gtk_la_CFLAGS = \
-Ijniinclude -I$(srcdir)/jni/classpath \