diff --git a/ase/awk/makefile.cl b/ase/awk/makefile.cl
index d6ea0e1d..8501bbce 100644
--- a/ase/awk/makefile.cl
+++ b/ase/awk/makefile.cl
@@ -3,7 +3,7 @@ OUT = aseawk
 C_SRCS = awk.c err.c tree.c str.c tab.c map.c parse.c \
 	run.c rec.c val.c func.c misc.c extio.c rex.c
 JNI_SRCS = jni.c
-JAVA_SRCS = Awk.java Exception.java Extio.java
+JAVA_SRCS = Exception.java Extio.java Awk.java StdAwk.java
 
 C_OBJS = $(C_SRCS:.c=.obj)
 JNI_OBJS = $(JNI_SRCS:.c=.obj)
@@ -19,7 +19,7 @@ JAVAC = javac
 
 #CFLAGS = /nologo /O2 /MT /W3 /GR- /Za -I../.. $(JNI_INC) 
 CFLAGS = /nologo /O2 /MT /W3 /GR- -I../.. $(JNI_INC) 
-JAVACFLAGS = -classpath ../..
+JAVACFLAGS = -classpath ../.. -Xlint:unchecked
 
 all: lib jni
 
diff --git a/ase/awk/makefile.in b/ase/awk/makefile.in
index 06bd29b9..658b439a 100644
--- a/ase/awk/makefile.in
+++ b/ase/awk/makefile.in
@@ -1,21 +1,39 @@
-SRCS = awk.c err.c tree.c str.c tab.c map.c parse.c \
-	run.c rec.c val.c func.c misc.c extio.c rex.c
-OBJS = $(SRCS:.c=.o)
 OUT = libaseawk.a
 
+C_SRCS = awk.c err.c tree.c str.c tab.c map.c parse.c \
+	run.c rec.c val.c func.c misc.c extio.c rex.c
+JNI_SRCS = jni.c
+JAVA_SRCS = Exception.java Extio.java Awk.java StdAwk.java
+
+C_OBJS = $(C_SRCS:.c=.o)
+JNI_OBJS = $(JNI_SRCS:.c=.o)
+JAVA_OBJS = $(JAVA_SRCS:.java=.class)
+
 CC = @CC@
 AR = ar
 RANLIB = @RANLIB@
-CFLAGS = @CFLAGS@ -I@abs_top_builddir@/..
+CFLAGS = @CFLAGS@ -I@abs_top_builddir@/.. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(PLATFORM)
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 
-all: $(OBJS)
+JAVAC = javac
+JAVACFLAGS = -classpath ../..
+
+all: lib
+
+lib: $(C_OBJS)
 	$(AR) cr $(OUT) $(OBJS)
 
+jni: lib $(JNI_OBJS) $(JAVA_OBJS)
+	$(GCC)
+
 clean:
 	rm -rf $(OBJS) $(OUT) *.o
 
-.SUFFIXES: .c .o
+.SUFFIXES: .c .o .java .class
 .c.o:
 	$(CC) $(CFLAGS) -c $<
+
+.java.class:
+	$(JAVAC) $(JAVACFLAGS) $<
+
diff --git a/ase/configure b/ase/configure
index aa67d238..93f93e72 100755
--- a/ase/configure
+++ b/ase/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.72 .
+# From configure.ac Revision: 1.73 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for ase deb-0.1.0.
 #