From 49ed8e775846ec69a1100c7d5ae26b0d68cf6db8 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Tue, 16 Oct 2001 18:50:03 +0000
Subject: 2001-10-16	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* include/zilog/Makefile.am: Remove.
	* include/motorola/Makefile.am: Remove.
	* include/sys/Makefile.am: Remove.
	* include/rtems/Makefile.am: Remove.
	* include/Makefile.am: Handle subdirs, require automake-1.5
	* Makefile.am: Require automake-1.5.
---
 c/src/lib/libbsp/i960/cvme961/console/console.c   | 2 --
 c/src/lib/libbsp/i960/cvme961/startup/bspstart.c  | 2 ++
 c/src/lib/libbsp/i960/rxgen960/include/bsp.h      | 7 +------
 c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c | 2 ++
 4 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'c/src/lib/libbsp')

diff --git a/c/src/lib/libbsp/i960/cvme961/console/console.c b/c/src/lib/libbsp/i960/cvme961/console/console.c
index adad20aa61..823a6dc7dc 100644
--- a/c/src/lib/libbsp/i960/cvme961/console/console.c
+++ b/c/src/lib/libbsp/i960/cvme961/console/console.c
@@ -11,8 +11,6 @@
  *  $Id$
  */
 
-#define C961_INIT
-
 #include <bsp.h>
 #include <rtems/libio.h>
 
diff --git a/c/src/lib/libbsp/i960/cvme961/startup/bspstart.c b/c/src/lib/libbsp/i960/cvme961/startup/bspstart.c
index 4b41718767..6a4e7b8891 100644
--- a/c/src/lib/libbsp/i960/cvme961/startup/bspstart.c
+++ b/c/src/lib/libbsp/i960/cvme961/startup/bspstart.c
@@ -16,6 +16,8 @@
 
 #include <string.h>
 
+#define C961_INIT
+
 #include <bsp.h>
 #include <rtems/libio.h>
 #include <rtems/libcsupport.h>
diff --git a/c/src/lib/libbsp/i960/rxgen960/include/bsp.h b/c/src/lib/libbsp/i960/rxgen960/include/bsp.h
index b04766eef4..4a43d7bbf4 100644
--- a/c/src/lib/libbsp/i960/rxgen960/include/bsp.h
+++ b/c/src/lib/libbsp/i960/rxgen960/include/bsp.h
@@ -112,18 +112,13 @@ static inline i960_PRCB *get_prcb( void )
   return ( _prcb );
 }
 
-/*
-#ifdef C961_INIT
+#ifdef RXGEN960_INIT
 #undef BSP_EXTERN
 #define BSP_EXTERN
 #else
 #undef BSP_EXTERN
 #define BSP_EXTERN extern
 #endif
-*/
-
-#undef BSP_EXTERN
-#define BSP_EXTERN
 
 /* miscellaneous stuff assumed to exist */
 
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c b/c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c
index 4bca631e80..83dac2ec2a 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c
@@ -23,6 +23,8 @@
 #include <fcntl.h>
 #include <stdio.h>
  
+#define RXGEN960_INIT
+
 #include <bsp.h>
 #include <rtems/libio.h>
 #include <rtems/libcsupport.h>
-- 
cgit v1.2.3