From a1c34a9cf8a820703949a1bfd3daaf2b4c1d5b12 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 8 Jun 2001 13:40:59 +0000 Subject: 2001-05-26 Ralf Corsepius * configure.in: Add bspopts.h, fix PACKAGE. * 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/c4x/c4xsim/ChangeLog | 7 +++++++ c/src/lib/libbsp/c4x/c4xsim/configure.in | 3 ++- c/src/lib/libbsp/c4x/c4xsim/include/.cvsignore | 4 ++++ c/src/lib/libbsp/c4x/c4xsim/include/Makefile.am | 13 ++++++------- c/src/lib/libbsp/c4x/c4xsim/include/bsp.h | 2 ++ 5 files changed, 21 insertions(+), 8 deletions(-) (limited to 'c/src/lib/libbsp/c4x/c4xsim') diff --git a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog index 7b15178cd4..6b9242156b 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog +++ b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog @@ -1,3 +1,10 @@ +2001-05-26 Ralf Corsepius + + * configure.in: Add bspopts.h, fix PACKAGE. + * 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/c4x/c4xsim/configure.in b/c/src/lib/libbsp/c4x/c4xsim/configure.in index 55277b84f8..63577b48f2 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/configure.in +++ b/c/src/lib/libbsp/c4x/c4xsim/configure.in @@ -8,7 +8,7 @@ RTEMS_TOP(../../../../../..) AC_CONFIG_AUX_DIR(../../../../../..) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-sparc-erc32,$RTEMS_VERSION,no) +AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-c4x-c4xsim,$RTEMS_VERSION,no) AM_MAINTAINER_MODE RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]) @@ -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/c4x/c4xsim/include/.cvsignore b/c/src/lib/libbsp/c4x/c4xsim/include/.cvsignore index 282522db03..b0be3c54e6 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/include/.cvsignore +++ b/c/src/lib/libbsp/c4x/c4xsim/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/c4x/c4xsim/include/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/include/Makefile.am index 957c6552e6..9301119692 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/include/Makefile.am +++ b/c/src/lib/libbsp/c4x/c4xsim/include/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = bsp.h simio.h +include_HEADERS = bsp.h simio.h bspopts.h $(PROJECT_INCLUDE): $(mkinstalldirs) $@ @@ -12,14 +12,13 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h - $(INSTALL_DATA) $< $@ +coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h + cp $< $@ +CLEANFILES += coverhd.h -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 - include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/c4x/c4xsim/include/bsp.h b/c/src/lib/libbsp/c4x/c4xsim/include/bsp.h index c5a041d853..5374bece9f 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/include/bsp.h +++ b/c/src/lib/libbsp/c4x/c4xsim/include/bsp.h @@ -19,6 +19,8 @@ extern "C" { #endif +#include + #ifdef ASM #else -- cgit v1.2.3