2001-05-10 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* configure.in: Use RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]),
	add bspopts.h.
	* include/.cvsignore: Add stamp-h*, bspopts.h*.
	* include/Makefile.am: Use include_HEADERS instead of H_FILES.
	* include/bsp.h: Add bspopts.h.

5 files changed, 22 insertions, 11 deletions

diff --git a/c/src/lib/libbsp/sh/gensh1/ChangeLog b/c/src/lib/libbsp/sh/gensh1/ChangeLog
index 1f0692f054..9738d8fa28 100644
--- a/c/src/lib/libbsp/sh/gensh1/ChangeLog
+++ b/c/src/lib/libbsp/sh/gensh1/ChangeLog
@@ -1,3 +1,11 @@
+2001-05-10	Ralf Corsepius	<corsepiu@faw.uni-ulm.de>
+
+	* configure.in: Use RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]),
+	add bspopts.h.
+	* include/.cvsignore: Add stamp-h*, bspopts.h*.
+	* include/Makefile.am: Use include_HEADERS instead of H_FILES.
+	* include/bsp.h: Add bspopts.h.
+
 2001-01-26	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* startup/linkcmds: Remove OUTPUT_FORMAT.
diff --git a/c/src/lib/libbsp/sh/gensh1/configure.in b/c/src/lib/libbsp/sh/gensh1/configure.in
index 3b8b964c4d..9a75e5a212 100644
--- a/c/src/lib/libbsp/sh/gensh1/configure.in
+++ b/c/src/lib/libbsp/sh/gensh1/configure.in
@@ -11,7 +11,7 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-sh-gensh1,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_PROG_CC_FOR_TARGET
+RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm])
 RTEMS_CANONICALIZE_TOOLS
 
 RTEMS_ENV_RTEMSBSP
@@ -20,15 +20,15 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
 RTEMS_CANONICAL_HOST
 
 ## bsp-specific options
-## setup environment variable
 CPU_CLOCK_RATE_HZ=${CPU_CLOCK_RATE_HZ-20000000}
+AC_DEFINE_UNQUOTED([CPU_CLOCK_RATE_HZ],
+  [$CPU_CLOCK_RATE_HZ],
+  [cpu clock rate in HZ])
 
-## Propagate options to Makefile.ams
+## Used in scitab/Makefile.am
 AC_SUBST(CPU_CLOCK_RATE_HZ)
 
-## Propagate options to compilation options/auto config headers
-AC_DEFINE_UNQUOTED([CPU_CLOCK_RATE_HZ],[$CPU_CLOCK_RATE_HZ],[cpu clock rate in HZ])
-
+AM_CONFIG_HEADER(include/bspopts.h)
 RTEMS_PROJECT_ROOT
 
 # Explicitly list all Makefiles here
diff --git a/c/src/lib/libbsp/sh/gensh1/include/.cvsignore b/c/src/lib/libbsp/sh/gensh1/include/.cvsignore
index 282522db03..450eb3c37d 100644
--- a/c/src/lib/libbsp/sh/gensh1/include/.cvsignore
+++ b/c/src/lib/libbsp/sh/gensh1/include/.cvsignore
@@ -1,2 +1,6 @@
 Makefile
 Makefile.in
+stamp-h
+stamp-h.in
+bspopts.h
+bspopts.h.in
diff --git a/c/src/lib/libbsp/sh/gensh1/include/Makefile.am b/c/src/lib/libbsp/sh/gensh1/include/Makefile.am
index 3f061aa216..5def55f2de 100644
--- a/c/src/lib/libbsp/sh/gensh1/include/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh1/include/Makefile.am
@@ -4,7 +4,7 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_FILES = bsp.h coverhd.h
+include_HEADERS = bsp.h bspopts.h coverhd.h
 
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@
@@ -12,10 +12,8 @@ $(PROJECT_INCLUDE):
 $(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h)
+PREINSTALL_FILES += $(PROJECT_INCLUDE) $(include_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
 
 all-local: $(PREINSTALL_FILES)
 
-EXTRA_DIST = bsp.h coverhd.h
-
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/sh/gensh1/include/bsp.h b/c/src/lib/libbsp/sh/gensh1/include/bsp.h
index d5c9d31271..ec4b4df4a1 100644
--- a/c/src/lib/libbsp/sh/gensh1/include/bsp.h
+++ b/c/src/lib/libbsp/sh/gensh1/include/bsp.h
@@ -34,6 +34,8 @@ extern "C" {
 #include <clockdrv.h>
 #include <console.h>
 
+#include <bspopts.h>
+
 /*
  *  confdefs.h overrides for this BSP:
  *   - number of termios serial ports (defaults to 1)
@@ -54,7 +56,6 @@ extern "C" {
 #define BSP_CONSOLE_DRIVER_TABLE_ENTRY DEVSCI_DRIVER_TABLE_ENTRY
 #endif
 
-
 /*
  *  Define the time limits for RTEMS Test Suite test durations.
  *  Long test and short test duration limits are provided.  These