diff --git a/ase/cmd/awk/makefile.in b/ase/cmd/awk/makefile.in
index 6e22335b..b057e0fc 100644
--- a/ase/cmd/awk/makefile.in
+++ b/ase/cmd/awk/makefile.in
@@ -1,52 +1,499 @@
-#
-# $Id: makefile.in,v 1.6 2007/11/11 15:06:47 bacon Exp $
-#
+# makefile.in generated by automake 1.9.6 from makefile.am.
+# @configure_input@
 
-TOP_DIR = @abs_top_builddir@
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-CC = @CC@
-CXX = @CXX@
-CFLAGS = @CFLAGS@ -I$(TOP_DIR)/inc
-CXXFLAGS = @CXXFLAGS@ -I$(TOP_DIR)/inc
-LDFLAGS = @LDFLAGS@ -L$(TOP_DIR)/out/@BUILDMODE@/lib
-LIBS = @LIBS@ -laseawk -lasecmn -laseutl -lm
-LIBS_CXX = -laseawk++ ${LIBS} 
-MODE = @BUILDMODE@
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
-STRIP = @STRIP@
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+bin_PROGRAMS = aseawk$(EXEEXT) aseawk++$(EXEEXT)
+subdir = cmd/awk
+DIST_COMMON = $(srcdir)/makefile.am $(srcdir)/makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/include/ase/cmn/conf_unx.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS)
+am_aseawk_OBJECTS = awk.$(OBJEXT)
+aseawk_OBJECTS = $(am_aseawk_OBJECTS)
+aseawk_DEPENDENCIES =
+am_aseawk___OBJECTS = Awk.$(OBJEXT)
+aseawk___OBJECTS = $(am_aseawk___OBJECTS)
+aseawk___DEPENDENCIES =
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include/ase/cmn
+depcomp = $(SHELL) $(top_srcdir)/autoconf/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(aseawk_SOURCES) $(aseawk___SOURCES)
+DIST_SOURCES = $(aseawk_SOURCES) $(aseawk___SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
 AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILDMODE = @BUILDMODE@
+BUILD_CJ = @BUILD_CJ@
+BUILD_JNI = @BUILD_JNI@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CFLAGS_JNI = @CFLAGS_JNI@
+CJ = @CJ@
+CJFLAGS = @CJFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+JAR = @JAR@
+JAR_PATH = @JAR_PATH@
+JAVAC = @JAVAC@
+JAVAC_PATH = @JAVAC_PATH@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+AM_CPPFLAGS = -I$(top_srcdir)/include
+aseawk_SOURCES = awk.c
+aseawk___SOURCES = Awk.cpp
+aseawk_LDADD = -L../../lib/cmn -L../../lib/awk -L../../lib/utl -laseawk -lasecmn
+aseawk___LDADD = -laseawk++ 
+all: all-am
 
-LIBTOOL_COMPILE = $(TOP_DIR)/libtool --mode=compile
-LIBTOOL_LINK = $(TOP_DIR)/libtool --mode=link
+.SUFFIXES:
+.SUFFIXES: .c .cpp .lo .o .obj
+$(srcdir)/makefile.in:  $(srcdir)/makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  cmd/awk/makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  cmd/awk/makefile
+.PRECIOUS: makefile
+makefile: $(srcdir)/makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
 
-OUT_DIR= $(TOP_DIR)/out/$(MODE)
-OUT_DIR_LIB = $(OUT_DIR)/lib
-OUT_DIR_BIN = $(OUT_DIR)/cmd
-TMP_DIR = $(MODE)
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-ASEAWK_LIB = 
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
 
-all: build
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+	done
 
-build: $(TMP_DIR) $(OUT_DIR_BIN) $(OUT_DIR_BIN)/aseawk $(OUT_DIR_BIN)/aseawk++
+clean-binPROGRAMS:
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+aseawk$(EXEEXT): $(aseawk_OBJECTS) $(aseawk_DEPENDENCIES) 
+	@rm -f aseawk$(EXEEXT)
+	$(LINK) $(aseawk_LDFLAGS) $(aseawk_OBJECTS) $(aseawk_LDADD) $(LIBS)
+aseawk++$(EXEEXT): $(aseawk___OBJECTS) $(aseawk___DEPENDENCIES) 
+	@rm -f aseawk++$(EXEEXT)
+	$(CXXLINK) $(aseawk___LDFLAGS) $(aseawk___OBJECTS) $(aseawk___LDADD) $(LIBS)
 
-$(OUT_DIR_BIN)/aseawk: awk.c
-	$(LIBTOOL_LINK) $(CC) $(CFLAGS) -o $@ awk.c $(LDFLAGS) $(LIBS)
-	$(STRIP) $@
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
 
-$(OUT_DIR_BIN)/aseawk++: Awk.cpp
-	$(LIBTOOL_LINK) $(CXX) $(CXXFLAGS) -o $@ Awk.cpp $(LDFLAGS) $(LIBS_CXX)
-	$(STRIP) $@
+distclean-compile:
+	-rm -f *.tab.c
 
-$(OUT_DIR_BIN):
-	mkdir -p $(OUT_DIR_BIN)
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Awk.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/awk.Po@am__quote@
 
-$(TMP_DIR):
-	mkdir -p $(TMP_DIR)
+.c.o:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
-$(TMP_DIR)/cj:
-	mkdir -p $(TMP_DIR)/cj
+.c.obj:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
-clean:
-	rm -rf $(OUT_DIR_BIN)/aseawk $(OUT_DIR_BIN)/aseawk++ 
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+.cpp.o:
+@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: makefile $(PROGRAMS)
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-libtool ctags distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-binPROGRAMS install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/ase/cmd/makefile.in b/ase/cmd/makefile.in
index c86add0b..1b0a4905 100644
--- a/ase/cmd/makefile.in
+++ b/ase/cmd/makefile.in
@@ -1,21 +1,483 @@
-BLDDIRS = awk
-MODE = @BUILDMODE@
+# makefile.in generated by automake 1.9.6 from makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = cmd
+DIST_COMMON = $(srcdir)/makefile.am $(srcdir)/makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/include/ase/cmn/conf_unx.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-exec-recursive install-info-recursive \
+	install-recursive installcheck-recursive installdirs-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	uninstall-recursive
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILDMODE = @BUILDMODE@
+BUILD_CJ = @BUILD_CJ@
+BUILD_JNI = @BUILD_JNI@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CFLAGS_JNI = @CFLAGS_JNI@
+CJ = @CJ@
+CJFLAGS = @CJFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+JAR = @JAR@
+JAR_PATH = @JAR_PATH@
+JAVAC = @JAVAC@
+JAVAC_PATH = @JAVAC_PATH@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+SUBDIRS = awk 
+DIST_SUBDIRS = $(SUBDIRS) 
+all: all-recursive
 
-all: build
+.SUFFIXES:
+$(srcdir)/makefile.in:  $(srcdir)/makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  cmd/makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  cmd/makefile
+.PRECIOUS: makefile
+makefile: $(srcdir)/makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
 
-build:
-	@for i in $(BLDDIRS); \
-	do \
-		saved=`pwd`; cd "$$i" || exit 1; \
-		make || exit 1; \
-		cd "$$saved"; \
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
-clean:
-	@for i in $(BLDDIRS); \
-	do \
-		saved=`pwd`; cd "$$i" || exit 1; \
-		make $@ || exit 1; \
-		cd "$$saved"; \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
 	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f makefile
+distclean-am: clean-am distclean-generic distclean-libtool \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+	clean clean-generic clean-libtool clean-recursive ctags \
+	ctags-recursive distclean distclean-generic distclean-libtool \
+	distclean-recursive distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic maintainer-clean-recursive \
+	mostlyclean mostlyclean-generic mostlyclean-libtool \
+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/ase/configure b/ase/configure
index ab6681fe..052b7726 100755
--- a/ase/configure
+++ b/ase/configure
@@ -1943,7 +1943,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-ac_config_headers="$ac_config_headers inc/ase/cmn/conf_unx.h"
+ac_config_headers="$ac_config_headers include/ase/cmn/conf_unx.h"
 
 ac_aux_dir=
 for ac_dir in autoconf "$srcdir"/autoconf; do
@@ -26604,7 +26604,7 @@ CJFLAGS=$CJFLAGS
 BUILD_CJ=$BUILD_CJ
 
 
-ac_config_files="$ac_config_files makefile inc/makefile inc/ase/makefile inc/ase/cmn/makefile inc/ase/utl/makefile inc/ase/awk/makefile lib/makefile lib/cmn/makefile lib/utl/makefile lib/awk/makefile lib/lsp/makefile lib/tgp/makefile cmd/makefile cmd/awk/makefile cmd/lsp/makefile"
+ac_config_files="$ac_config_files makefile include/makefile include/ase/makefile include/ase/cmn/makefile include/ase/awk/makefile include/ase/lsp/makefile include/ase/utl/makefile lib/makefile lib/cmn/makefile lib/awk/makefile lib/lsp/makefile lib/tgp/makefile lib/utl/makefile cmd/makefile cmd/awk/makefile cmd/lsp/makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -27189,20 +27189,21 @@ cat >>$CONFIG_STATUS <<\_ACEOF
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
-    "inc/ase/cmn/conf_unx.h") CONFIG_HEADERS="$CONFIG_HEADERS inc/ase/cmn/conf_unx.h" ;;
+    "include/ase/cmn/conf_unx.h") CONFIG_HEADERS="$CONFIG_HEADERS include/ase/cmn/conf_unx.h" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "makefile") CONFIG_FILES="$CONFIG_FILES makefile" ;;
-    "inc/makefile") CONFIG_FILES="$CONFIG_FILES inc/makefile" ;;
-    "inc/ase/makefile") CONFIG_FILES="$CONFIG_FILES inc/ase/makefile" ;;
-    "inc/ase/cmn/makefile") CONFIG_FILES="$CONFIG_FILES inc/ase/cmn/makefile" ;;
-    "inc/ase/utl/makefile") CONFIG_FILES="$CONFIG_FILES inc/ase/utl/makefile" ;;
-    "inc/ase/awk/makefile") CONFIG_FILES="$CONFIG_FILES inc/ase/awk/makefile" ;;
+    "include/makefile") CONFIG_FILES="$CONFIG_FILES include/makefile" ;;
+    "include/ase/makefile") CONFIG_FILES="$CONFIG_FILES include/ase/makefile" ;;
+    "include/ase/cmn/makefile") CONFIG_FILES="$CONFIG_FILES include/ase/cmn/makefile" ;;
+    "include/ase/awk/makefile") CONFIG_FILES="$CONFIG_FILES include/ase/awk/makefile" ;;
+    "include/ase/lsp/makefile") CONFIG_FILES="$CONFIG_FILES include/ase/lsp/makefile" ;;
+    "include/ase/utl/makefile") CONFIG_FILES="$CONFIG_FILES include/ase/utl/makefile" ;;
     "lib/makefile") CONFIG_FILES="$CONFIG_FILES lib/makefile" ;;
     "lib/cmn/makefile") CONFIG_FILES="$CONFIG_FILES lib/cmn/makefile" ;;
-    "lib/utl/makefile") CONFIG_FILES="$CONFIG_FILES lib/utl/makefile" ;;
     "lib/awk/makefile") CONFIG_FILES="$CONFIG_FILES lib/awk/makefile" ;;
     "lib/lsp/makefile") CONFIG_FILES="$CONFIG_FILES lib/lsp/makefile" ;;
     "lib/tgp/makefile") CONFIG_FILES="$CONFIG_FILES lib/tgp/makefile" ;;
+    "lib/utl/makefile") CONFIG_FILES="$CONFIG_FILES lib/utl/makefile" ;;
     "cmd/makefile") CONFIG_FILES="$CONFIG_FILES cmd/makefile" ;;
     "cmd/awk/makefile") CONFIG_FILES="$CONFIG_FILES cmd/awk/makefile" ;;
     "cmd/lsp/makefile") CONFIG_FILES="$CONFIG_FILES cmd/lsp/makefile" ;;
diff --git a/ase/configure.ac b/ase/configure.ac
index 88dc46be..292c46c2 100644
--- a/ase/configure.ac
+++ b/ase/configure.ac
@@ -4,7 +4,7 @@
 
 AC_PREREQ(2.53)
 AC_INIT([ase],[0.5.0],[bacon@abiyo.net])
-AC_CONFIG_HEADER([inc/ase/cmn/conf_unx.h])
+AC_CONFIG_HEADER([include/ase/cmn/conf_unx.h])
 AC_CONFIG_AUX_DIR(autoconf)
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 
@@ -264,17 +264,18 @@ AC_SUBST(BUILD_CJ, $BUILD_CJ)
 
 AC_CONFIG_FILES([
 	makefile 
-	inc/makefile
-	inc/ase/makefile
-	inc/ase/cmn/makefile
-	inc/ase/utl/makefile
-	inc/ase/awk/makefile
+	include/makefile
+	include/ase/makefile
+	include/ase/cmn/makefile
+	include/ase/awk/makefile
+	include/ase/lsp/makefile
+	include/ase/utl/makefile
 	lib/makefile 
 	lib/cmn/makefile 
-	lib/utl/makefile 
 	lib/awk/makefile 
 	lib/lsp/makefile 
 	lib/tgp/makefile 
+	lib/utl/makefile 
 	cmd/makefile 
 	cmd/awk/makefile 
 	cmd/lsp/makefile])
diff --git a/ase/include/ase/cmn/conf_unx.h.in b/ase/include/ase/cmn/conf_unx.h.in
index 108a0773..159a6bac 100644
--- a/ase/include/ase/cmn/conf_unx.h.in
+++ b/ase/include/ase/cmn/conf_unx.h.in
@@ -1,4 +1,4 @@
-/* inc/ase/cmn/conf_unx.h.in.  Generated from configure.ac by autoheader.  */
+/* include/ase/cmn/conf_unx.h.in.  Generated from configure.ac by autoheader.  */
 
 /* char is mchar */
 #undef ASE_CHAR_IS_MCHAR
diff --git a/ase/include/ase/makefile.am b/ase/include/ase/makefile.am
index d451166e..89736987 100644
--- a/ase/include/ase/makefile.am
+++ b/ase/include/ase/makefile.am
@@ -2,4 +2,4 @@
 AUTOMAKE_OPTIONS = no-dependencies
 
 # EXTRA_DIST = README
-SUBDIRS = cmn awk utl
+SUBDIRS = cmn awk lsp utl
diff --git a/ase/lib/awk/makefile.am b/ase/lib/awk/makefile.am
index be67be67..da5adedc 100644
--- a/ase/lib/awk/makefile.am
+++ b/ase/lib/awk/makefile.am
@@ -8,3 +8,4 @@ lib_LTLIBRARIES = libaseawk.la libaseawk++.la
 libaseawk_la_SOURCES = awk.c err.c tree.c tab.c parse.c run.c rec.c val.c func.c misc.c extio.c awk_i.h extio.h func.h jni.h misc.h parse.h run.h tab.h tree.h
 
 libaseawk___la_SOURCES = Awk.cpp StdAwk.cpp
+#libaesawkcxx_la_LIBADD = -laseawk
diff --git a/ase/lib/awk/makefile.in b/ase/lib/awk/makefile.in
index dbebb0d3..67985116 100644
--- a/ase/lib/awk/makefile.in
+++ b/ase/lib/awk/makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/inc/ase/cmn/conf_unx.h
+CONFIG_HEADER = $(top_builddir)/include/ase/cmn/conf_unx.h
 CONFIG_CLEAN_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -199,7 +199,7 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 AUTOMAKE_OPTIONS = nostdinc
-AM_CPPFLAGS = -I$(top_srcdir)/inc
+AM_CPPFLAGS = -I$(top_srcdir)/include
 lib_LTLIBRARIES = libaseawk.la libaseawk++.la
 libaseawk_la_SOURCES = awk.c err.c tree.c tab.c parse.c run.c rec.c val.c func.c misc.c extio.c awk_i.h extio.h func.h jni.h misc.h parse.h run.h tab.h tree.h
 libaseawk___la_SOURCES = Awk.cpp StdAwk.cpp
@@ -510,6 +510,7 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
 	tags uninstall uninstall-am uninstall-info-am \
 	uninstall-libLTLIBRARIES
 
+#libaesawkcxx_la_LIBADD = -laseawk
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/ase/lib/cmn/makefile.in b/ase/lib/cmn/makefile.in
index 770832f7..ea6f9e26 100644
--- a/ase/lib/cmn/makefile.in
+++ b/ase/lib/cmn/makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/inc/ase/cmn/conf_unx.h
+CONFIG_HEADER = $(top_builddir)/include/ase/cmn/conf_unx.h
 CONFIG_CLEAN_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -188,7 +188,7 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 AUTOMAKE_OPTIONS = nostdinc
-AM_CFLAGS = -I$(top_builddir)/inc
+AM_CFLAGS = -I$(top_builddir)/include
 lib_LTLIBRARIES = libasecmn.la
 libasecmn_la_SOURCES = map.c mem.c misc.c rex.c str_bas.c str_cnv.c str_dyn.c
 all: all-am
diff --git a/ase/lib/lsp/env.c b/ase/lib/lsp/env.c
index 83358497..a9ad505f 100644
--- a/ase/lib/lsp/env.c
+++ b/ase/lib/lsp/env.c
@@ -1,10 +1,10 @@
 /*
- * $Id: env.c 117 2008-03-03 11:20:05Z baconevi $
+ * $Id: env.c 215 2008-06-19 10:27:37Z baconevi $
  *
  * {License}
  */
 
-#include <ase/lsp/lsp_i.h>
+#include "lsp_i.h"
 
 /* TODO: make the frame hash accessible */
 
diff --git a/ase/lib/lsp/err.c b/ase/lib/lsp/err.c
index 25588feb..840ee92b 100644
--- a/ase/lib/lsp/err.c
+++ b/ase/lib/lsp/err.c
@@ -1,10 +1,10 @@
 /*
- * $Id: err.c 117 2008-03-03 11:20:05Z baconevi $
+ * $Id: err.c 215 2008-06-19 10:27:37Z baconevi $
  *
  * {License}
  */
 
-#include <ase/lsp/lsp_i.h>
+#include "lsp_i.h"
 
 static const ase_char_t* __geterrstr (int errnum)
 {
diff --git a/ase/lib/lsp/eval.c b/ase/lib/lsp/eval.c
index f1b5a116..4ddbd6e1 100644
--- a/ase/lib/lsp/eval.c
+++ b/ase/lib/lsp/eval.c
@@ -1,10 +1,10 @@
 /*
- * $Id: eval.c 117 2008-03-03 11:20:05Z baconevi $
+ * $Id: eval.c 215 2008-06-19 10:27:37Z baconevi $
  *
  * {License}
  */
 
-#include <ase/lsp/lsp_i.h>
+#include "lsp_i.h"
 
 static ase_lsp_obj_t* __eval (ase_lsp_t* lsp, ase_lsp_obj_t* obj);
 static ase_lsp_obj_t* makefn (
diff --git a/ase/lib/lsp/lsp.c b/ase/lib/lsp/lsp.c
index cff56b16..2370ddfb 100644
--- a/ase/lib/lsp/lsp.c
+++ b/ase/lib/lsp/lsp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: lsp.c 117 2008-03-03 11:20:05Z baconevi $
+ * $Id: lsp.c 215 2008-06-19 10:27:37Z baconevi $
  *
  * {License}
  */
@@ -9,7 +9,7 @@
 #define Library
 #endif
 
-#include <ase/lsp/lsp_i.h>
+#include "lsp_i.h"
 
 static int __add_builtin_prims (ase_lsp_t* lsp);
 
diff --git a/ase/lib/lsp/lsp_i.h b/ase/lib/lsp/lsp_i.h
index 9caafd5e..401081a7 100644
--- a/ase/lib/lsp/lsp_i.h
+++ b/ase/lib/lsp/lsp_i.h
@@ -1,5 +1,5 @@
 /*
- * $Id: lsp_i.h 117 2008-03-03 11:20:05Z baconevi $
+ * $Id: lsp_i.h 215 2008-06-19 10:27:37Z baconevi $
  *
  * {License}
  */
@@ -11,12 +11,12 @@
 #include <ase/cmn/str.h>
 
 #include <ase/lsp/lsp.h>
-#include <ase/lsp/env.h>
-#include <ase/lsp/obj.h>
-#include <ase/lsp/mem.h>
-#include <ase/lsp/misc.h>
-#include <ase/lsp/prim.h>
-#include <ase/lsp/name.h>
+#include "env.h"
+#include "obj.h"
+#include "mem.h"
+#include "misc.h"
+#include "prim.h"
+#include "name.h"
 
 #ifdef _MSC_VER
 #pragma warning (disable: 4996)
diff --git a/ase/lib/lsp/makefile.in b/ase/lib/lsp/makefile.in
index 8e8507f1..914b54ee 100644
--- a/ase/lib/lsp/makefile.in
+++ b/ase/lib/lsp/makefile.in
@@ -1,93 +1,482 @@
-#
-# $Id: makefile.in,v 1.3 2007/04/30 06:09:46 bacon Exp $
-#
+# makefile.in generated by automake 1.9.6 from makefile.am.
+# @configure_input@
 
-NAME = aselsp
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-CC = @CC@
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = lib/lsp
+DIST_COMMON = $(srcdir)/makefile.am $(srcdir)/makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/include/ase/cmn/conf_unx.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+libaselsp_la_LIBADD =
+am_libaselsp_la_OBJECTS = lsp.lo err.lo env.lo eval.lo mem.lo misc.lo \
+	name.lo prim.lo prim_compar.lo prim_let.lo prim_math.lo \
+	prim_prog.lo print.lo read.lo
+libaselsp_la_OBJECTS = $(am_libaselsp_la_OBJECTS)
+DEFAULT_INCLUDES = 
+depcomp = $(SHELL) $(top_srcdir)/autoconf/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libaselsp_la_SOURCES)
+DIST_SOURCES = $(libaselsp_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
 AR = @AR@
-MAKE = @MAKE@
-RANLIB = @RANLIB@
-CFLAGS = @CFLAGS@ -I@abs_top_builddir@/..
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILDMODE = @BUILDMODE@
+BUILD_CJ = @BUILD_CJ@
+BUILD_JNI = @BUILD_JNI@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CFLAGS_JNI = @CFLAGS_JNI@
+CJ = @CJ@
+CJFLAGS = @CJFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+JAR = @JAR@
+JAR_PATH = @JAR_PATH@
+JAVAC = @JAVAC@
+JAVAC_PATH = @JAVAC_PATH@
 LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
-MODE = @BUILDMODE@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+AUTOMAKE_OPTIONS = nostdinc
+AM_CPPFLAGS = -I$(top_srcdir)/include
+lib_LTLIBRARIES = libaselsp.la 
+libaselsp_la_SOURCES = lsp.c err.c env.c eval.c mem.c mem.h misc.c name.c prim.c prim_compar.c prim.h prim_let.c prim_math.c prim_prog.c print.c read.c lsp_i.h env.h misc.h name.h obj.h 
+all: all-am
 
-OUT_DIR = ../$(MODE)/lib
-OUT_FILE = $(OUT_DIR)/lib$(NAME).a
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/makefile.in:  $(srcdir)/makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  lib/lsp/makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  lib/lsp/makefile
+.PRECIOUS: makefile
+makefile: $(srcdir)/makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
 
-TMP_DIR = $(MODE)
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-OBJ_FILES = \
-	$(TMP_DIR)/lsp.o \
-	$(TMP_DIR)/name.o \
-	$(TMP_DIR)/mem.o \
-	$(TMP_DIR)/env.o \
-	$(TMP_DIR)/err.o \
-	$(TMP_DIR)/eval.o \
-	$(TMP_DIR)/read.o \
-	$(TMP_DIR)/print.o \
-	$(TMP_DIR)/misc.o \
-	$(TMP_DIR)/prim.o \
-	$(TMP_DIR)/prim_prog.o \
-	$(TMP_DIR)/prim_let.o \
-	$(TMP_DIR)/prim_compar.o \
-	$(TMP_DIR)/prim_math.o
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	  else :; fi; \
+	done
 
-lib: $(OUT_FILE)
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	done
 
-$(OUT_FILE): $(TMP_DIR) $(OBJ_FILES) $(OUT_DIR)
-	$(AR) cr $(OUT_FILE) $(OBJ_FILES)
-	if [ ! -z "$(RANLIB)" ]; then $(RANLIB) $(OUT_FILE); fi
-	
-$(TMP_DIR)/lsp.o: lsp.c
-	$(CC) $(CFLAGS) -o $@ -c lsp.c
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libaselsp.la: $(libaselsp_la_OBJECTS) $(libaselsp_la_DEPENDENCIES) 
+	$(LINK) -rpath $(libdir) $(libaselsp_la_LDFLAGS) $(libaselsp_la_OBJECTS) $(libaselsp_la_LIBADD) $(LIBS)
 
-$(TMP_DIR)/name.o: name.c
-	$(CC) $(CFLAGS) -o $@ -c name.c
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
 
-$(TMP_DIR)/mem.o: mem.c
-	$(CC) $(CFLAGS) -o $@ -c mem.c
+distclean-compile:
+	-rm -f *.tab.c
 
-$(TMP_DIR)/env.o: env.c
-	$(CC) $(CFLAGS) -o $@ -c env.c
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/env.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/err.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eval.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lsp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mem.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/name.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prim.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prim_compar.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prim_let.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prim_math.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prim_prog.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read.Plo@am__quote@
 
-$(TMP_DIR)/err.o: err.c
-	$(CC) $(CFLAGS) -o $@ -c err.c
+.c.o:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
-$(TMP_DIR)/eval.o: eval.c
-	$(CC) $(CFLAGS) -o $@ -c eval.c
+.c.obj:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
-$(TMP_DIR)/read.o: read.c
-	$(CC) $(CFLAGS) -o $@ -c read.c
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
-$(TMP_DIR)/print.o: print.c
-	$(CC) $(CFLAGS) -o $@ -c print.c
+mostlyclean-libtool:
+	-rm -f *.lo
 
-$(TMP_DIR)/misc.o: misc.c
-	$(CC) $(CFLAGS) -o $@ -c misc.c
+clean-libtool:
+	-rm -rf .libs _libs
 
-$(TMP_DIR)/prim.o: prim.c
-	$(CC) $(CFLAGS) -o $@ -c prim.c
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
 
-$(TMP_DIR)/prim_prog.o: prim_prog.c
-	$(CC) $(CFLAGS) -o $@ -c prim_prog.c
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
 
-$(TMP_DIR)/prim_let.o: prim_let.c
-	$(CC) $(CFLAGS) -o $@ -c prim_let.c
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
 
-$(TMP_DIR)/prim_compar.o: prim_compar.c
-	$(CC) $(CFLAGS) -o $@ -c prim_compar.c
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
 
-$(TMP_DIR)/prim_math.o: prim_math.c
-	$(CC) $(CFLAGS) -o $@ -c prim_math.c
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-$(OUT_DIR):
-	mkdir -p $(OUT_DIR)
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: makefile $(LTLIBRARIES)
+installdirs:
+	for dir in "$(DESTDIR)$(libdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
 
-$(TMP_DIR):
-	mkdir -p $(TMP_DIR)
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
-clean:
-	rm -rf $(OUT_FILE) $(OBJ_FILES)
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
 
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am: install-libLTLIBRARIES
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libLTLIBRARIES clean-libtool ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-info-am \
+	uninstall-libLTLIBRARIES
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/ase/lib/lsp/mem.c b/ase/lib/lsp/mem.c
index 6779e579..b811214b 100644
--- a/ase/lib/lsp/mem.c
+++ b/ase/lib/lsp/mem.c
@@ -1,10 +1,10 @@
 /*
- * $Id: mem.c 117 2008-03-03 11:20:05Z baconevi $
+ * $Id: mem.c 215 2008-06-19 10:27:37Z baconevi $
  *
  * {License}
  */
 
-#include <ase/lsp/lsp_i.h>
+#include "lsp_i.h"
 
 ase_lsp_mem_t* ase_lsp_openmem (
 	ase_lsp_t* lsp, ase_size_t ubound, ase_size_t ubound_inc)
diff --git a/ase/lib/lsp/misc.c b/ase/lib/lsp/misc.c
index 22432c0f..d1fafc86 100644
--- a/ase/lib/lsp/misc.c
+++ b/ase/lib/lsp/misc.c
@@ -1,10 +1,10 @@
 /*
- * $Id: misc.c 117 2008-03-03 11:20:05Z baconevi $
+ * $Id: misc.c 215 2008-06-19 10:27:37Z baconevi $
  *
  * {License}
  */
 
-#include <ase/lsp/lsp_i.h>
+#include "lsp_i.h"
 
 ase_long_t ase_lsp_strxtolong (
 	ase_lsp_t* lsp, const ase_char_t* str, ase_size_t len,
diff --git a/ase/lib/lsp/name.c b/ase/lib/lsp/name.c
index d8584f3f..f860cd46 100644
--- a/ase/lib/lsp/name.c
+++ b/ase/lib/lsp/name.c
@@ -1,10 +1,10 @@
 /*
- * $Id: name.c 117 2008-03-03 11:20:05Z baconevi $
+ * $Id: name.c 215 2008-06-19 10:27:37Z baconevi $
  *
  * {License}
  */
 
-#include <ase/lsp/lsp_i.h>
+#include "lsp_i.h"
 
 ase_lsp_name_t* ase_lsp_name_open (
 	ase_lsp_name_t* name, ase_size_t capa, ase_lsp_t* lsp)
@@ -16,9 +16,9 @@ ase_lsp_name_t* ase_lsp_name_open (
 		name = (ase_lsp_name_t*)
 			ASE_LSP_MALLOC (lsp, ASE_SIZEOF(ase_lsp_name_t));
 		if (name == ASE_NULL) return ASE_NULL;
-		name->__dynamic = ase_true;
+		name->__dynamic = ASE_TRUE;
 	}
-	else name->__dynamic = ase_false;
+	else name->__dynamic = ASE_FALSE;
 	
 	if (capa < ASE_COUNTOF(name->static_buf)) 
 	{
diff --git a/ase/lib/lsp/prim.c b/ase/lib/lsp/prim.c
index 3ffaeeb5..610681ca 100644
--- a/ase/lib/lsp/prim.c
+++ b/ase/lib/lsp/prim.c
@@ -1,10 +1,10 @@
 /*
- * $Id: prim.c 117 2008-03-03 11:20:05Z baconevi $
+ * $Id: prim.c 215 2008-06-19 10:27:37Z baconevi $
  *
  * {License}
  */
 
-#include <ase/lsp/lsp_i.h>
+#include "lsp_i.h"
 
 static int __add_prim (ase_lsp_mem_t* mem, 
 	const ase_char_t* name, ase_size_t len, 
diff --git a/ase/lib/lsp/prim_compar.c b/ase/lib/lsp/prim_compar.c
index 0182b518..ba71a206 100644
--- a/ase/lib/lsp/prim_compar.c
+++ b/ase/lib/lsp/prim_compar.c
@@ -1,10 +1,10 @@
 /*
- * $Id: prim_compar.c 117 2008-03-03 11:20:05Z baconevi $
+ * $Id: prim_compar.c 215 2008-06-19 10:27:37Z baconevi $
  *
  * {License}
  */
 
-#include <ase/lsp/lsp_i.h>
+#include "lsp_i.h"
 
 #define PRIM_COMPAR(lsp,args,op)  \
 { \
diff --git a/ase/lib/lsp/prim_let.c b/ase/lib/lsp/prim_let.c
index 1c999e2e..42a70dff 100644
--- a/ase/lib/lsp/prim_let.c
+++ b/ase/lib/lsp/prim_let.c
@@ -1,10 +1,10 @@
 /*
- * $Id: prim_let.c 117 2008-03-03 11:20:05Z baconevi $
+ * $Id: prim_let.c 215 2008-06-19 10:27:37Z baconevi $
  *
  * {License}
  */
 
-#include <ase/lsp/lsp_i.h>
+#include "lsp_i.h"
 
 /* 
  * (let ((variable value)
diff --git a/ase/lib/lsp/prim_math.c b/ase/lib/lsp/prim_math.c
index ecd6e6fa..75d27964 100644
--- a/ase/lib/lsp/prim_math.c
+++ b/ase/lib/lsp/prim_math.c
@@ -1,17 +1,17 @@
 /*
- * $Id: prim_math.c 117 2008-03-03 11:20:05Z baconevi $
+ * $Id: prim_math.c 215 2008-06-19 10:27:37Z baconevi $
  *
  * {License}
  */
 
-#include <ase/lsp/lsp_i.h>
+#include "lsp_i.h"
 
 ase_lsp_obj_t* ase_lsp_prim_plus (ase_lsp_t* lsp, ase_lsp_obj_t* args)
 {
 	ase_lsp_obj_t* body, * tmp;
 	ase_long_t ival = 0;
 	ase_real_t rval = .0;
-	ase_bool_t realnum = ase_false;
+	ase_bool_t realnum = ASE_FALSE;
 
 	ASE_ASSERT (ASE_LSP_TYPE(args) == ASE_LSP_OBJ_CONS);
 
@@ -25,7 +25,7 @@ ase_lsp_obj_t* ase_lsp_prim_plus (ase_lsp_t* lsp, ase_lsp_obj_t* args)
 		{
 			if (body == args) 
 			{
-				ASE_ASSERT (realnum == ase_false);
+				ASE_ASSERT (realnum == ASE_FALSE);
 				ival = ASE_LSP_IVAL(tmp);
 			}
 			else 
@@ -40,15 +40,15 @@ ase_lsp_obj_t* ase_lsp_prim_plus (ase_lsp_t* lsp, ase_lsp_obj_t* args)
 		{
 			if (body == args) 
 			{
-				ASE_ASSERT (realnum == ase_false);
-				realnum = ase_true;
+				ASE_ASSERT (realnum == ASE_FALSE);
+				realnum = ASE_TRUE;
 				rval = ASE_LSP_RVAL(tmp);
 			}
 			else 
 			{
 				if (!realnum) 
 				{
-					realnum = ase_true;
+					realnum = ASE_TRUE;
 					rval = (ase_real_t)ival;
 				}
 				rval = rval + ASE_LSP_RVAL(tmp);
@@ -79,7 +79,7 @@ ase_lsp_obj_t* ase_lsp_prim_minus (ase_lsp_t* lsp, ase_lsp_obj_t* args)
 	ase_lsp_obj_t* body, * tmp;
 	ase_long_t ival = 0;
 	ase_real_t rval = .0;
-	ase_bool_t realnum = ase_false;
+	ase_bool_t realnum = ASE_FALSE;
 
 	ASE_ASSERT (ASE_LSP_TYPE(args) == ASE_LSP_OBJ_CONS);
 
@@ -94,7 +94,7 @@ ase_lsp_obj_t* ase_lsp_prim_minus (ase_lsp_t* lsp, ase_lsp_obj_t* args)
 		{
 			if (body == args) 
 			{
-				ASE_ASSERT (realnum == ase_false);
+				ASE_ASSERT (realnum == ASE_FALSE);
 				ival = ASE_LSP_IVAL(tmp);
 			}
 			else 
@@ -109,15 +109,15 @@ ase_lsp_obj_t* ase_lsp_prim_minus (ase_lsp_t* lsp, ase_lsp_obj_t* args)
 		{
 			if (body == args) 
 			{
-				ASE_ASSERT (realnum == ase_false);
-				realnum = ase_true;
+				ASE_ASSERT (realnum == ASE_FALSE);
+				realnum = ASE_TRUE;
 				rval = ASE_LSP_RVAL(tmp);
 			}
 			else 
 			{
 				if (!realnum) 
 				{
-					realnum = ase_true;
+					realnum = ASE_TRUE;
 					rval = (ase_real_t)ival;
 				}
 				rval = rval - ASE_LSP_RVAL(tmp);
@@ -148,7 +148,7 @@ ase_lsp_obj_t* ase_lsp_prim_mul (ase_lsp_t* lsp, ase_lsp_obj_t* args)
 	ase_lsp_obj_t* body, * tmp;
 	ase_long_t ival = 0;
 	ase_real_t rval = .0;
-	ase_bool_t realnum = ase_false;
+	ase_bool_t realnum = ASE_FALSE;
 
 	ASE_ASSERT (ASE_LSP_TYPE(args) == ASE_LSP_OBJ_CONS);
 
@@ -162,7 +162,7 @@ ase_lsp_obj_t* ase_lsp_prim_mul (ase_lsp_t* lsp, ase_lsp_obj_t* args)
 		{
 			if (body == args) 
 			{
-				ASE_ASSERT (realnum == ase_false);
+				ASE_ASSERT (realnum == ASE_FALSE);
 				ival = ASE_LSP_IVAL(tmp);
 			}
 			else 
@@ -177,15 +177,15 @@ ase_lsp_obj_t* ase_lsp_prim_mul (ase_lsp_t* lsp, ase_lsp_obj_t* args)
 		{
 			if (body == args) 
 			{
-				ASE_ASSERT (realnum == ase_false);
-				realnum = ase_true;
+				ASE_ASSERT (realnum == ASE_FALSE);
+				realnum = ASE_TRUE;
 				rval = ASE_LSP_RVAL(tmp);
 			}
 			else 
 			{
 				if (!realnum) 
 				{
-					realnum = ase_true;
+					realnum = ASE_TRUE;
 					rval = (ase_real_t)ival;
 				}
 				rval = rval * ASE_LSP_RVAL(tmp);
@@ -216,7 +216,7 @@ ase_lsp_obj_t* ase_lsp_prim_div (ase_lsp_t* lsp, ase_lsp_obj_t* args)
 	ase_lsp_obj_t* body, * tmp;
 	ase_long_t ival = 0;
 	ase_real_t rval = .0;
-	ase_bool_t realnum = ase_false;
+	ase_bool_t realnum = ASE_FALSE;
 
 	ASE_ASSERT (ASE_LSP_TYPE(args) == ASE_LSP_OBJ_CONS);
 
@@ -230,7 +230,7 @@ ase_lsp_obj_t* ase_lsp_prim_div (ase_lsp_t* lsp, ase_lsp_obj_t* args)
 		{
 			if (body == args) 
 			{
-				ASE_ASSERT (realnum == ase_false);
+				ASE_ASSERT (realnum == ASE_FALSE);
 				ival = ASE_LSP_IVAL(tmp);
 			}
 			else 
@@ -252,15 +252,15 @@ ase_lsp_obj_t* ase_lsp_prim_div (ase_lsp_t* lsp, ase_lsp_obj_t* args)
 		{
 			if (body == args) 
 			{
-				ASE_ASSERT (realnum == ase_false);
-				realnum = ase_true;
+				ASE_ASSERT (realnum == ASE_FALSE);
+				realnum = ASE_TRUE;
 				rval = ASE_LSP_RVAL(tmp);
 			}
 			else 
 			{
 				if (!realnum) 
 				{
-					realnum = ase_true;
+					realnum = ASE_TRUE;
 					rval = (ase_real_t)ival;
 				}
 				rval = rval / ASE_LSP_RVAL(tmp);
diff --git a/ase/lib/lsp/prim_prog.c b/ase/lib/lsp/prim_prog.c
index 5e45eab8..a0e20f93 100644
--- a/ase/lib/lsp/prim_prog.c
+++ b/ase/lib/lsp/prim_prog.c
@@ -1,10 +1,10 @@
 /*
- * $Id: prim_prog.c 117 2008-03-03 11:20:05Z baconevi $
+ * $Id: prim_prog.c 215 2008-06-19 10:27:37Z baconevi $
  *
  * {License}
  */
 
-#include <ase/lsp/lsp_i.h>
+#include "lsp_i.h"
 
 ase_lsp_obj_t* ase_lsp_prim_prog1 (ase_lsp_t* lsp, ase_lsp_obj_t* args)
 {
diff --git a/ase/lib/lsp/print.c b/ase/lib/lsp/print.c
index 5d0897ad..b287ee67 100644
--- a/ase/lib/lsp/print.c
+++ b/ase/lib/lsp/print.c
@@ -1,10 +1,10 @@
 /*
- * $Id: print.c 117 2008-03-03 11:20:05Z baconevi $
+ * $Id: print.c 215 2008-06-19 10:27:37Z baconevi $
  *
  * {License}
  */
 
-#include <ase/lsp/lsp_i.h>
+#include "lsp_i.h"
 
 #define OUTPUT_STR(lsp,str) \
 	do { \
@@ -116,17 +116,17 @@ static int __print (ase_lsp_t* lsp, const ase_lsp_obj_t* obj, ase_bool_t prt_con
 		case ASE_LSP_OBJ_FUNC:
 			/*OUTPUT_STR (lsp, ASE_T("func"));*/
 			OUTPUT_STR (lsp, ASE_T("(lambda "));
-			if (__print (lsp, ASE_LSP_FFORMAL(obj), ase_true) == -1) return -1;
+			if (__print (lsp, ASE_LSP_FFORMAL(obj), ASE_TRUE) == -1) return -1;
 			OUTPUT_STR (lsp, ASE_T(" "));
-			if (__print (lsp, ASE_LSP_FBODY(obj), ase_false) == -1) return -1;
+			if (__print (lsp, ASE_LSP_FBODY(obj), ASE_FALSE) == -1) return -1;
 			OUTPUT_STR (lsp, ASE_T(")"));
 			break;
 
 		case ASE_LSP_OBJ_MACRO:
 			OUTPUT_STR (lsp, ASE_T("(macro "));
-			if (__print (lsp, ASE_LSP_FFORMAL(obj), ase_true) == -1) return -1;
+			if (__print (lsp, ASE_LSP_FFORMAL(obj), ASE_TRUE) == -1) return -1;
 			OUTPUT_STR (lsp, ASE_T(" "));
-			if (__print (lsp, ASE_LSP_FBODY(obj), ase_false) == -1) return -1;
+			if (__print (lsp, ASE_LSP_FBODY(obj), ASE_FALSE) == -1) return -1;
 			OUTPUT_STR (lsp, ASE_T(")"));
 			break;
 		case ASE_LSP_OBJ_PRIM:
@@ -146,5 +146,5 @@ static int __print (ase_lsp_t* lsp, const ase_lsp_obj_t* obj, ase_bool_t prt_con
 
 int ase_lsp_print (ase_lsp_t* lsp, const ase_lsp_obj_t* obj)
 {
-	return __print (lsp, obj, ase_true);
+	return __print (lsp, obj, ASE_TRUE);
 }
diff --git a/ase/lib/lsp/read.c b/ase/lib/lsp/read.c
index b56aa0a1..d321961f 100644
--- a/ase/lib/lsp/read.c
+++ b/ase/lib/lsp/read.c
@@ -1,10 +1,10 @@
 /*
- * $Id: read.c 117 2008-03-03 11:20:05Z baconevi $
+ * $Id: read.c 215 2008-06-19 10:27:37Z baconevi $
  *
  * {License}
  */
 
-#include <ase/lsp/lsp_i.h>
+#include "lsp_i.h"
 
 #define IS_IDENT(c) \
 	((c) == ASE_T('+') || (c) == ASE_T('-') || \
diff --git a/ase/lib/makefile.in b/ase/lib/makefile.in
index 91e72a19..9dab3f43 100644
--- a/ase/lib/makefile.in
+++ b/ase/lib/makefile.in
@@ -42,7 +42,7 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/inc/ase/cmn/conf_unx.h
+CONFIG_HEADER = $(top_builddir)/include/ase/cmn/conf_unx.h
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
@@ -168,7 +168,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-SUBDIRS = cmn awk utl
+SUBDIRS = cmn awk lsp utl
 DIST_SUBDIRS = $(SUBDIRS) 
 all: all-recursive
 
diff --git a/ase/lib/utl/makefile.in b/ase/lib/utl/makefile.in
index 0a3352ae..622574ee 100644
--- a/ase/lib/utl/makefile.in
+++ b/ase/lib/utl/makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/inc/ase/cmn/conf_unx.h
+CONFIG_HEADER = $(top_builddir)/include/ase/cmn/conf_unx.h
 CONFIG_CLEAN_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -58,7 +58,7 @@ libaseutl_la_LIBADD =
 am_libaseutl_la_OBJECTS = assert.lo ctype.lo getopt.lo http.lo main.lo \
 	stdio.lo
 libaseutl_la_OBJECTS = $(am_libaseutl_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/inc/ase/cmn
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include/ase/cmn
 depcomp = $(SHELL) $(top_srcdir)/autoconf/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -187,7 +187,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AM_CFLAGS = -I$(top_builddir)/inc
+AM_CFLAGS = -I$(top_builddir)/include
 lib_LTLIBRARIES = libaseutl.la
 libaseutl_la_SOURCES = assert.c ctype.c getopt.c http.c main.c stdio.c
 all: all-am
diff --git a/ase/makefile.am b/ase/makefile.am
index b51b0313..27ee99a7 100644
--- a/ase/makefile.am
+++ b/ase/makefile.am
@@ -8,7 +8,7 @@
 AUTOMAKE_OPTION = foreign
 # EXTRA_DIST = 
 
-SUBDIRS = lib
+SUBDIRS = lib cmd
 DIST_SUBDIRS = $(SUBDIRS) include
 
 install-data-hook:
diff --git a/ase/makefile.in b/ase/makefile.in
index 0092e014..2654c9f3 100644
--- a/ase/makefile.in
+++ b/ase/makefile.in
@@ -43,13 +43,11 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(am__configure_deps) $(srcdir)/makefile.am \
-	$(srcdir)/makefile.in $(top_srcdir)/cmd/awk/makefile.in \
-	$(top_srcdir)/cmd/lsp/makefile.in \
-	$(top_srcdir)/cmd/makefile.in $(top_srcdir)/configure \
-	$(top_srcdir)/lib/lsp/makefile.in \
-	$(top_srcdir)/lib/tgp/makefile.in autoconf/config.guess \
-	autoconf/config.sub autoconf/depcomp autoconf/install-sh \
-	autoconf/ltmain.sh autoconf/missing
+	$(srcdir)/makefile.in $(top_srcdir)/cmd/lsp/makefile.in \
+	$(top_srcdir)/configure $(top_srcdir)/lib/tgp/makefile.in \
+	autoconf/compile autoconf/config.guess autoconf/config.sub \
+	autoconf/depcomp autoconf/install-sh autoconf/ltmain.sh \
+	autoconf/missing
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -58,9 +56,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno configure.status.lineno
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/inc/ase/cmn/conf_unx.h
-CONFIG_CLEAN_FILES = lib/lsp/makefile lib/tgp/makefile cmd/makefile \
-	cmd/awk/makefile cmd/lsp/makefile
+CONFIG_HEADER = $(top_builddir)/include/ase/cmn/conf_unx.h
+CONFIG_CLEAN_FILES = lib/tgp/makefile cmd/lsp/makefile
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -197,8 +194,8 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 AUTOMAKE_OPTION = foreign
 # EXTRA_DIST = 
-SUBDIRS = lib
-DIST_SUBDIRS = $(SUBDIRS) inc
+SUBDIRS = lib cmd
+DIST_SUBDIRS = $(SUBDIRS) include
 all: all-recursive
 
 .SUFFIXES:
@@ -235,14 +232,8 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(srcdir) && $(AUTOCONF)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-lib/lsp/makefile: $(top_builddir)/config.status $(top_srcdir)/lib/lsp/makefile.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 lib/tgp/makefile: $(top_builddir)/config.status $(top_srcdir)/lib/tgp/makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-cmd/makefile: $(top_builddir)/config.status $(top_srcdir)/cmd/makefile.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-cmd/awk/makefile: $(top_builddir)/config.status $(top_srcdir)/cmd/awk/makefile.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 cmd/lsp/makefile: $(top_builddir)/config.status $(top_srcdir)/cmd/lsp/makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 
@@ -391,7 +382,7 @@ distclean-tags:
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/autoconf $(distdir)/cmd $(distdir)/cmd/awk $(distdir)/cmd/lsp $(distdir)/lib/lsp $(distdir)/lib/tgp
+	$(mkdir_p) $(distdir)/autoconf $(distdir)/cmd/lsp $(distdir)/lib/tgp
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -633,10 +624,10 @@ uninstall-info: uninstall-info-recursive
 
 
 install-data-hook:
-	cd inc && $(MAKE) install
+	cd include && $(MAKE) install
 
 uninstall-hook:
-	cd inc && $(MAKE) uninstall
+	cd include && $(MAKE) uninstall
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: