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.
	* consolex/Makefile.am: Ditto.
	* include/bsp.h: Include bspopts.h.

6 files changed, 23 insertions, 22 deletions

diff --git a/c/src/lib/libbsp/m68k/mvme162/ChangeLog b/c/src/lib/libbsp/m68k/mvme162/ChangeLog
index a4a3a242c2..66f173f188 100644
--- a/c/src/lib/libbsp/m68k/mvme162/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme162/ChangeLog
@@ -1,3 +1,11 @@
+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.
+	* consolex/Makefile.am: Ditto.
+	* include/bsp.h: Include 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/m68k/mvme162/configure.in b/c/src/lib/libbsp/m68k/mvme162/configure.in
index 23d71c6e21..7ccf431dd4 100644
--- a/c/src/lib/libbsp/m68k/mvme162/configure.in
+++ b/c/src/lib/libbsp/m68k/mvme162/configure.in
@@ -24,6 +24,7 @@ RTEMS_CONFIG_BUILD_SUBDIRS(tools)
 
 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
 
+AM_CONFIG_HEADER(include/bspopts.h)
 RTEMS_PROJECT_ROOT
 
 # Explicitly list all Makefiles here
diff --git a/c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.am
index 6f7f23b0fa..f9b35fce7f 100644
--- a/c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.am
@@ -9,7 +9,7 @@ PGM = $(ARCH)/consolex.rel
 C_FILES = consolex.c
 C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
-H_FILES = consolex.h
+include_HEADERS = consolex.h
 
 OBJS = $(C_O_FILES)
 
@@ -27,10 +27,11 @@ $(PGM): $(OBJS)
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@
 
-$(PROJECT_INCLUDE)/consolex.h: consolex.h
+$(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/consolex.h
+TMPINSTALL_FILES += $(PROJECT_INCLUDE) \
+    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 all-local: $(ARCH) $(OBJS) $(PGM) $(TMPINSTALL_FILES)
 
diff --git a/c/src/lib/libbsp/m68k/mvme162/include/.cvsignore b/c/src/lib/libbsp/m68k/mvme162/include/.cvsignore
index 282522db03..b0be3c54e6 100644
--- a/c/src/lib/libbsp/m68k/mvme162/include/.cvsignore
+++ b/c/src/lib/libbsp/m68k/mvme162/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/mvme162/include/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/include/Makefile.am
index 0ad1e2d953..d8e76da72a 100644
--- a/c/src/lib/libbsp/m68k/mvme162/include/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/include/Makefile.am
@@ -4,32 +4,17 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_FILES = bsp.h coverhd.h mvme16x_hw.h page_table.h tod.h
+include_HEADERS = bsp.h coverhd.h mvme16x_hw.h page_table.h tod.h bspopts.h
 
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@
 
-$(PROJECT_INCLUDE)/bsp.h: bsp.h
+$(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-$(PROJECT_INCLUDE)/coverhd.h: coverhd.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/mvme16x_hw.h: mvme16x_hw.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/page_table.h: page_table.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/tod.h: tod.h
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp.h \
-    $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_INCLUDE)/mvme16x_hw.h \
-    $(PROJECT_INCLUDE)/page_table.h $(PROJECT_INCLUDE)/tod.h
+TMPINSTALL_FILES += $(PROJECT_INCLUDE) \
+    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = bsp.h coverhd.h page_table.h tod.h
-
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h b/c/src/lib/libbsp/m68k/mvme162/include/bsp.h
index 9d4c5d42e5..e0a0646bdd 100644
--- a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mvme162/include/bsp.h
@@ -26,6 +26,8 @@
 extern "C" {
 #endif
 
+#include <bspopts.h>
+
 #include <rtems.h>
 #include <clockdrv.h>
 #include <console.h>