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.

5 files changed, 25 insertions, 11 deletions

diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/ChangeLog b/c/src/lib/libbsp/hppa1.1/simhppa/ChangeLog
index 5630cb21b3..1bb1845278 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/ChangeLog
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/ChangeLog
@@ -1,3 +1,10 @@
+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.
+
 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/hppa1.1/simhppa/configure.in b/c/src/lib/libbsp/hppa1.1/simhppa/configure.in
index 04b6bd3dbe..9934b13473 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/configure.in
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/configure.in
@@ -24,6 +24,7 @@ AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
 
 RTEMS_CONFIG_BUILD_SUBDIRS(tools)
 
+AM_CONFIG_HEADER(include/bspopts.h)
 RTEMS_PROJECT_ROOT
 
 # Explicitly list all Makefiles here
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/include/.cvsignore b/c/src/lib/libbsp/hppa1.1/simhppa/include/.cvsignore
index 282522db03..b0be3c54e6 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/include/.cvsignore
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/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/hppa1.1/simhppa/include/Makefile.am b/c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.am
index d2abb7f5c7..ab7871aeb5 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.am
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.am
@@ -4,9 +4,9 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_FILES = bsp.h ../../../shared/include/coverhd.h
-
-RTEMS_H_FILES = ttydrv.h
+include_rtemsdir = $(includedir)/rtems
+include_HEADERS = bsp.h coverhd.h bspopts.h
+include_rtems_HEADERS = ttydrv.h
 
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@
@@ -14,21 +14,21 @@ $(PROJECT_INCLUDE):
 $(PROJECT_INCLUDE)/rtems:
 	$(mkinstalldirs) $@
 
-$(PROJECT_INCLUDE)/bsp.h: bsp.h
+$(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-$(PROJECT_INCLUDE)/coverhd.h: ../../../shared/include/coverhd.h
+coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h
 	$(INSTALL_DATA) $< $@
+CLEANFILES += coverhd.h
 
-$(PROJECT_INCLUDE)/rtems/ttydrv.h: ttydrv.h
+$(PROJECT_INCLUDE)/rtems/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp.h \
-    $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_INCLUDE)/rtems \
-    $(PROJECT_INCLUDE)/rtems/ttydrv.h
+TMPINSTALL_FILES += $(PROJECT_INCLUDE) \
+    $(include_HEADERS:%=%(PROJECT_INCLUDE)/%) \
+    $(PROJECT_INCLUDE)/rtems \
+    $(include_HEADERS:%=%(PROJECT_INCLUDE)/rtems/%) 
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = bsp.h ttydrv.h
-
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h b/c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h
index fb35dfb711..9cf0c8c65e 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h
@@ -19,6 +19,8 @@
 extern "C" {
 #endif
 
+#include <bspopts.h>
+
 #include <rtems.h>
 #include <clockdrv.h>
 #include <rtems/ttydrv.h>