--- a/host/infra/Makefile.am
+++ b/host/infra/Makefile.am
@@ -6,30 +6,29 @@
 ##     Host side implementation of the eCos infrastructure
 ##
 ## =====================================================================
-######COPYRIGHTBEGIN####
-##                                                                          
+#######ECOSHOSTGPLCOPYRIGHTBEGIN####
 ## ----------------------------------------------------------------------------
-## 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.
-##
+# 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.
+#
 ## ----------------------------------------------------------------------------
-##                                                                          
-######COPYRIGHTEND####
+#######ECOSHOSTGPLCOPYRIGHTEND####
 ## =====================================================================
 #######DESCRIPTIONBEGIN####
 ##
@@ -41,7 +40,7 @@
 ######DESCRIPTIONEND####
 ## =====================================================================
 
-AUTOMAKE_OPTIONS = 1.3 cygnus
+AUTOMAKE_OPTIONS = 1.3 foreign
 SUBDIRS          = testsuite
 
 ## The generated makefile is responsible for the following:
@@ -75,8 +74,10 @@ libcyginfra_a_SOURCES = assert.cxx    \
                         testcase.cxx
 
 ## Pick up compiler flags etc. from configury
-AM_CFLAGS	= @cyg_CFLAGS@
-AM_CXXFLAGS	= @cyg_CXXFLAGS@
+INCLUDES	= @ecos_INCLUDES@
+LIBS		= @ecos_LIBS@ @ecos_LDADD@
+AM_CFLAGS	= @ecos_CFLAGS@
+AM_CXXFLAGS	= @ecos_CXXFLAGS@
 
 if MSVC
 all-local: cyginfra.lib
@@ -112,8 +113,7 @@ copies = cyg/infra/cyg_type.h \
          cyg/infra/testcase.h \
          cyg/hal/basetype.h   \
          pkgconf/infra.h      \
-         pkgconf/hostinfra.h  \
-         hosttest.exp
+         pkgconf/hostinfra.h
 
 ## The headers are not installed as part of the default install
 ## target, instead a data hook is used. This avoids problems when the
@@ -176,11 +176,6 @@ cyg/hal/basetype.h : basetype.h
 	$(INSTALL_DATA) $(<) $(@)
 
 ## ----------------------------------------------------------------------------
-## Add a rule for exporting hosttest.exp
-dejagnudir = $(prefix)/share/dejagnu
-dejagnu_DATA = hosttest.exp
-
-## ----------------------------------------------------------------------------
 ## Add specific dependencies for all source files
 
 assert.$(OBJEXT) :  Makefile \