From 93379eb8c1afe5e0d39bc55d07b330525a1da1d7 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Fri, 8 Jun 2001 13:38:08 +0000
Subject: 2001-05-26	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* configure.in: Add bspopts.h.
	* include/.cvsignore: Add bspopts.h*, stamp-h*, coverhd.h.
	* include/Makefile.am: Use *_HEADERS instead of *H_FILES.
	* include/bsp.h: Include bspopts.h.
---
 c/src/lib/libbsp/unix/posix/ChangeLog           |  7 +++++++
 c/src/lib/libbsp/unix/posix/configure.in        |  1 +
 c/src/lib/libbsp/unix/posix/include/.cvsignore  |  5 +++++
 c/src/lib/libbsp/unix/posix/include/Makefile.am | 12 +++++-------
 c/src/lib/libbsp/unix/posix/include/bsp.h       |  2 ++
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/c/src/lib/libbsp/unix/posix/ChangeLog b/c/src/lib/libbsp/unix/posix/ChangeLog
index 51b56e1970..e0251d92bb 100644
--- a/c/src/lib/libbsp/unix/posix/ChangeLog
+++ b/c/src/lib/libbsp/unix/posix/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*, coverhd.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/unix/posix/configure.in b/c/src/lib/libbsp/unix/posix/configure.in
index 3b4543e74d..763ab8b2ca 100644
--- a/c/src/lib/libbsp/unix/posix/configure.in
+++ b/c/src/lib/libbsp/unix/posix/configure.in
@@ -34,6 +34,7 @@ AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
 
 AM_CONDITIONAL(HAS_CXX,test "$HAS_CPLUSPLUS" = "yes")
 
+AM_CONFIG_HEADER(include/bspopts.h)
 RTEMS_PROJECT_ROOT
 
 # Explicitly list all Makefiles here
diff --git a/c/src/lib/libbsp/unix/posix/include/.cvsignore b/c/src/lib/libbsp/unix/posix/include/.cvsignore
index 282522db03..7394c340a6 100644
--- a/c/src/lib/libbsp/unix/posix/include/.cvsignore
+++ b/c/src/lib/libbsp/unix/posix/include/.cvsignore
@@ -1,2 +1,7 @@
 Makefile
 Makefile.in
+bspopts.h
+bspopts.h.in
+coverhd.h
+stamp-h
+stamp-h.in
diff --git a/c/src/lib/libbsp/unix/posix/include/Makefile.am b/c/src/lib/libbsp/unix/posix/include/Makefile.am
index 2f0d3a70f0..acc2af5aff 100644
--- a/c/src/lib/libbsp/unix/posix/include/Makefile.am
+++ b/c/src/lib/libbsp/unix/posix/include/Makefile.am
@@ -4,7 +4,7 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_FILES = bsp.h
+include_HEADERS = bsp.h bspopts.h
 
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@
@@ -12,14 +12,12 @@ $(PROJECT_INCLUDE):
 $(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-$(PROJECT_INCLUDE)/coverhd.h: $(srcdir)/../../../shared/include/coverhd.h
-	$(INSTALL_DATA) $< $@
+coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h
+	cp $< $@
+CLEANFILES += coverhd.h
 
-TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \
-    $(PROJECT_INCLUDE)/coverhd.h
+TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = bsp.h
-
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/unix/posix/include/bsp.h b/c/src/lib/libbsp/unix/posix/include/bsp.h
index ca0bdd0402..9e7887638f 100644
--- a/c/src/lib/libbsp/unix/posix/include/bsp.h
+++ b/c/src/lib/libbsp/unix/posix/include/bsp.h
@@ -19,6 +19,8 @@
 extern "C" {
 #endif
 
+#include <bspopts.h>
+
 #include <rtems.h>
 #include <clockdrv.h>
 #include <console.h>
-- 
cgit v1.2.3