From ebf3adc76f5b79d58191185440d843d72376b013 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Thu, 14 Jun 2001 12:43:18 +0000
Subject: 2001-05-26	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* configure.in: Add bspopts.h.
	* include/.cvsignore: Add bspopts.h*, stamp-h*.
	* include/Makefile.am: Use *_HEADERS instead of *H_FILES.
	* include/bsp.h: Include bspopts.h.
---
 c/src/lib/libbsp/m68k/gen68340/include/.cvsignore  |  4 +++
 c/src/lib/libbsp/m68k/gen68340/include/Makefile.am | 30 ++++------------------
 c/src/lib/libbsp/m68k/gen68340/include/bsp.h       |  2 ++
 3 files changed, 11 insertions(+), 25 deletions(-)

(limited to 'c/src/lib/libbsp/m68k/gen68340/include')

diff --git a/c/src/lib/libbsp/m68k/gen68340/include/.cvsignore b/c/src/lib/libbsp/m68k/gen68340/include/.cvsignore
index 282522db03..b0be3c54e6 100644
--- a/c/src/lib/libbsp/m68k/gen68340/include/.cvsignore
+++ b/c/src/lib/libbsp/m68k/gen68340/include/.cvsignore
@@ -1,2 +1,6 @@
 Makefile
 Makefile.in
+bspopts.h
+bspopts.h.in
+stamp-h
+stamp-h.in
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/include/Makefile.am
index 8bf11a4ce6..a718f5b9e2 100644
--- a/c/src/lib/libbsp/m68k/gen68340/include/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68340/include/Makefile.am
@@ -4,41 +4,21 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_FILES = bsp.h coverhd.h m340uart.h m340timer.h m68340.h m68340.inc \
+include_HEADERS = bsp.h coverhd.h m340uart.h m340timer.h m68340.h m68340.inc \ bspopts.h
     m68349.inc
 
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@
 
-$(PROJECT_INCLUDE)/bsp.h: bsp.h
+$(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-$(PROJECT_INCLUDE)/coverhd.h: coverhd.h
+$(PROJECT_INCLUDE)/%.inc: %.inc
 	$(INSTALL_DATA) $< $@
 
-$(PROJECT_INCLUDE)/m340uart.h: m340uart.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/m340timer.h: m340timer.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/m68340.h: m68340.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/m68340.inc: m68340.inc
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/m68349.inc: m68349.inc
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp.h \
-    $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_INCLUDE)/m340uart.h \
-    $(PROJECT_INCLUDE)/m340timer.h $(PROJECT_INCLUDE)/m68340.h \
-    $(PROJECT_INCLUDE)/m68340.inc $(PROJECT_INCLUDE)/m68349.inc
+TMPINSTALL_FILES += $(PROJECT_INCLUDE) \
+    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = bsp.h coverhd.h m340timer.h m340uart.h m68340.h m68340.inc \
-    m68349.inc
-
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h b/c/src/lib/libbsp/m68k/gen68340/include/bsp.h
index 657b3d5a48..94906a7066 100644
--- a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/gen68340/include/bsp.h
@@ -24,6 +24,8 @@
 extern "C" {
 #endif
 
+#include <bspopts.h>
+
 #include <rtems.h>
 #include <console.h>
 #include <iosupp.h>
-- 
cgit v1.2.3