summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--c/src/lib/libbsp/i386/pc386/3c509/Makefile.am2
-rw-r--r--c/src/lib/libbsp/i386/pc386/ChangeLog9
-rw-r--r--c/src/lib/libbsp/i386/pc386/configure.in1
-rw-r--r--c/src/lib/libbsp/i386/pc386/console/Makefile.am7
-rw-r--r--c/src/lib/libbsp/i386/pc386/include/.cvsignore4
-rw-r--r--c/src/lib/libbsp/i386/pc386/include/Makefile.am15
-rw-r--r--c/src/lib/libbsp/i386/pc386/include/bsp.h2
7 files changed, 28 insertions, 12 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/3c509/Makefile.am b/c/src/lib/libbsp/i386/pc386/3c509/Makefile.am
index 877739011a..3f3b93317e 100644
--- a/c/src/lib/libbsp/i386/pc386/3c509/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/3c509/Makefile.am
@@ -9,7 +9,7 @@ PGM = $(ARCH)/3c509.rel
C_FILES = 3c509.c elink.c
X3c509_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
-H_FILES = 3c509.h elink.h
+noinst_HEADERS = 3c509.h elink.h
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../../../../automake/compile.am
diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog
index 5bab007c08..ade0460998 100644
--- a/c/src/lib/libbsp/i386/pc386/ChangeLog
+++ b/c/src/lib/libbsp/i386/pc386/ChangeLog
@@ -1,3 +1,12 @@
+2001-06-19 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.
+ * 3c509/Makefile.am: Dito.
+ * console/Makefile.am: Dito.
+ * 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/i386/pc386/configure.in b/c/src/lib/libbsp/i386/pc386/configure.in
index 609609bc43..4be73dcfc4 100644
--- a/c/src/lib/libbsp/i386/pc386/configure.in
+++ b/c/src/lib/libbsp/i386/pc386/configure.in
@@ -30,6 +30,7 @@ RTEMS_CONFIG_BUILD_SUBDIRS(tools)
AC_SUBST(RTEMS_BSP)
+AM_CONFIG_HEADER(include/bspopts.h)
RTEMS_PROJECT_ROOT
# Explicitly list all Makefiles here
diff --git a/c/src/lib/libbsp/i386/pc386/console/Makefile.am b/c/src/lib/libbsp/i386/pc386/console/Makefile.am
index 1c6fcfb899..91f48b692a 100644
--- a/c/src/lib/libbsp/i386/pc386/console/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/console/Makefile.am
@@ -4,11 +4,10 @@
AUTOMAKE_OPTIONS = foreign 1.4
-VPATH = @srcdir@:@srcdir@/../../shared/io
-
PGM = $(ARCH)/console.rel
-RTEMS_H_FILES = keyboard.h kd.h serial_mouse.h ps2_drv.h fb_vga.h
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS = keyboard.h kd.h serial_mouse.h ps2_drv.h fb_vga.h
C_FILES = console.c inch.c outch.c defkeymap.c fb_vga.c keyboard.c \
mouse_parser.c pc_keyb.c ps2_mouse.c serial_mouse.c vgainit.c vt.c
@@ -21,7 +20,7 @@ include $(top_srcdir)/../../../../../../automake/compile.am
include $(top_srcdir)/../../../../../../automake/lib.am
PREINSTALL_FILES += $(PROJECT_INCLUDE) \
- $(RTEMS_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/%.h)
+ $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
#
# (OPTIONAL) Add local stuff here using +=
diff --git a/c/src/lib/libbsp/i386/pc386/include/.cvsignore b/c/src/lib/libbsp/i386/pc386/include/.cvsignore
index 282522db03..b0be3c54e6 100644
--- a/c/src/lib/libbsp/i386/pc386/include/.cvsignore
+++ b/c/src/lib/libbsp/i386/pc386/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/pc386/include/Makefile.am b/c/src/lib/libbsp/i386/pc386/include/Makefile.am
index 2f4544274f..d8548df2c8 100644
--- a/c/src/lib/libbsp/i386/pc386/include/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/include/Makefile.am
@@ -10,7 +10,11 @@ if HAS_NETWORKING
WD80X3 = wd80x3.h
endif
-H_FILES = bsp.h crt.h $(WD80X3)
+include_HEADERS = bsp.h crt.h coverhd.h $(WD80X3) bspopts.h
+
+coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h
+ cp $< $@
+CLEANFILES += coverhd.h
$(PROJECT_INCLUDE):
$(mkinstalldirs) $@
@@ -18,14 +22,11 @@ $(PROJECT_INCLUDE):
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
-$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h
- $(INSTALL_DATA) $< $@
-
-PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \
- $(PROJECT_INCLUDE)/coverhd.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE) \
+ $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
all-local: $(PREINSTALL_FILES)
-EXTRA_DIST = bsp.h crt.h wd80x3.h
+EXTRA_DIST = wd80x3.h
include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/i386/pc386/include/bsp.h b/c/src/lib/libbsp/i386/pc386/include/bsp.h
index 7431059314..703492bb4f 100644
--- a/c/src/lib/libbsp/i386/pc386/include/bsp.h
+++ b/c/src/lib/libbsp/i386/pc386/include/bsp.h
@@ -46,6 +46,8 @@
extern "C" {
#endif
+#include <bspopts.h>
+
#include <rtems.h>
#include <iosupp.h>
#include <console.h>