From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 12 Jun 2000 15:00:15 +0000
Subject: Merged from 4.5.0-beta3a

---
 testsuites/samples/hello/Makefile.am |  2 --
 testsuites/samples/hello/init.c      |  2 +-
 testsuites/samples/hello/system.h    | 12 ++++++------
 3 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'testsuites/samples/hello')

diff --git a/testsuites/samples/hello/Makefile.am b/testsuites/samples/hello/Makefile.am
index 8f3ec339ab..9dfe2bafac 100644
--- a/testsuites/samples/hello/Makefile.am
+++ b/testsuites/samples/hello/Makefile.am
@@ -23,8 +23,6 @@ OBJS = $(C_O_FILES)
 
 PRINT_SRCS = $(DOCS)
 
-PGM = ${ARCH}/$(SAMPLE).exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/sample.am
diff --git a/testsuites/samples/hello/init.c b/testsuites/samples/hello/init.c
index 344617d598..adda41cd20 100644
--- a/testsuites/samples/hello/init.c
+++ b/testsuites/samples/hello/init.c
@@ -20,7 +20,7 @@
  *  $Id$
  */
 
-#define TEST_INIT
+#define CONFIGURE_INIT
 #include "system.h"
 #include <stdio.h>
 
diff --git a/testsuites/samples/hello/system.h b/testsuites/samples/hello/system.h
index d27a884301..79a57713d0 100644
--- a/testsuites/samples/hello/system.h
+++ b/testsuites/samples/hello/system.h
@@ -13,7 +13,7 @@
  *  $Id$
  */
 
-#include <tmacros.h>
+#include <rtems.h>
 
 /* functions */
 
@@ -23,7 +23,11 @@ rtems_task Init(
 
 /* configuration information */
 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#include <bsp.h> /* for device driver prototypes */
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS            1
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
@@ -31,8 +35,4 @@ rtems_task Init(
 
 #include <confdefs.h>
 
-/* global variables */
-
-TEST_EXTERN rtems_id Global_variable;   /* example global variable     */
-
 /* end of include file */
-- 
cgit v1.2.3