3 files changed, 13 insertions, 23 deletions
diff --git a/c/src/lib/libbsp/m68k/mvme167/include/.cvsignore b/c/src/lib/libbsp/m68k/mvme167/include/.cvsignore
index 282522db03..b0be3c54e6 100644
--- a/c/src/lib/libbsp/m68k/mvme167/include/.cvsignore
+++ b/c/src/lib/libbsp/m68k/mvme167/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/mvme167/include/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/include/Makefile.am
index 691f3c4174..54521c75f1 100644
--- a/c/src/lib/libbsp/m68k/mvme167/include/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme167/include/Makefile.am
@@ -4,37 +4,21 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_FILES = bsp.h coverhd.h $(srcdir)/../../mvme162/include/mvme16x_hw.h \
-    page_table.h fatal.h
+include_HEADERS = bsp.h coverhd.h mvme16x_hw.h page_table.h fatal.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)/fatal.h: fatal.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/mvme16x_hw.h: \
-    $(srcdir)/../../mvme162/include/mvme16x_hw.h
-	$(INSTALL_DATA) $< $@
+mvme16x_hw.h: $(srcdir)/../../mvme162/include/mvme16x_hw.h
+	cp $< $@
+CLEANFILES += mvme16x_hw.h
 
-$(PROJECT_INCLUDE)/page_table.h: page_table.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/fatal.h: fatal.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)/fatal.h
+TMPINSTALL_FILES += $(PROJECT_INCLUDE) \
+    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 all: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = bsp.h coverhd.h fatal.h page_table.h
-
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h b/c/src/lib/libbsp/m68k/mvme167/include/bsp.h
index 1efd026213..e2f0db1eaf 100644
--- a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mvme167/include/bsp.h
@@ -26,6 +26,8 @@
 extern "C" {
 #endif
 
+#include <bspopts.h>
+
 #include <rtems.h>
 #include <clockdrv.h>
 #include <console.h>