From 1d9a2fc5abb83a5f37b10c63da8ccaf6ce0bda47 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 29 Nov 1999 15:45:11 +0000 Subject: Patch rtems-rc-19991123-rc-0.diff from Ralf Corsepius which (among other things) converted the mptests to automake. SUB_DIRS was used instead of SUBDIRS in some Makefile.ins (apparently a leftover from moving the start* directories) Addtional major bugs: * psxtests/include was empty (incomplete psxtests changes). * bogus handling of *.scn in itrontests (screens/sptests vs. screens/itrontests installation dirs) In addition I have added a few more changes (I couldn't resist) * automake support for itrontests * OPERATION_COUNT support in tmitrontests/ * automake support for tmitrontests * automake suppport for mptests * Some (minor) corrections to several configure.in/Makefile.ams => c/src/tests/ is completly under automake control, now. => we could start to sort out the structural issues with c/src/tests (tests/support, stubdr, tools, get "make dist" working) --- c/src/lib/configure.in | 1 - c/src/lib/libbsp/m68k/efi332/Makefile.in | 2 +- c/src/lib/libbsp/m68k/efi68k/Makefile.in | 2 +- c/src/lib/libbsp/m68k/gen68302/Makefile.in | 2 +- c/src/lib/libbsp/m68k/gen68340/Makefile.in | 2 +- c/src/lib/libbsp/m68k/gen68360/Makefile.in | 2 +- c/src/lib/libbsp/m68k/ods68302/Makefile.in | 2 +- c/src/lib/libbsp/mips64orion/p4000/Makefile.in | 2 +- c/src/lib/libbsp/powerpc/mcp750/console/Makefile.in | 2 +- c/src/lib/libbsp/powerpc/mcp750/console/console.c | 6 ++++-- c/src/lib/libbsp/powerpc/mcp750/wrapup/Makefile.in | 6 ++---- c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.in | 2 +- c/src/lib/libbsp/powerpc/motorola_powerpc/console/console.c | 6 ++++-- c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.in | 6 ++---- c/src/lib/libbsp/powerpc/psim/Makefile.in | 2 +- c/src/lib/libbsp/sparc/erc32/Makefile.in | 2 +- 16 files changed, 23 insertions(+), 24 deletions(-) (limited to 'c/src/lib') diff --git a/c/src/lib/configure.in b/c/src/lib/configure.in index 40b9b297b9..f251f13663 100644 --- a/c/src/lib/configure.in +++ b/c/src/lib/configure.in @@ -13,7 +13,6 @@ AM_MAINTAINER_MODE RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENABLE_NETWORKING -RTEMS_ENABLE_RDBG RTEMS_ENABLE_LIBCDIR RTEMS_ENABLE_BARE RTEMS_ENABLE_HWAPI diff --git a/c/src/lib/libbsp/m68k/efi332/Makefile.in b/c/src/lib/libbsp/m68k/efi332/Makefile.in index 811880c7c5..c033337d27 100644 --- a/c/src/lib/libbsp/m68k/efi332/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/Makefile.in @@ -20,7 +20,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@ # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUB_DIRS = include start startup clock console spurious timer wrapup +SUBDIRS = include start startup clock console spurious timer wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libbsp/m68k/efi68k/Makefile.in b/c/src/lib/libbsp/m68k/efi68k/Makefile.in index c2f4dae29c..14917c570e 100644 --- a/c/src/lib/libbsp/m68k/efi68k/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi68k/Makefile.in @@ -20,7 +20,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@ # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUB_DIRS = include start startup clock console spurious timer wrapup +SUBDIRS = include start startup clock console spurious timer wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libbsp/m68k/gen68302/Makefile.in b/c/src/lib/libbsp/m68k/gen68302/Makefile.in index 114cd0b50e..5a431c5382 100644 --- a/c/src/lib/libbsp/m68k/gen68302/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68302/Makefile.in @@ -24,7 +24,7 @@ all: $(SRCS) # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUB_DIRS = include start startup clock console timer wrapup +SUBDIRS = include start startup clock console timer wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libbsp/m68k/gen68340/Makefile.in b/c/src/lib/libbsp/m68k/gen68340/Makefile.in index e2e3688fb1..58bc004f8e 100644 --- a/c/src/lib/libbsp/m68k/gen68340/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68340/Makefile.in @@ -24,7 +24,7 @@ all: $(SRCS) # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUB_DIRS = include start startup clock console timer wrapup +SUBDIRS = include start startup clock console timer wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libbsp/m68k/gen68360/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/Makefile.in index da0c2ee9aa..572e812c5a 100644 --- a/c/src/lib/libbsp/m68k/gen68360/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.in @@ -28,7 +28,7 @@ all: $(SRCS) # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUB_DIRS = include start startup clock console timer $(NETWORKING_DRIVER) \ +SUBDIRS = include start startup clock console timer $(NETWORKING_DRIVER) \ wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status diff --git a/c/src/lib/libbsp/m68k/ods68302/Makefile.in b/c/src/lib/libbsp/m68k/ods68302/Makefile.in index 9bb26b4283..2f7d723819 100644 --- a/c/src/lib/libbsp/m68k/ods68302/Makefile.in +++ b/c/src/lib/libbsp/m68k/ods68302/Makefile.in @@ -24,7 +24,7 @@ all: $(SRCS) # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUB_DIRS = include start startup clock console timer wrapup +SUBDIRS = include start startup clock console timer wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libbsp/mips64orion/p4000/Makefile.in b/c/src/lib/libbsp/mips64orion/p4000/Makefile.in index f9bcfcda1a..6d92ded33a 100644 --- a/c/src/lib/libbsp/mips64orion/p4000/Makefile.in +++ b/c/src/lib/libbsp/mips64orion/p4000/Makefile.in @@ -24,7 +24,7 @@ all: $(SRCS) # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUB_DIRS = include start startup console liblnk wrapup +SUBDIRS = include start startup console liblnk wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libbsp/powerpc/mcp750/console/Makefile.in b/c/src/lib/libbsp/powerpc/mcp750/console/Makefile.in index 7af8cf54bb..02639f189d 100644 --- a/c/src/lib/libbsp/powerpc/mcp750/console/Makefile.in +++ b/c/src/lib/libbsp/powerpc/mcp750/console/Makefile.in @@ -14,7 +14,7 @@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@:@srcdir@/../../../shared # C source names, if any, go here -- minus the .c -C_PIECES = polled_io uart console inch +C_PIECES = polled_io uart console inch console_reserve_resources C_FILES = $(C_PIECES:%=%.c) C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) diff --git a/c/src/lib/libbsp/powerpc/mcp750/console/console.c b/c/src/lib/libbsp/powerpc/mcp750/console/console.c index 834f960cfc..fc50656af1 100644 --- a/c/src/lib/libbsp/powerpc/mcp750/console/console.c +++ b/c/src/lib/libbsp/powerpc/mcp750/console/console.c @@ -45,10 +45,10 @@ extern int close(int fd); * BSP_UART_COM2 */ -int BSPConsolePort = BSP_UART_COM1; +extern int BSPConsolePort; /* int BSPConsolePort = BSP_UART_COM2; */ -int BSPBaseBaud = 115200; +extern int BSPBaseBaud; /*-------------------------------------------------------------------------+ | External Prototypes @@ -84,6 +84,7 @@ isr_is_on(const rtems_irq_connect_data *irq) return BSP_irq_enabled_at_i8259s(irq->name); } +/* void console_reserve_resources(rtems_configuration_table *conf) { if(BSPConsolePort != BSP_CONSOLE_PORT_CONSOLE) @@ -93,6 +94,7 @@ void console_reserve_resources(rtems_configuration_table *conf) return; } +*/ void __assert (const char *file, int line, const char *msg) { diff --git a/c/src/lib/libbsp/powerpc/mcp750/wrapup/Makefile.in b/c/src/lib/libbsp/powerpc/mcp750/wrapup/Makefile.in index 8a43068b83..15c5e8e9f1 100644 --- a/c/src/lib/libbsp/powerpc/mcp750/wrapup/Makefile.in +++ b/c/src/lib/libbsp/powerpc/mcp750/wrapup/Makefile.in @@ -20,12 +20,10 @@ NETWORK = $(NETWORK_$(HAS_NETWORKING)_V) BSP_PIECES = clock console irq openpic pci residual startup $(NETWORK) \ vectors GENERIC_PIECES = -CPU_PIECES = clock # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.o) $(foreach \ - piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/*.o) $(foreach - piece, $(CPU_PIECES), ../../../../libcpu/powerpc/mpc750/$(piece)/$(ARCH)/*.o) +OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.o) \ + $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/*.o) LIB = $(ARCH)/libbsp.a include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.in index 7af8cf54bb..02639f189d 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.in +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.in @@ -14,7 +14,7 @@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@:@srcdir@/../../../shared # C source names, if any, go here -- minus the .c -C_PIECES = polled_io uart console inch +C_PIECES = polled_io uart console inch console_reserve_resources C_FILES = $(C_PIECES:%=%.c) C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/console.c b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/console.c index 834f960cfc..fc50656af1 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/console.c +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/console.c @@ -45,10 +45,10 @@ extern int close(int fd); * BSP_UART_COM2 */ -int BSPConsolePort = BSP_UART_COM1; +extern int BSPConsolePort; /* int BSPConsolePort = BSP_UART_COM2; */ -int BSPBaseBaud = 115200; +extern int BSPBaseBaud; /*-------------------------------------------------------------------------+ | External Prototypes @@ -84,6 +84,7 @@ isr_is_on(const rtems_irq_connect_data *irq) return BSP_irq_enabled_at_i8259s(irq->name); } +/* void console_reserve_resources(rtems_configuration_table *conf) { if(BSPConsolePort != BSP_CONSOLE_PORT_CONSOLE) @@ -93,6 +94,7 @@ void console_reserve_resources(rtems_configuration_table *conf) return; } +*/ void __assert (const char *file, int line, const char *msg) { diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.in index 8a43068b83..15c5e8e9f1 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.in +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.in @@ -20,12 +20,10 @@ NETWORK = $(NETWORK_$(HAS_NETWORKING)_V) BSP_PIECES = clock console irq openpic pci residual startup $(NETWORK) \ vectors GENERIC_PIECES = -CPU_PIECES = clock # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.o) $(foreach \ - piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/*.o) $(foreach - piece, $(CPU_PIECES), ../../../../libcpu/powerpc/mpc750/$(piece)/$(ARCH)/*.o) +OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.o) \ + $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/*.o) LIB = $(ARCH)/libbsp.a include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.in b/c/src/lib/libbsp/powerpc/psim/Makefile.in index 503af8787f..2536ef2eaa 100644 --- a/c/src/lib/libbsp/powerpc/psim/Makefile.in +++ b/c/src/lib/libbsp/powerpc/psim/Makefile.in @@ -29,7 +29,7 @@ MP_DRIVERS = $(MP_DRIVERS_$(HAS_MP)_V) # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUB_DIRS = include start clock console startup $(MP_DRIVERS) timer \ +SUBDIRS = include start clock console startup $(MP_DRIVERS) timer \ vectors wrapup tools Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.in b/c/src/lib/libbsp/sparc/erc32/Makefile.in index 7949a002bb..86cf977a1a 100644 --- a/c/src/lib/libbsp/sparc/erc32/Makefile.in +++ b/c/src/lib/libbsp/sparc/erc32/Makefile.in @@ -20,7 +20,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@ # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUB_DIRS = start include startup gnatsupp console clock timer wrapup tools +SUBDIRS = start include startup gnatsupp console clock timer wrapup tools Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ -- cgit v1.2.3