diff options
18 files changed, 85 insertions, 26 deletions
diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog b/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog index 79292513dd..f5080bcf86 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/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 include/bspopts.h. + * console/Makefile.am: Use *_HEADERS instead of *H_FILES. + * irq/Makefile.am: Use *_HEADER instead of *H_FILES. + * include/.cvsignore: Add bspopts.h*, coverhd.h, stamp-h* + * include/Makefile.am: Add bspopts.h, Use *_HEADER instead of *H_FILES. + * include/bsp.h: Add 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/arm/arm_bare_bsp/configure.in b/c/src/lib/libbsp/arm/arm_bare_bsp/configure.in index 106cf26152..ea64a899b8 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/configure.in +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/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/arm/arm_bare_bsp/console/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/console/Makefile.am index 964434ab5a..34baaab14b 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/console/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/console/Makefile.am @@ -11,7 +11,7 @@ PGM = $(ARCH)/console.rel C_FILES = uart.c console.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -H_FILES = uart.h +noinst_HEADERS = uart.h console_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/include/.cvsignore b/c/src/lib/libbsp/arm/arm_bare_bsp/include/.cvsignore index 282522db03..34cf1342d5 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/include/.cvsignore +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/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/arm/arm_bare_bsp/include/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/include/Makefile.am index 0e62e1cc2a..b1e18da5af 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/include/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/include/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = bsp.h registers.h ../../../shared/include/coverhd.h +include_HEADERS = bsp.h registers.h coverhd.h bspopts.h $(PROJECT_INCLUDE): $(mkinstalldirs) $@ @@ -12,11 +12,12 @@ $(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 -TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_INCLUDE)/registers.h +TMPINSTALL_FILES += $(PROJECT_INCLUDE) \ + $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) all: $(TMPINSTALL_FILES) diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/include/bsp.h b/c/src/lib/libbsp/arm/arm_bare_bsp/include/bsp.h index ccef847437..b5758b09c5 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/include/bsp.h +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/include/bsp.h @@ -22,6 +22,8 @@ extern "C" { #endif +#include <bspopts.h> + #include <rtems.h> #include <iosupp.h> #include <console.h> diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am index c2ffbc5821..8906092df8 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am @@ -10,7 +10,7 @@ PGM = $(ARCH)/irq.rel C_FILES = irq.c irq_init.c bsp_irq_init.c S_FILES = irq_asm.S bsp_irq_asm.S -H_FILES = irq.h +include_HEADERS = irq.h C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) @@ -23,7 +23,7 @@ $(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)/%) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/compile.am diff --git a/c/src/lib/libbsp/arm/armulator/ChangeLog b/c/src/lib/libbsp/arm/armulator/ChangeLog index fac8666885..f984a2a817 100644 --- a/c/src/lib/libbsp/arm/armulator/ChangeLog +++ b/c/src/lib/libbsp/arm/armulator/ChangeLog @@ -1,3 +1,12 @@ +2001-05-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * configure.in: Add include/bspopts.h. + * console/Makefile.am: Use *_HEADERS instead of *H_FILES. + * irq/Makefile.am: Use *_HEADER instead of *H_FILES. + * include/.cvsignore: Add bspopts.h*, coverhd.h, stamp-h*. + * include/Makefile.am: Add bspopts.h, Use *_HEADER instead of *H_FILES. + * include/bsp.h: Add 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/arm/armulator/configure.in b/c/src/lib/libbsp/arm/armulator/configure.in index ed32809496..ce5a506819 100644 --- a/c/src/lib/libbsp/arm/armulator/configure.in +++ b/c/src/lib/libbsp/arm/armulator/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/arm/armulator/include/.cvsignore b/c/src/lib/libbsp/arm/armulator/include/.cvsignore index 282522db03..34cf1342d5 100644 --- a/c/src/lib/libbsp/arm/armulator/include/.cvsignore +++ b/c/src/lib/libbsp/arm/armulator/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/arm/armulator/include/Makefile.am b/c/src/lib/libbsp/arm/armulator/include/Makefile.am index 534884ac59..b11145642e 100644 --- a/c/src/lib/libbsp/arm/armulator/include/Makefile.am +++ b/c/src/lib/libbsp/arm/armulator/include/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = bsp.h ../../../shared/include/coverhd.h +include_HEADERS = bsp.h coverhd.h bspopts.h $(PROJECT_INCLUDE): $(mkinstalldirs) $@ @@ -12,14 +12,12 @@ $(PROJECT_INCLUDE): $(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/arm/armulator/include/bsp.h b/c/src/lib/libbsp/arm/armulator/include/bsp.h index d0e0ca66ed..b85668f2b9 100644 --- a/c/src/lib/libbsp/arm/armulator/include/bsp.h +++ b/c/src/lib/libbsp/arm/armulator/include/bsp.h @@ -20,6 +20,8 @@ extern "C" { #endif +#include <bspopts.h> + #include <rtems.h> #include <iosupp.h> #include <console.h> diff --git a/c/src/lib/libbsp/arm/vegaplus/ChangeLog b/c/src/lib/libbsp/arm/vegaplus/ChangeLog index 966cd12596..2c60be863e 100644 --- a/c/src/lib/libbsp/arm/vegaplus/ChangeLog +++ b/c/src/lib/libbsp/arm/vegaplus/ChangeLog @@ -1,3 +1,11 @@ +2001-05-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * configure.in: Add include/bspopts.h. + * irq/Makefile.am: Use *_HEADERS instead of *H_FILES. + * include/.cvsignore: Add bspopts.h*, coverhd.h, stamp-h*. + * include/Makefile.am: Add bspopts.h, Use *_HEADER instead of *H_FILES. + * include/bsp.h: Add 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/arm/vegaplus/configure.in b/c/src/lib/libbsp/arm/vegaplus/configure.in index d838c789ca..0d629c7682 100644 --- a/c/src/lib/libbsp/arm/vegaplus/configure.in +++ b/c/src/lib/libbsp/arm/vegaplus/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/arm/vegaplus/include/.cvsignore b/c/src/lib/libbsp/arm/vegaplus/include/.cvsignore index 282522db03..bb9dfabd50 100644 --- a/c/src/lib/libbsp/arm/vegaplus/include/.cvsignore +++ b/c/src/lib/libbsp/arm/vegaplus/include/.cvsignore @@ -1,2 +1,8 @@ Makefile Makefile.in +coverhd.h +bspopts.h +bspopts.h.in +stamp-h +stamp-h.in + diff --git a/c/src/lib/libbsp/arm/vegaplus/include/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/include/Makefile.am index d235103c8a..9fec3b64a6 100644 --- a/c/src/lib/libbsp/arm/vegaplus/include/Makefile.am +++ b/c/src/lib/libbsp/arm/vegaplus/include/Makefile.am @@ -4,7 +4,13 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = bsp.h registers.h ../../../shared/include/coverhd.h +include_HEADERS = bsp.h registers.h coverhd.h bspopts.h + +coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h + cp $< $@ + +CLEANFILES += coverhd.h + $(PROJECT_INCLUDE): $(mkinstalldirs) $@ @@ -12,14 +18,9 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -$(PROJECT_INCLUDE)/coverhd.h: ../../../shared/include/coverhd.h - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/registers.h $(PROJECT_INCLUDE)/coverhd.h +TMPINSTALL_FILES += $(PROJECT_INCLUDE) \ + $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) all-local: $(TMPINSTALL_FILES) -EXTRA_DIST = bsp.h registers.h - include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/vegaplus/include/bsp.h b/c/src/lib/libbsp/arm/vegaplus/include/bsp.h index ccef847437..b5758b09c5 100644 --- a/c/src/lib/libbsp/arm/vegaplus/include/bsp.h +++ b/c/src/lib/libbsp/arm/vegaplus/include/bsp.h @@ -22,6 +22,8 @@ extern "C" { #endif +#include <bspopts.h> + #include <rtems.h> #include <iosupp.h> #include <console.h> diff --git a/c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am index 8a8dd2c93d..8061902b3f 100644 --- a/c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am +++ b/c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am @@ -14,7 +14,7 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) S_FILES = irq_asm.S bsp_irq_asm.S S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) -H_FILES = irq.h +include_HEADERS = irq.h OBJS = $(C_O_FILES) $(S_O_FILES) @@ -28,6 +28,14 @@ include $(top_srcdir)/../../../../../../automake/lib.am AM_CPPFLAGS += -I$(srcdir) +$(PROJECT_INCLUDE): + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/%.h: %.h + $(INSTALL_DATA) $< $@ + +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) + $(PGM): $(OBJS) $(make-rel) @@ -37,6 +45,6 @@ all-local: $(ARCH) $(OBJS) $(PGM) .PRECIOUS: $(PGM) -EXTRA_DIST = bsp_irq_asm.S bsp_irq_init.c irq.c irq.h +EXTRA_DIST = bsp_irq_asm.S bsp_irq_init.c irq.c include $(top_srcdir)/../../../../../../automake/local.am |