6 files changed, 36 insertions, 10 deletions
diff --git a/c/src/lib/libbsp/arm/vegaplus/ChangeLog b/c/src/lib/libbsp/arm/vegaplus/ChangeLog
index 966cd12596..2c60be863e 100644
--- a/c/src/lib/libbsp/arm/vegaplus/ChangeLog
+++ b/c/src/lib/libbsp/arm/vegaplus/ChangeLog
@@ -1,3 +1,11 @@
+2001-05-22	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.in: Add include/bspopts.h.
+	* irq/Makefile.am: Use *_HEADERS instead of *H_FILES.
+	* include/.cvsignore: Add bspopts.h*, coverhd.h, stamp-h*.
+	* include/Makefile.am: Add bspopts.h, Use *_HEADER instead of *H_FILES. 
+        * include/bsp.h: Add bspopts.h.
+
 2001-05-10	Ralf Corsepius	<corsepiu@faw.uni-ulm.de>
 
 	* configure.in: Use RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]).
diff --git a/c/src/lib/libbsp/arm/vegaplus/configure.in b/c/src/lib/libbsp/arm/vegaplus/configure.in
index d838c789ca..0d629c7682 100644
--- a/c/src/lib/libbsp/arm/vegaplus/configure.in
+++ b/c/src/lib/libbsp/arm/vegaplus/configure.in
@@ -19,6 +19,7 @@ RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
 RTEMS_CANONICAL_HOST
 
+AM_CONFIG_HEADER(include/bspopts.h)
 RTEMS_PROJECT_ROOT
 
 # Explicitly list all Makefiles here
diff --git a/c/src/lib/libbsp/arm/vegaplus/include/.cvsignore b/c/src/lib/libbsp/arm/vegaplus/include/.cvsignore
index 282522db03..bb9dfabd50 100644
--- a/c/src/lib/libbsp/arm/vegaplus/include/.cvsignore
+++ b/c/src/lib/libbsp/arm/vegaplus/include/.cvsignore
@@ -1,2 +1,8 @@
 Makefile
 Makefile.in
+coverhd.h
+bspopts.h
+bspopts.h.in
+stamp-h
+stamp-h.in
+
diff --git a/c/src/lib/libbsp/arm/vegaplus/include/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/include/Makefile.am
index d235103c8a..9fec3b64a6 100644
--- a/c/src/lib/libbsp/arm/vegaplus/include/Makefile.am
+++ b/c/src/lib/libbsp/arm/vegaplus/include/Makefile.am
@@ -4,7 +4,13 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_FILES = bsp.h registers.h ../../../shared/include/coverhd.h
+include_HEADERS = bsp.h registers.h coverhd.h bspopts.h
+
+coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h
+	cp $< $@
+
+CLEANFILES += coverhd.h
+
 
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@
@@ -12,14 +18,9 @@ $(PROJECT_INCLUDE):
 $(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-$(PROJECT_INCLUDE)/coverhd.h: ../../../shared/include/coverhd.h
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp.h \
-    $(PROJECT_INCLUDE)/registers.h $(PROJECT_INCLUDE)/coverhd.h
+TMPINSTALL_FILES += $(PROJECT_INCLUDE) \
+    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = bsp.h registers.h
-
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/arm/vegaplus/include/bsp.h b/c/src/lib/libbsp/arm/vegaplus/include/bsp.h
index ccef847437..b5758b09c5 100644
--- a/c/src/lib/libbsp/arm/vegaplus/include/bsp.h
+++ b/c/src/lib/libbsp/arm/vegaplus/include/bsp.h
@@ -22,6 +22,8 @@
 extern "C" {
 #endif
 
+#include <bspopts.h>
+
 #include <rtems.h>
 #include <iosupp.h>
 #include <console.h>
diff --git a/c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am
index 8a8dd2c93d..8061902b3f 100644
--- a/c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am
+++ b/c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am
@@ -14,7 +14,7 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 S_FILES = irq_asm.S bsp_irq_asm.S
 S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
 
-H_FILES = irq.h
+include_HEADERS = irq.h
 
 OBJS = $(C_O_FILES) $(S_O_FILES)
 
@@ -28,6 +28,14 @@ include $(top_srcdir)/../../../../../../automake/lib.am
 
 AM_CPPFLAGS += -I$(srcdir)
 
+$(PROJECT_INCLUDE):
+	$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
+
 $(PGM): $(OBJS)
 	$(make-rel)
 
@@ -37,6 +45,6 @@ all-local: $(ARCH) $(OBJS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
-EXTRA_DIST = bsp_irq_asm.S bsp_irq_init.c irq.c irq.h
+EXTRA_DIST = bsp_irq_asm.S bsp_irq_init.c irq.c
 
 include $(top_srcdir)/../../../../../../automake/local.am