* configure.ac (AC_CONFIG_FILES): Add examples/Makefile.jawt.

       * examples/.cvsignore: Add Makefile.jawt.
       * examples/Makefile.am (EXAMPLE_C_FILES): New variable.
       (ALL_EXAMPLE_FILES): Likewise.
       (install-data-local): Use ALL_EXAMPLE_FILES and add Makefile.jawt.
       (uninstall-local): Likewise.
       (EXTRA_DIST): Add Makefile.awt.in.
       * examples/Makefile.jawt.in: New file.
       * examples/README: Add jawt instructions.
       * examples/gnu/classpath/examples/jawt/DemoJAWT.c
       (Java_DemoJAWT_paint): Rename to
       Java_gnu_classpath_examples_jawt_DemoJAWT_paintIt.
       (Java_gnu_classpath_examples_jawt_DemoJAWT_paintIt): Flip foreground
       color based on on parameter.
       * examples/gnu/classpath/examples/jawt/DemoJAWT.java (paint): Renamed
       paintIt.
       (paint): Call paintIt.
       (on): New boolean field.
       (main): Add Frame name, switch on variable every 0.5 seconds and call
       Frame.repaint().
       * examples/gnu/classpath/examples/jawt/Makefile: Removed.
       * include/Makefile.am (include_HEADERS): New for jni.h, jni_md.h,
       jawt.h and jawt_md.h.

3 files changed, 30 insertions, 25 deletions

diff --git a/examples/gnu/classpath/examples/jawt/DemoJAWT.c b/examples/gnu/classpath/examples/jawt/DemoJAWT.c
index 990e1c438..ee2d7bfec 100644
--- a/examples/gnu/classpath/examples/jawt/DemoJAWT.c
+++ b/examples/gnu/classpath/examples/jawt/DemoJAWT.c
@@ -23,7 +23,10 @@ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #include <string.h>
 
 JNIEXPORT void JNICALL
-Java_DemoJAWT_paint (JNIEnv* env, jobject canvas, jobject graphics)
+Java_gnu_classpath_examples_jawt_DemoJAWT_paintIt (JNIEnv* env,
+						   jobject canvas,
+						   jobject graphics,
+						   jboolean on)
 {
   JAWT awt;
   JAWT_DrawingSurface* surface;
@@ -124,7 +127,7 @@ Java_DemoJAWT_paint (JNIEnv* env, jobject canvas, jobject graphics)
 
   for (c = 5; c >= 0; c--)
     {
-      if (c % 2)
+      if (c % 2 == on)
 	XSetForeground (display, gc, yellow.pixel);
       else
 	XSetForeground (display, gc, orange.pixel);
diff --git a/examples/gnu/classpath/examples/jawt/DemoJAWT.java b/examples/gnu/classpath/examples/jawt/DemoJAWT.java
index 30fe583f1..ff688964b 100644
--- a/examples/gnu/classpath/examples/jawt/DemoJAWT.java
+++ b/examples/gnu/classpath/examples/jawt/DemoJAWT.java
@@ -30,17 +30,25 @@ public class DemoJAWT extends Canvas
     System.loadLibrary ("DemoJAWT");
   }
 
-  public native void paint (Graphics g);
+  public native void paintIt (Graphics g, boolean on);
+
+  public void paint (Graphics g)
+  {
+    paintIt (g, on);
+  }
+
+  private boolean on;
 
   public static void main (String[] args)
   {
-    Frame f = new Frame ();
+    Frame f = new Frame ("GNU Classpath JAWT Demo");
 
     f.setBounds (0, 0, 300, 300);
 
     f.setResizable (false);
 
-    f.add (new DemoJAWT ());
+    DemoJAWT jawtDemo = new DemoJAWT ();
+    f.add (jawtDemo);
 
     f.addWindowListener (new WindowAdapter ()
       {
@@ -51,5 +59,19 @@ public class DemoJAWT extends Canvas
       });
 
     f.show ();
+
+    while (true)
+    {
+      try
+	{
+	  Thread.sleep (500);
+	}
+      catch (InterruptedException ie)
+	{
+	  // ignored
+	}
+      jawtDemo.on = ! jawtDemo.on;
+      f.repaint();
+    }
   }
 }
diff --git a/examples/gnu/classpath/examples/jawt/Makefile b/examples/gnu/classpath/examples/jawt/Makefile
deleted file mode 100644
index 974a2f487..000000000
--- a/examples/gnu/classpath/examples/jawt/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-all: \
-	DemoJAWT.h DemoJAWT.class libDemoJAWT.so
-
-%.class: %.java
-	gcj -C $<
-
-%.h: %.class
-	gcjh -jni $(basename $< .class)
-
-DemoJAWT: DemoJAWT.java
-	gcj -g --main=DemoJAWT -fjni -o DemoJAWT DemoJAWT.java
-
-libDemoJAWT.so: DemoJAWT.c
-	gcc -g -O0 -Wall -I. -I/usr/X11R6/include -shared -o $@ DemoJAWT.c -L. -ljawt -L/usr/X11R6/lib -lX11
-
-run:
-	LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:. jamvm DemoJAWT
-
-clean:
-	rm -f DemoJAWT.h DemoJAWT.class DemoJAWT\$$1.class libDemoJAWT.so