2004-02-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* configure.ac: Rework. Make package a host compiled package.
	* Makefile.am: Ditto.

6 files changed, 20 insertions, 33 deletions

diff --git a/testsuites/tools/ChangeLog b/testsuites/tools/ChangeLog
index f5f87236fa..373e1add55 100644
--- a/testsuites/tools/ChangeLog
+++ b/testsuites/tools/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Rework. Make package a host compiled package.
+	* Makefile.am: Ditto.
+
 2003-12-12	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Require automake >= 1.8, autoconf >= 2.59.
diff --git a/testsuites/tools/Makefile.am b/testsuites/tools/Makefile.am
index 7cf37c8efc..3a7fd41163 100644
--- a/testsuites/tools/Makefile.am
+++ b/testsuites/tools/Makefile.am
@@ -2,9 +2,9 @@
 ## $Id$
 ##
 
-ACLOCAL_AMFLAGS = -I ../aclocal
+ACLOCAL_AMFLAGS = -I ../../aclocal
 
 SUBDIRS = @subdirs@
 
-include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/host.am
+include $(top_srcdir)/../../automake/subdirs.am
+include $(top_srcdir)/../../automake/host.am
diff --git a/testsuites/tools/configure.ac b/testsuites/tools/configure.ac
index 6de7aafb67..78222b9564 100644
--- a/testsuites/tools/configure.ac
+++ b/testsuites/tools/configure.ac
@@ -15,7 +15,7 @@ AM_MAINTAINER_MODE
 RTEMS_TOOLPATHS
 AC_SUBST(program_prefix)
 
-RTEMS_CONFIG_BUILD_SUBDIRS(generic)
+AC_CONFIG_SUBDIRS(generic)
 RTEMS_CPU_SUBDIRS
 
 # Explicitly list all Makefiles here
diff --git a/testsuites/tools/generic/ChangeLog b/testsuites/tools/generic/ChangeLog
index 655e256ca7..6616171361 100644
--- a/testsuites/tools/generic/ChangeLog
+++ b/testsuites/tools/generic/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Rework. Make package a host compiled package.
+	* Makefile.am: Ditto.
+
 2004-01-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES.
diff --git a/testsuites/tools/generic/Makefile.am b/testsuites/tools/generic/Makefile.am
index 3ee7c28328..6591bf76de 100644
--- a/testsuites/tools/generic/Makefile.am
+++ b/testsuites/tools/generic/Makefile.am
@@ -2,30 +2,8 @@
 ##  $Id$
 ##
 
-ACLOCAL_AMFLAGS = -I ../../aclocal
+ACLOCAL_AMFLAGS = -I ../../../aclocal
 
-transform =
+bin_SCRIPTS = difftest sorttimes
 
-bsptools_bindir = ${exec_prefix}/@RTEMS_BSP@/tests
-bsptools_bin_SCRIPTS = difftest sorttimes
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-
-$(PROJECT_ROOT)/@RTEMS_BSP@/tests/$(dirstamp):
-	@$(mkdir_p) $(PROJECT_ROOT)/@RTEMS_BSP@/tests
-	@: > $(PROJECT_ROOT)/@RTEMS_BSP@/tests/$(dirstamp)
-TMPINSTALL_FILES += $(PROJECT_ROOT)/@RTEMS_BSP@/tests/$(dirstamp)
-
-$(PROJECT_ROOT)/@RTEMS_BSP@/tests/difftest: difftest $(PROJECT_ROOT)/@RTEMS_BSP@/tests/$(dirstamp)
-	$(INSTALL_SCRIPT) $< $(PROJECT_ROOT)/@RTEMS_BSP@/tests/difftest
-TMPINSTALL_FILES += $(PROJECT_ROOT)/@RTEMS_BSP@/tests/difftest
-
-$(PROJECT_ROOT)/@RTEMS_BSP@/tests/sorttimes: sorttimes $(PROJECT_ROOT)/@RTEMS_BSP@/tests/$(dirstamp)
-	$(INSTALL_SCRIPT) $< $(PROJECT_ROOT)/@RTEMS_BSP@/tests/sorttimes
-TMPINSTALL_FILES += $(PROJECT_ROOT)/@RTEMS_BSP@/tests/sorttimes
-
-CLEANFILES = $(TMPINSTALL_FILES)
-
-include $(top_srcdir)/../../automake/local.am
+include $(top_srcdir)/../../../automake/host.am
diff --git a/testsuites/tools/generic/configure.ac b/testsuites/tools/generic/configure.ac
index 17bbe5c354..29e4b4b038 100644
--- a/testsuites/tools/generic/configure.ac
+++ b/testsuites/tools/generic/configure.ac
@@ -11,13 +11,12 @@ RTEMS_CANONICAL_TARGET_CPU
 
 AM_INIT_AUTOMAKE([no-define foreign 1.8])
 AM_MAINTAINER_MODE
-# Override the set of BSPs to be built.
-
-RTEMS_ENV_RTEMSBSP
-RTEMS_PROJECT_ROOT
 
 RTEMS_PATH_KSH
 
+RTEMS_TOOLPATHS
+AC_SUBST(program_prefix)
+
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile
 difftest