2001-05-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* configure.in: Add bspopts.h.
	* include/bsp.h: Include bspopts.h.
	* include/.cvsignore: Add bspopts.h*, stamp-h*.
	* include/Makefile.am: Use *_HEADERS instead of *H_FILES.
	* start/Makefile.am: Dito.
	* network/Makefile.am: Dito.

7 files changed, 23 insertions, 8 deletions

diff --git a/c/src/lib/libbsp/i386/i386ex/ChangeLog b/c/src/lib/libbsp/i386/i386ex/ChangeLog
index 400a572574..132790294b 100644
--- a/c/src/lib/libbsp/i386/i386ex/ChangeLog
+++ b/c/src/lib/libbsp/i386/i386ex/ChangeLog
@@ -1,4 +1,13 @@
-2001-05-10	Ralf Corsepius	<corsepiu@faw.uni-ulm.de>
+2001-05-22	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.in: Add bspopts.h.
+	* include/bsp.h: Include bspopts.h.
+	* include/.cvsignore: Add bspopts.h*, stamp-h*.
+	* include/Makefile.am: Use *_HEADERS instead of *H_FILES.
+	* start/Makefile.am: Dito.
+	* network/Makefile.am: Dito.
+
+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/i386/i386ex/configure.in b/c/src/lib/libbsp/i386/i386ex/configure.in
index 96eeec7003..cf7a0b23b1 100644
--- a/c/src/lib/libbsp/i386/i386ex/configure.in
+++ b/c/src/lib/libbsp/i386/i386ex/configure.in
@@ -26,6 +26,7 @@ AM_CONDITIONAL(RTEMS_GAS_CODE16,test "$RTEMS_GAS_CODE16" = "yes");
 
 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/i386/i386ex/include/.cvsignore b/c/src/lib/libbsp/i386/i386ex/include/.cvsignore
index 282522db03..b0be3c54e6 100644
--- a/c/src/lib/libbsp/i386/i386ex/include/.cvsignore
+++ b/c/src/lib/libbsp/i386/i386ex/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/i386/i386ex/include/Makefile.am b/c/src/lib/libbsp/i386/i386ex/include/Makefile.am
index 3f061aa216..422586950a 100644
--- a/c/src/lib/libbsp/i386/i386ex/include/Makefile.am
+++ b/c/src/lib/libbsp/i386/i386ex/include/Makefile.am
@@ -4,7 +4,7 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_FILES = bsp.h coverhd.h
+include_HEADERS = bsp.h coverhd.h bspopts.h
 
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@
@@ -12,10 +12,9 @@ $(PROJECT_INCLUDE):
 $(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h)
+PREINSTALL_FILES += $(PROJECT_INCLUDE) \
+    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 all-local: $(PREINSTALL_FILES)
 
-EXTRA_DIST = bsp.h coverhd.h
-
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/i386/i386ex/include/bsp.h b/c/src/lib/libbsp/i386/i386ex/include/bsp.h
index 991badd5c5..2145c3d269 100644
--- a/c/src/lib/libbsp/i386/i386ex/include/bsp.h
+++ b/c/src/lib/libbsp/i386/i386ex/include/bsp.h
@@ -18,6 +18,8 @@
 extern "C" {
 #endif
 
+#include <bspopts.h>
+
 #include <rtems.h>
 #include <iosupp.h>
 #include <console.h>
diff --git a/c/src/lib/libbsp/i386/i386ex/network/Makefile.am b/c/src/lib/libbsp/i386/i386ex/network/Makefile.am
index 02a5d9b426..d9bbbf9b3c 100644
--- a/c/src/lib/libbsp/i386/i386ex/network/Makefile.am
+++ b/c/src/lib/libbsp/i386/i386ex/network/Makefile.am
@@ -9,7 +9,7 @@ PGM = $(ARCH)/network.rel
 C_FILES = network.c
 C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
-H_FILES = netexterns.h uti596.h
+noinst_HEADERS = netexterns.h uti596.h
 
 OBJS = $(C_O_FILES)
 
diff --git a/c/src/lib/libbsp/i386/i386ex/start/Makefile.am b/c/src/lib/libbsp/i386/i386ex/start/Makefile.am
index 5262e54221..4498865cf3 100644
--- a/c/src/lib/libbsp/i386/i386ex/start/Makefile.am
+++ b/c/src/lib/libbsp/i386/i386ex/start/Makefile.am
@@ -9,7 +9,7 @@ PGMS = $(ARCH)/start.o
 S_FILES = start.S
 S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
 
-H_FILES = 80386ex.h
+noinst_HEADERS = 80386ex.h 80386ex.inc macros.inc
 
 OBJS = $(S_O_FILES)
 
@@ -28,6 +28,6 @@ TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o
 
 all-local: $(ARCH) $(OBJS) $(TMPINSTALL_FILES)
 
-EXTRA_DIST = 80386ex.h 80386ex.inc macros.inc start.S
+EXTRA_DIST = start.S
 
 include $(top_srcdir)/../../../../../../automake/local.am