summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2004-06-20 12:33:46 +0000
committerMark Wielaard <mark@klomp.org>2004-06-20 12:33:46 +0000
commitc55ce199a91adb8249e0b176b7adc23a061e168d (patch)
tree5416911157ca5fbc8444652d37edc101fcadd6ab
parent009a0e1bc2b321f624e07593a29acf382049fac5 (diff)
downloadclasspath-c55ce199a91adb8249e0b176b7adc23a061e168d.tar.gz
* native/jni/gtk-peer/Makefile.am (EXTRA_DIST): Add
gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h. (libgtkpeer_la_SOURCES): Add gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c. * gnu/java/awt/peer/gtk/Makefile.am (EXTRA_DIST): Add GThreadNativeMethodRunner.java and GThreadMutex.java
-rw-r--r--ChangeLog9
-rw-r--r--gnu/java/awt/peer/gtk/Makefile.am4
-rw-r--r--native/jni/gtk-peer/Makefile.am5
3 files changed, 17 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 08084933d..52ad0942b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-06-20 Mark Wielaard <mark@klomp.org>
+
+ * native/jni/gtk-peer/Makefile.am (EXTRA_DIST): Add
+ gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h.
+ (libgtkpeer_la_SOURCES): Add
+ gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c.
+ * gnu/java/awt/peer/gtk/Makefile.am (EXTRA_DIST): Add
+ GThreadNativeMethodRunner.java and GThreadMutex.java
+
2004-06-18 Steven Augart <augart@watson.ibm.com>
* configure.ac: Complain if user types --enable-gtk-peers.
diff --git a/gnu/java/awt/peer/gtk/Makefile.am b/gnu/java/awt/peer/gtk/Makefile.am
index 98a69fc46..d8b484348 100644
--- a/gnu/java/awt/peer/gtk/Makefile.am
+++ b/gnu/java/awt/peer/gtk/Makefile.am
@@ -44,4 +44,6 @@ EXTRA_DIST = \
GtkTextComponentPeer.java \
GtkTextFieldPeer.java \
GtkToolkit.java \
- GtkWindowPeer.java
+ GtkWindowPeer.java \
+ GThreadNativeMethodRunner.java \
+ GThreadMutex.java
diff --git a/native/jni/gtk-peer/Makefile.am b/native/jni/gtk-peer/Makefile.am
index 2c36da399..2fad9bf8c 100644
--- a/native/jni/gtk-peer/Makefile.am
+++ b/native/jni/gtk-peer/Makefile.am
@@ -1,5 +1,9 @@
pkglib_LTLIBRARIES = libgtkpeer.la
+# For now we include generated .h files. When javah versions have less bugs
+# we can add rules to just generate them during the build.
+EXTRA_DIST = gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h
+
libgtkpeer_la_SOURCES = \
gnu_java_awt_peer_gtk_GdkFontMetrics.c \
gnu_java_awt_peer_gtk_GdkGraphics.c \
@@ -33,6 +37,7 @@ libgtkpeer_la_SOURCES = \
gnu_java_awt_peer_gtk_GtkTextFieldPeer.c \
gnu_java_awt_peer_gtk_GtkToolkit.c \
gnu_java_awt_peer_gtk_GtkWindowPeer.c \
+ gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c \
gthread-jni.c \
gthread-jni.h \
gtkpeer.h