3 files changed, 18 insertions, 17 deletions
diff --git a/c/src/lib/libbsp/powerpc/dmv177/include/.cvsignore b/c/src/lib/libbsp/powerpc/dmv177/include/.cvsignore
index 282522db03..b031ef8051 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/include/.cvsignore
+++ b/c/src/lib/libbsp/powerpc/dmv177/include/.cvsignore
@@ -1,2 +1,8 @@
 Makefile
 Makefile.in
+coverhd.h
+tod.h
+bspopts.h
+bspopts.h.in
+stamp-h
+stamp-h.in
diff --git a/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.am
index 2497acacad..518d66a5ff 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.am
@@ -4,30 +4,23 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_FILES = bsp.h ../../../shared/include/coverhd.h dmv170.h \
-    ../../../shared/tod.h
+include_HEADERS = bsp.h coverhd.h dmv170.h tod.h bspopts.h
+
+tod.h: $(top_srcdir)/../../shared/tod.h
+	cp $< $@
+coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h
+	cp $< $@
+CLEANFILES += tod.h coverhd.h
 
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@
 
-$(PROJECT_INCLUDE)/bsp.h: bsp.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/coverhd.h: ../../../shared/include/coverhd.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/dmv170.h: dmv170.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/tod.h: ../../../shared/tod.h
+$(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp.h \
-    $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_INCLUDE)/dmv170.h \
-    $(PROJECT_INCLUDE)/tod.h
+TMPINSTALL_FILES += $(PROJECT_INCLUDE) \
+    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = bsp.h dmv170.h
-
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/dmv177/include/bsp.h b/c/src/lib/libbsp/powerpc/dmv177/include/bsp.h
index d16d6698b8..4bbb8a13b5 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/dmv177/include/bsp.h
@@ -20,6 +20,8 @@
 extern "C" {
 #endif
 
+#include <bspopts.h>
+
 /*
  *  confdefs.h overrides for this BSP:
  *   - termios serial ports (defaults to 1)