--- a/host/libcdl/Makefile.in
+++ b/host/libcdl/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 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.
@@ -10,8 +10,27 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-######COPYRIGHTBEGIN####
-######COPYRIGHTEND####
+#######ECOSHOSTGPLCOPYRIGHTBEGIN####
+# Copyright (C) 2002 Bart Veer
+# Copyright (C) 1998, 1999, 2000, 2001 Red Hat, Inc.
+#
+# This file is part of the eCos host tools.
+#
+# This program is free software; you can redistribute it and/or modify it 
+# under the terms of the GNU General Public License as published by the Free 
+# Software Foundation; either version 2 of the License, or (at your option) 
+# any later version.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT 
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
+# more details.
+# 
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 
+# 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+#######ECOSHOSTGPLCOPYRIGHTEND####
 #######DESCRIPTIONBEGIN####
 ######DESCRIPTIONEND####
 
@@ -66,45 +85,76 @@ host_alias = @host_alias@
 host_triplet = @host@
 CC = @CC@
 CXX = @CXX@
+ECOS_REPOSITORY = @ECOS_REPOSITORY@
 EXEEXT = @EXEEXT@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MSVC_SRCDIR = @MSVC_SRCDIR@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_DIR = @PACKAGE_DIR@
+PACKAGE_INSTALL = @PACKAGE_INSTALL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
-cyg_CFLAGS = @cyg_CFLAGS@
-cyg_CXXFLAGS = @cyg_CXXFLAGS@
-cyg_ac_infra_incdir = @cyg_ac_infra_incdir@
-cyg_ac_infra_libdir = @cyg_ac_infra_libdir@
-cyg_ac_tcl_incdir = @cyg_ac_tcl_incdir@
-cyg_ac_tcl_libdir = @cyg_ac_tcl_libdir@
-cyg_ac_tcl_libs = @cyg_ac_tcl_libs@
-cyg_ac_tcl_version = @cyg_ac_tcl_version@
-cyg_ac_tk_libs = @cyg_ac_tk_libs@
+ecos_CFLAGS = @ecos_CFLAGS@
+ecos_CXXFLAGS = @ecos_CXXFLAGS@
+ecos_INCLUDES = @ecos_INCLUDES@
+ecos_LDADD = @ecos_LDADD@
+ecos_LIBS = @ecos_LIBS@
+ecos_infra_libdir = @ecos_infra_libdir@
+ecos_libcdl_incdir = @ecos_libcdl_incdir@
+ecos_libcdl_libdir = @ecos_libcdl_libdir@
+ecos_tk_libs = @ecos_tk_libs@
 
-AUTOMAKE_OPTIONS = 1.3 cygnus
+AUTOMAKE_OPTIONS = 1.3 foreign
 SUBDIRS = testsuite
 
-INCLUDES = @INCLUDES@
-AM_CFLAGS = @cyg_CFLAGS@
-AM_CXXFLAGS = @cyg_CXXFLAGS@
+INCLUDES = @ecos_INCLUDES@
+LIBS = @ecos_LIBS@ @ecos_LDADD@
+AM_CFLAGS = @ecos_CFLAGS@
+AM_CXXFLAGS = @ecos_CXXFLAGS@
+ecos_infra_incdir = @ecos_infra_incdir@
 
 include_HEADERS = cdlcore.hxx cdl.hxx
 
-sources := interp.cxx	               expr.cxx                    func.cxx	               refer.cxx                   cdlmisc.cxx                 conflict.cxx                property.cxx                parse.cxx                   base.cxx                    value.cxx                   build.cxx	               dialog.cxx                  wizard.cxx                  interface.cxx               transact.cxx                infer.cxx                   database.cxx                config.cxx                  package.cxx                 component.cxx               option.cxx
+sources := interp.cxx	    \
+           expr.cxx         \
+           func.cxx	    \
+           refer.cxx        \
+           cdlmisc.cxx      \
+           conflict.cxx     \
+           property.cxx     \
+           parse.cxx        \
+           base.cxx         \
+           value.cxx        \
+           build.cxx	    \
+           dialog.cxx       \
+           wizard.cxx       \
+           interface.cxx    \
+           transact.cxx     \
+           infer.cxx        \
+           database.cxx     \
+           config.cxx       \
+           package.cxx      \
+           component.cxx    \
+           option.cxx
 
 
 noinst_LIBRARIES = libcdl.a
 libcdl_a_SOURCES = $(sources)
 
-infra_headers := $(cyg_ac_infra_incdir)/cyg/infra/cyg_ass.h                   $(cyg_ac_infra_incdir)/cyg/infra/cyg_trac.h                  $(cyg_ac_infra_incdir)/pkgconf/infra.h                       $(cyg_ac_infra_incdir)/pkgconf/hostinfra.h                   $(cyg_ac_infra_incdir)/cyg/infra/cyg_type.h
+infra_headers := $(ecos_infra_incdir)/cyg/infra/cyg_ass.h  \
+                 $(ecos_infra_incdir)/cyg/infra/cyg_trac.h \
+                 $(ecos_infra_incdir)/pkgconf/infra.h      \
+                 $(ecos_infra_incdir)/pkgconf/hostinfra.h  \
+                 $(ecos_infra_incdir)/cyg/infra/cyg_type.h
 
 
 cdlcore_headers := cdlconfig.h cdlcore.hxx
 cdl_headers := $(cdlcore_headers) cdl.hxx
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
+mkinstalldirs = $(SHELL) $(top_srcdir)/../../acsupport/mkinstalldirs
 CONFIG_HEADER = cdlconfig.h
 CONFIG_CLEAN_FILES = 
 LIBRARIES =  $(noinst_LIBRARIES)
@@ -113,7 +163,6 @@ LIBRARIES =  $(noinst_LIBRARIES)
 DEFS = @DEFS@ -I. -I$(srcdir) -I.
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
 libcdl_a_LIBADD = 
 libcdl_a_OBJECTS =  interp.$(OBJEXT) expr.$(OBJEXT) func.$(OBJEXT) \
 refer.$(OBJEXT) cdlmisc.$(OBJEXT) conflict.$(OBJEXT) property.$(OBJEXT) \
@@ -136,6 +185,12 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(
 
 TAR = gtar
 GZIP_ENV = --best
+DEP_FILES =  .deps/base.P .deps/build.P .deps/cdlmisc.P \
+.deps/component.P .deps/config.P .deps/conflict.P .deps/database.P \
+.deps/dialog.P .deps/expr.P .deps/func.P .deps/infer.P \
+.deps/interface.P .deps/interp.P .deps/option.P .deps/package.P \
+.deps/parse.P .deps/property.P .deps/refer.P .deps/transact.P \
+.deps/value.P .deps/wizard.P
 SOURCES = $(libcdl_a_SOURCES)
 OBJECTS = $(libcdl_a_OBJECTS)
 
@@ -143,9 +198,9 @@ all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .cxx .o .obj .s
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -194,9 +249,6 @@ distclean-noinstLIBRARIES:
 
 maintainer-clean-noinstLIBRARIES:
 
-.c.o:
-	$(COMPILE) -c $<
-
 # FIXME: We should only use cygpath when building on Windows,
 # and only if it is available.
 .c.obj:
@@ -253,7 +305,7 @@ uninstall-includeHEADERS:
 @SET_MAKE@
 
 all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive install-info-recursive \
+installdirs-recursive install-recursive uninstall-recursive  \
 check-recursive installcheck-recursive info-recursive dvi-recursive:
 	@set fnord $(MAKEFLAGS); amf=$$2; \
 	dot_seen=no; \
@@ -279,7 +331,7 @@ maintainer-clean-recursive:
 	dot_seen=no; \
 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
 	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
+	  test "$$subdir" != "." || dot_seen=yes; \
 	done; \
 	test "$$dot_seen" = "no" && rev=". $$rev"; \
 	target=`echo $@ | sed s/-recursive//`; \
@@ -370,8 +422,13 @@ distdir: $(DISTFILES)
 	-rm -rf $(distdir)
 	mkdir $(distdir)
 	-chmod 777 $(distdir)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile
 	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
 	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
@@ -390,16 +447,65 @@ distdir: $(DISTFILES)
 	      || exit 1; \
 	  fi; \
 	done
+
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+	-rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
+
+%.o: %.cxx
+	@echo '$(CXXCOMPILE) -c $<'; \
+	$(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.cxx
+	@echo '$(LTCXXCOMPILE) -c $<'; \
+	$(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
 info-am:
 info: info-recursive
 dvi-am:
 dvi: dvi-recursive
-check-am:
+check-am: all-am
 check: check-recursive
 installcheck-am:
 installcheck: installcheck-recursive
-install-info-am: 
-install-info: install-info-recursive
 all-recursive-am: cdlconfig.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -433,18 +539,19 @@ distclean-generic:
 
 maintainer-clean-generic:
 mostlyclean-am:  mostlyclean-hdr mostlyclean-noinstLIBRARIES \
-		mostlyclean-compile mostlyclean-tags \
+		mostlyclean-compile mostlyclean-tags mostlyclean-depend \
 		mostlyclean-generic
 
 mostlyclean: mostlyclean-recursive
 
 clean-am:  clean-hdr clean-noinstLIBRARIES clean-compile clean-tags \
-		clean-generic mostlyclean-am clean-local
+		clean-depend clean-generic mostlyclean-am clean-local
 
 clean: clean-recursive
 
 distclean-am:  distclean-hdr distclean-noinstLIBRARIES distclean-compile \
-		distclean-tags distclean-generic clean-am
+		distclean-tags distclean-depend distclean-generic \
+		clean-am
 
 distclean: distclean-recursive
 	-rm -f config.status
@@ -452,7 +559,8 @@ distclean: distclean-recursive
 maintainer-clean-am:  maintainer-clean-hdr \
 		maintainer-clean-noinstLIBRARIES \
 		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
+		maintainer-clean-depend maintainer-clean-generic \
+		distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
@@ -470,13 +578,15 @@ uninstalldirs-recursive all-recursive ch
 installcheck-recursive info-recursive dvi-recursive \
 mostlyclean-recursive distclean-recursive clean-recursive \
 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-info-am \
-install-info all-recursive-am install-exec-local install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-local all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+distclean-tags clean-tags maintainer-clean-tags distdir \
+mostlyclean-depend distclean-depend clean-depend \
+maintainer-clean-depend info-am info dvi-am dvi check check-am \
+installcheck-am installcheck all-recursive-am install-exec-local \
+install-exec-am install-exec install-data-am install-data install-am \
+install uninstall-am uninstall all-local all-redirect all-am all \
+installdirs-am installdirs mostlyclean-generic distclean-generic \
+clean-generic maintainer-clean-generic clean mostlyclean distclean \
+maintainer-clean
 
 
 @MSVC_TRUE@all-local: cdl.lib