From 979431d415c06d459e002bb602bd0cac90ce3617 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Tue, 10 Apr 2007 08:04:52 +0000 Subject: [PATCH] *** empty log message *** --- .../awk/{AwkApplet.html => AseAwkApplet.html} | 0 .../awk/{AwkApplet.java => AseAwkApplet.java} | 8 +++---- ase/test/awk/makefile.in | 23 +++++++++++++++---- 3 files changed, 23 insertions(+), 8 deletions(-) rename ase/test/awk/{AwkApplet.html => AseAwkApplet.html} (100%) rename ase/test/awk/{AwkApplet.java => AseAwkApplet.java} (86%) diff --git a/ase/test/awk/AwkApplet.html b/ase/test/awk/AseAwkApplet.html similarity index 100% rename from ase/test/awk/AwkApplet.html rename to ase/test/awk/AseAwkApplet.html diff --git a/ase/test/awk/AwkApplet.java b/ase/test/awk/AseAwkApplet.java similarity index 86% rename from ase/test/awk/AwkApplet.java rename to ase/test/awk/AseAwkApplet.java index 374c7a58..54c0d9e4 100644 --- a/ase/test/awk/AwkApplet.java +++ b/ase/test/awk/AseAwkApplet.java @@ -1,5 +1,5 @@ /* - * $Id: AwkApplet.java,v 1.4 2007-03-24 15:49:59 bacon Exp $ + * $Id: AseAwkApplet.java,v 1.1 2007-04-10 08:01:34 bacon Exp $ */ import java.applet.*; @@ -7,7 +7,7 @@ import java.awt.*; import java.awt.event.*; import java.net.URL; -public class AwkApplet extends Applet +public class AseAwkApplet extends Applet { public void init () { @@ -29,7 +29,7 @@ public class AwkApplet extends Applet private void run_awk () { - Awk awk = null; + AseAwk awk = null; try { @@ -49,7 +49,7 @@ public class AwkApplet extends Applet } - awk = new Awk (); + awk = new AseAwk (); awk.parse (); awk.run (); } diff --git a/ase/test/awk/makefile.in b/ase/test/awk/makefile.in index 08e4fa8a..ea2aa354 100644 --- a/ase/test/awk/makefile.in +++ b/ase/test/awk/makefile.in @@ -1,5 +1,5 @@ # -# $Id: makefile.in,v 1.17 2007-03-25 15:02:54 bacon Exp $ +# $Id: makefile.in,v 1.18 2007-04-10 08:01:34 bacon Exp $ # CC = @CC@ @@ -8,19 +8,34 @@ LDFLAGS = @LDFLAGS@ -L@abs_top_builddir@/@BUILDMODE@/lib LIBS = @LIBS@ -laseawk -lasecmn -laseutl -lm MODE = @BUILDMODE@ +JAVAC = @JAVAC@ +JAR = @JAR@ +CFLAGS_JNI = @CFLAGS_JNI@ +JNI = @JNI@ + OUT_DIR = ../../$(MODE)/bin -all: $(OUT_DIR)/aseawk $(OUT_DIR)/miniawk +all: build$(JNI) + +build: $(OUT_DIR)/aseawk $(OUT_DIR)/aseawk_mini + +buildjni: build $(OUT_DIR)/AseAwk.class $(OUT_DIR)/AseAwkApplet.class $(OUT_DIR)/aseawk: $(OUT_DIR) $(CC) $(CFLAGS) -o $@ awk.c $(LDFLAGS) $(LIBS) -$(OUT_DIR)/miniawk: $(OUT_DIR) +$(OUT_DIR)/aseawk_mini: $(OUT_DIR) $(CC) $(CFLAGS) -o $@ mini.c $(LDFLAGS) $(LIBS) +$(OUT_DIR)/AseAwk.class: $(OUT_DIR) + $(JAVAC) -classpath ../../.. -d $(OUT_DIR) AseAwk.java + +$(OUT_DIR)/AseAwkApplet.class: $(OUT_DIR) + $(JAVAC) -classpath ../../.. -d $(OUT_DIR) AseAwkApplet.java + $(OUT_DIR): mkdir -p $(OUT_DIR) clean: - rm -rf $(OUT_DIR)/aseawk $(OUT_DIR)/miniawk + rm -rf $(OUT_DIR)/aseawk $(OUT_DIR)/aseawk_mini $(OUT_DIR)/AseAwk*.class