From ffb4ccf7919ffa314cb285c72cbc1e7ea08b36fe Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 24 May 2001 20:10:43 +0000 Subject: 2001-05-23 Ralf Corsepius * configure.in: Add bspopts.h. * include/bsp.h: Include bspopts.h. * include/.cvsignore: Add bspopts.h*, coverhd.h, stamp-h*. * include/Makefile.am: Use *_HEADERS instead of *H_FILES. --- c/src/lib/libbsp/mips/jmr3904/ChangeLog | 7 +++++++ c/src/lib/libbsp/mips/jmr3904/configure.in | 1 + c/src/lib/libbsp/mips/jmr3904/include/.cvsignore | 5 +++++ c/src/lib/libbsp/mips/jmr3904/include/Makefile.am | 15 +++++++-------- c/src/lib/libbsp/mips/jmr3904/include/bsp.h | 2 ++ c/src/lib/libbsp/mips/p4000/ChangeLog | 7 +++++++ c/src/lib/libbsp/mips/p4000/configure.in | 1 + c/src/lib/libbsp/mips/p4000/include/.cvsignore | 4 ++++ c/src/lib/libbsp/mips/p4000/include/Makefile.am | 6 ++---- c/src/lib/libbsp/mips/p4000/include/bsp.h | 2 ++ 10 files changed, 38 insertions(+), 12 deletions(-) (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/mips/jmr3904/ChangeLog b/c/src/lib/libbsp/mips/jmr3904/ChangeLog index c73a62fdf0..a708cdd495 100644 --- a/c/src/lib/libbsp/mips/jmr3904/ChangeLog +++ b/c/src/lib/libbsp/mips/jmr3904/ChangeLog @@ -1,3 +1,10 @@ +2001-05-23 Ralf Corsepius + + * configure.in: Add bspopts.h. + * include/bsp.h: Include bspopts.h. + * include/.cvsignore: Add bspopts.h*, coverhd.h, stamp-h*. + * include/Makefile.am: Use *_HEADERS instead of *H_FILES. + 2001-05-11 Ralf Corsepius * configure.in: Use RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]). diff --git a/c/src/lib/libbsp/mips/jmr3904/configure.in b/c/src/lib/libbsp/mips/jmr3904/configure.in index d3a30b6470..581c79ee51 100644 --- a/c/src/lib/libbsp/mips/jmr3904/configure.in +++ b/c/src/lib/libbsp/mips/jmr3904/configure.in @@ -21,6 +21,7 @@ RTEMS_CANONICAL_HOST 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/mips/jmr3904/include/.cvsignore b/c/src/lib/libbsp/mips/jmr3904/include/.cvsignore index 282522db03..34cf1342d5 100644 --- a/c/src/lib/libbsp/mips/jmr3904/include/.cvsignore +++ b/c/src/lib/libbsp/mips/jmr3904/include/.cvsignore @@ -1,2 +1,7 @@ Makefile Makefile.in +coverhd.h +bspopts.h +bspopts.h.in +stamp-h +stamp-h.in diff --git a/c/src/lib/libbsp/mips/jmr3904/include/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/include/Makefile.am index 1d6c3074ec..54daff0963 100644 --- a/c/src/lib/libbsp/mips/jmr3904/include/Makefile.am +++ b/c/src/lib/libbsp/mips/jmr3904/include/Makefile.am @@ -4,22 +4,21 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = bsp.h ../../../shared/include/coverhd.h +include_HEADERS = bsp.h coverhd.h bspopts.h $(PROJECT_INCLUDE): $(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/bsp.h: bsp.h +$(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -$(PROJECT_INCLUDE)/coverhd.h: ../../../shared/include/coverhd.h - $(INSTALL_DATA) $< $@ +coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h + cp $< $@ +CLEANFILES += coverhd.h -TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp.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/mips/jmr3904/include/bsp.h b/c/src/lib/libbsp/mips/jmr3904/include/bsp.h index 3b0f52556c..d7cde8fc7d 100644 --- a/c/src/lib/libbsp/mips/jmr3904/include/bsp.h +++ b/c/src/lib/libbsp/mips/jmr3904/include/bsp.h @@ -20,6 +20,8 @@ extern "C" { #endif +#include + #include #include #include diff --git a/c/src/lib/libbsp/mips/p4000/ChangeLog b/c/src/lib/libbsp/mips/p4000/ChangeLog index c49abe96b3..54937c07b6 100644 --- a/c/src/lib/libbsp/mips/p4000/ChangeLog +++ b/c/src/lib/libbsp/mips/p4000/ChangeLog @@ -1,3 +1,10 @@ +2001-05-23 Ralf Corsepius + + * 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. + 2001-05-10 Ralf Corsepius * configure.in: Use RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]). diff --git a/c/src/lib/libbsp/mips/p4000/configure.in b/c/src/lib/libbsp/mips/p4000/configure.in index 77744fa4c0..5038dd787c 100644 --- a/c/src/lib/libbsp/mips/p4000/configure.in +++ b/c/src/lib/libbsp/mips/p4000/configure.in @@ -19,6 +19,7 @@ RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) RTEMS_CANONICAL_HOST +AM_CONFIG_HEADER(include/bspopts.h) RTEMS_PROJECT_ROOT # Explicitly list all Makefiles here diff --git a/c/src/lib/libbsp/mips/p4000/include/.cvsignore b/c/src/lib/libbsp/mips/p4000/include/.cvsignore index 282522db03..b0be3c54e6 100644 --- a/c/src/lib/libbsp/mips/p4000/include/.cvsignore +++ b/c/src/lib/libbsp/mips/p4000/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/mips/p4000/include/Makefile.am b/c/src/lib/libbsp/mips/p4000/include/Makefile.am index 8fb32f359f..4c217fde4f 100644 --- a/c/src/lib/libbsp/mips/p4000/include/Makefile.am +++ b/c/src/lib/libbsp/mips/p4000/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,8 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) +TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) all-local: $(TMPINSTALL_FILES) -EXTRA_DIST = bsp.h coverhd.h - include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/mips/p4000/include/bsp.h b/c/src/lib/libbsp/mips/p4000/include/bsp.h index 092c47b41f..dc8489aeab 100644 --- a/c/src/lib/libbsp/mips/p4000/include/bsp.h +++ b/c/src/lib/libbsp/mips/p4000/include/bsp.h @@ -22,6 +22,8 @@ extern "C" { #endif +#include + #include #include #include -- cgit v1.2.3