From ebf3adc76f5b79d58191185440d843d72376b013 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 14 Jun 2001 12:43:18 +0000 Subject: 2001-05-26 Ralf Corsepius * 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. --- c/src/lib/libbsp/i386/ts_386ex/ChangeLog | 7 +++++++ c/src/lib/libbsp/i386/ts_386ex/configure.in | 1 + c/src/lib/libbsp/i386/ts_386ex/include/.cvsignore | 4 ++++ c/src/lib/libbsp/i386/ts_386ex/include/Makefile.am | 6 +++--- c/src/lib/libbsp/i386/ts_386ex/include/bsp.h | 2 ++ c/src/lib/libbsp/i386/ts_386ex/start/Makefile.am | 2 +- 6 files changed, 18 insertions(+), 4 deletions(-) (limited to 'c/src/lib/libbsp/i386/ts_386ex') diff --git a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog index acf5bd39ae..cdea2a486b 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog +++ b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog @@ -1,3 +1,10 @@ +2001-05-26 Ralf Corsepius + + * 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 * configure.in: Use RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]). diff --git a/c/src/lib/libbsp/i386/ts_386ex/configure.in b/c/src/lib/libbsp/i386/ts_386ex/configure.in index 43b6fed1d7..71098f3cf0 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/configure.in +++ b/c/src/lib/libbsp/i386/ts_386ex/configure.in @@ -28,6 +28,7 @@ AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "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/i386/ts_386ex/include/.cvsignore b/c/src/lib/libbsp/i386/ts_386ex/include/.cvsignore index 282522db03..b0be3c54e6 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/include/.cvsignore +++ b/c/src/lib/libbsp/i386/ts_386ex/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/ts_386ex/include/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.am index ef1a5dcf9d..43793ba5b8 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.am @@ -8,7 +8,7 @@ if HAS_NETWORKING NETWORK_H_FILES = wd80x3.h endif -H_FILES = bsp.h coverhd.h wd80x3.h $(NETWORK_H_FILES) +include_HEADERS = bsp.h coverhd.h wd80x3.h $(NETWORK_H_FILES) bspopts.h $(PROJECT_INCLUDE): $(mkinstalldirs) $@ @@ -16,10 +16,10 @@ $(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 wd80x3.h +EXTRA_DIST = wd80x3.h include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h b/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h index 6baf0f12ba..104dd8d2bc 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h +++ b/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h @@ -19,6 +19,8 @@ extern "C" { #endif +#include + #include #include #include diff --git a/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.am index 960e3acaa6..36bd55cd4d 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.am @@ -11,7 +11,7 @@ S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) OBJS = $(S_O_FILES) -H_FILES = 80386ex.h +noinst_FILES = 80386ex.h include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/compile.am -- cgit v1.2.3