diff --git a/ase/awk/makefile.in b/ase/awk/makefile.in
index b2f41de1..7a2d647e 100644
--- a/ase/awk/makefile.in
+++ b/ase/awk/makefile.in
@@ -1,5 +1,5 @@
 #
-# $Id: makefile.in,v 1.28 2007-03-24 04:45:35 bacon Exp $
+# $Id: makefile.in,v 1.29 2007-03-25 15:02:54 bacon Exp $
 #
 
 NAME = aseawk
@@ -13,7 +13,7 @@ LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 MODE = @BUILDMODE@
 
-OUT_DIR = ../$(MODE)
+OUT_DIR = ../$(MODE)/lib
 OUT_FILE = $(OUT_DIR)/lib$(NAME).a
 
 TMP_DIR = $(MODE)
@@ -33,6 +33,8 @@ OBJ_FILES = \
 	$(TMP_DIR)/extio.o \
 	$(TMP_DIR)/rex.o
 
+lib: $(OUT_FILE)
+
 $(OUT_FILE): $(OBJ_FILES) $(OUT_DIR)
 	$(AR) cr $(OUT_FILE) $(OBJ_FILES)
 	if [ "$(RANLIB)" = "ranlib" ]; then ranlib $(OUT_FILE); fi
diff --git a/ase/build.xml b/ase/build.xml
index d672d0c3..367c28da 100644
--- a/ase/build.xml
+++ b/ase/build.xml
@@ -1,4 +1,4 @@
-<!-- $Id: build.xml,v 1.8 2007-03-24 15:49:59 bacon Exp $ -->
+<!-- $Id: build.xml,v 1.9 2007-03-25 15:02:54 bacon Exp $ -->
 
 <project name="ase" default="release" basedir=".">
 
@@ -10,35 +10,52 @@
 	<property name="destdir" location="${basedir}/release" />
 	-->
 
-	<target name="release" depends="init-release,compile">
-		<jar jarfile="${destdir}/aseawk.jar"
-		     basedir="${destdir}"
-		     includes="**/*.class" />
-
-		<delete dir="${destdir}/ase" />
+	<target name="release" depends="init-release,aseawk.jar,aseawk.test">
 	</target>
 
-	<target name="debug" depends="init-debug,compile">
-		<jar jarfile="${destdir}/aseawk.jar" 
-		     basedir="${destdir}" 
-		     includes="**/*.class" />
-
-		<delete dir="${destdir}/ase" />
+	<target name="debug" depends="init-debug,aseawk.jar,aseawk.test">
 	</target>
 
 	<target name="init-release">
 		<property name="destdir" location="${basedir}/release" />
-		<mkdir dir="${destdir}" />
+		<property name="libdir" location="${destdir}/lib" />
+		<property name="bindir" location="${destdir}/bin" />
+		<mkdir dir="${libdir}" />
+		<mkdir dir="${bindir}" />
 	</target>
 
 	<target name="init-debug">
 		<property name="destdir" location="${basedir}/debug" />
-		<mkdir dir="${destdir}" />
+		<property name="libdir" location="${destdir}/lib" />
+		<property name="bindir" location="${destdir}/bin" />
+		<mkdir dir="${libdir}" />
+		<mkdir dir="${bindir}" />
 	</target>
 
-	<target name="compile" description="compile the source code">
-		<javac srcdir="awk" destdir="${destdir}" />
-		<javac srcdir="test/awk" destdir="${destdir}" />
+	<target name="aseawk.jar" description="compile the awk classes">
+		<javac srcdir="awk" destdir="${libdir}" />
+
+		<jar jarfile="${libdir}/aseawk.jar"
+		     basedir="${libdir}"
+		     includes="ase/awk/*.class" />
+
+		<delete dir="${libdir}/ase" />
+	</target>
+
+	<target name="aseawk.test" depends="aseawk.jar" 
+	        description="compile the awk test classes">
+
+		<javac srcdir="test/awk" 
+		       classpath="${libdir}/aseawk.jar" 
+		       destdir="${bindir}" />
+	</target>
+
+	<target name="aseawk.applet" depends="aseawk.jar"
+	        description="compile the awk test applet">
+
+		<javac srcdir="test/awk" 
+		       classpath="${libdir}/aseawk.jar" 
+		       destdir="${bindir}" />
 	</target>
 
 	<target name="clean" description="clean up">
@@ -46,9 +63,6 @@
 		        includes="**/*.class,**/*.jar" />
 		<delete dir="${basedir}/debug"
 		        includes="**/*.class,**/*.jar" />
-
-		<delete dir="${basedir}/release/ase" />
-		<delete dir="${basedir}/debug/ase" />
 	</target>
 
 </project>
diff --git a/ase/cmn/makefile.in b/ase/cmn/makefile.in
index 131d96b6..4579268c 100644
--- a/ase/cmn/makefile.in
+++ b/ase/cmn/makefile.in
@@ -1,5 +1,5 @@
 #
-# $Id: makefile.in,v 1.5 2007-03-24 04:39:52 bacon Exp $
+# $Id: makefile.in,v 1.6 2007-03-25 15:02:54 bacon Exp $
 #
 
 NAME = asecmn
@@ -13,7 +13,7 @@ LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 MODE = @BUILDMODE@
 
-OUT_DIR = ../$(MODE)
+OUT_DIR = ../$(MODE)/lib
 OUT_FILE = $(OUT_DIR)/lib$(NAME).a
 
 TMP_DIR = $(MODE)
@@ -23,6 +23,8 @@ OBJ_FILES = \
 	$(TMP_DIR)/str.o \
 	$(TMP_DIR)/misc.o 
 
+lib: $(OUT_FILE)
+
 $(OUT_FILE): $(OBJ_FILES) $(OUT_DIR)
 	$(AR) cr $(OUT_FILE) $(OBJ_FILES)
 	if [ "$(RANLIB)" = "ranlib" ]; then ranlib $(OUT_FILE); fi
diff --git a/ase/lsp/makefile.in b/ase/lsp/makefile.in
index 2cfd439f..b46757fa 100644
--- a/ase/lsp/makefile.in
+++ b/ase/lsp/makefile.in
@@ -1,5 +1,5 @@
 #
-# $Id: makefile.in,v 1.15 2007-03-24 04:53:02 bacon Exp $
+# $Id: makefile.in,v 1.16 2007-03-25 15:02:54 bacon Exp $
 #
 
 NAME = aselsp
@@ -13,7 +13,7 @@ LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 MODE = @BUILDMODE@
 
-OUT_DIR = ../$(MODE)
+OUT_DIR = ../$(MODE)/lib
 OUT_FILE = $(OUT_DIR)/lib$(NAME).a
 
 TMP_DIR = $(MODE)
@@ -34,6 +34,8 @@ OBJ_FILES = \
 	$(TMP_DIR)/prim_compar.o \
 	$(TMP_DIR)/prim_math.o
 
+lib: $(OUT_FILE)
+
 $(OUT_FILE): $(OBJ_FILES) $(OUT_DIR)
 	$(AR) cr $(OUT_FILE) $(OBJ_FILES)
 	if [ "$(RANLIB)" = "ranlib" ]; then ranlib $(OUT_FILE); fi
diff --git a/ase/makefile.in b/ase/makefile.in
index 0867c33c..56cf3469 100644
--- a/ase/makefile.in
+++ b/ase/makefile.in
@@ -1,7 +1,15 @@
-SUBDIRS=cmn awk lsp utl
+#
+# $Id: makefile.in,v 1.16 2007-03-25 15:02:54 bacon Exp $
+#
 
-all:
-	@for i in $(SUBDIRS); \
+
+LIBDIRS=cmn awk lsp utl
+MODE=@BUILDMODE@
+
+all: libs incs
+
+incs:
+	@for i in $(LIBDIRS); \
 	do \
 		if [ ! -d $$i ]; \
 		then \
@@ -9,7 +17,25 @@ all:
 			exit 1; \
 		fi; \
 		cd $$i; \
-		if make $@; \
+		if make inc;  \
+		then \
+			echo > /dev/null; \
+		else \
+			exit 1; \
+			fi; \
+		cd ..; \
+	done
+
+libs:
+	@for i in $(LIBDIRS); \
+	do \
+		if [ ! -d $$i ]; \
+		then \
+			echo Error: $$i not a directory; \
+			exit 1; \
+		fi; \
+		cd $$i; \
+		if make lib;  \
 		then \
 			echo > /dev/null; \
 		else \
@@ -19,7 +45,7 @@ all:
 	done
 
 clean:
-	@for i in $(SUBDIRS); \
+	@for i in $(LIBDIRS); \
 	do \
 		if [ ! -d $$i ]; \
 		then \