diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-12-21 15:25:05 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-12-21 15:25:05 +0000 |
| commit | fb16fed75af901ef67a2f887fc119b37414eccfb (patch) | |
| tree | c72306514934eb34c0474be0504146ad2474accb /c | |
| parent | Patch rtems-rc-19991203-9.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-fb16fed75af901ef67a2f887fc119b37414eccfb.tar.bz2 | |
Patch rtems-rc-19991203-10.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>
which fixes a couple of bugs in RTEMS's old style Makefile.ins, which
apparently were introduced by moving the start directories and not
having adapted the Makefile.ins.
To apply:
patch -p1 < rtems-rc-19991203-10.diff
Diffstat (limited to 'c')
13 files changed, 24 insertions, 20 deletions
diff --git a/c/src/lib/libbsp/m68k/gen68302/start/Makefile.in b/c/src/lib/libbsp/m68k/gen68302/start/Makefile.in index b557142309..7bde7951d0 100644 --- a/c/src/lib/libbsp/m68k/gen68302/start/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68302/start/Makefile.in @@ -6,7 +6,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = ../../.. -subdir = m68k/gen68302/start302 +subdir = m68k/gen68302/start RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/m68k/gen68340/start/Makefile.in b/c/src/lib/libbsp/m68k/gen68340/start/Makefile.in index f8998a63d7..8b2c8e26e0 100644 --- a/c/src/lib/libbsp/m68k/gen68340/start/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68340/start/Makefile.in @@ -6,7 +6,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = ../../.. -subdir = m68k/gen68340/start340 +subdir = m68k/gen68340/start RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/m68k/gen68360/start/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/start/Makefile.in index 549043fe8e..67c1ca887b 100644 --- a/c/src/lib/libbsp/m68k/gen68360/start/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/start/Makefile.in @@ -6,7 +6,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = ../../.. -subdir = m68k/gen68360/start360 +subdir = m68k/gen68360/start RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/m68k/ods68302/start/Makefile.in b/c/src/lib/libbsp/m68k/ods68302/start/Makefile.in index 92a8287f3d..3adfcf963c 100644 --- a/c/src/lib/libbsp/m68k/ods68302/start/Makefile.in +++ b/c/src/lib/libbsp/m68k/ods68302/start/Makefile.in @@ -6,7 +6,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = ../../.. -subdir = m68k/ods68302/start302 +subdir = m68k/ods68302/start RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/powerpc/mcp750/console/Makefile.in b/c/src/lib/libbsp/powerpc/mcp750/console/Makefile.in index 95b8c27b57..71ccd2bf98 100644 --- a/c/src/lib/libbsp/powerpc/mcp750/console/Makefile.in +++ b/c/src/lib/libbsp/powerpc/mcp750/console/Makefile.in @@ -18,7 +18,9 @@ C_PIECES = polled_io uart console inch C_FILES = $(C_PIECES:%=%.c) C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES = $(srcdir)/../../shared/console/consoleIo.h $(srcdir)/../../shared/console/keyboard.h $(srcdir)/../../shared/console/uart.h +H_FILES = $(srcdir)/../../shared/console/consoleIo.h \ + $(srcdir)/../../shared/console/keyboard.h \ + $(srcdir)/../../shared/console/uart.h # Assembly source names, if any, go here -- minus the .s S_PIECES = diff --git a/c/src/lib/libbsp/powerpc/mcp750/include/Makefile.in b/c/src/lib/libbsp/powerpc/mcp750/include/Makefile.in index cb3d87abd3..0063479249 100644 --- a/c/src/lib/libbsp/powerpc/mcp750/include/Makefile.in +++ b/c/src/lib/libbsp/powerpc/mcp750/include/Makefile.in @@ -17,8 +17,7 @@ H_FILES = $(srcdir)/../../shared/include/nvram.h \ $(srcdir)/../../shared/include/bsp.h BSP_H_FILES = $(srcdir)/../../shared/console/consoleIo.h \ - $(srcdir)/../../shared/console/uart.h \ - $(srcdir)/../../shared/irq/irq.h \ + $(srcdir)/../../shared/console/uart.h $(srcdir)/../../shared/irq/irq.h \ $(srcdir)/../../shared/motorola/motorola.h # @@ -39,7 +38,7 @@ include $(RTEMS_ROOT)/make/leaf.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs -INSTALLDIRS = $(PROJECT_INCLUDE) +INSTALLDIRS = $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp $(INSTALLDIRS): @$(mkinstalldirs) $(INSTALLDIRS) diff --git a/c/src/lib/libbsp/powerpc/mcp750/residual/Makefile.in b/c/src/lib/libbsp/powerpc/mcp750/residual/Makefile.in index af74498505..e94f6fdb6f 100644 --- a/c/src/lib/libbsp/powerpc/mcp750/residual/Makefile.in +++ b/c/src/lib/libbsp/powerpc/mcp750/residual/Makefile.in @@ -18,7 +18,8 @@ C_PIECES = $(RESIDUAL_C_PIECES) C_FILES = $(C_PIECES:%=%.c) C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES = $(srcdir)/../../shared/residual/pnp.h $(srcdir)/../../shared/residual/residual.h +H_FILES = $(srcdir)/../../shared/residual/pnp.h \ + $(srcdir)/../../shared/residual/residual.h SRCS = $(C_FILES) $(H_FILES) OBJS = $(C_O_FILES) 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 95b8c27b57..71ccd2bf98 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.in +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.in @@ -18,7 +18,9 @@ C_PIECES = polled_io uart console inch C_FILES = $(C_PIECES:%=%.c) C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES = $(srcdir)/../../shared/console/consoleIo.h $(srcdir)/../../shared/console/keyboard.h $(srcdir)/../../shared/console/uart.h +H_FILES = $(srcdir)/../../shared/console/consoleIo.h \ + $(srcdir)/../../shared/console/keyboard.h \ + $(srcdir)/../../shared/console/uart.h # Assembly source names, if any, go here -- minus the .s S_PIECES = diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.in index cb3d87abd3..0063479249 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.in +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.in @@ -17,8 +17,7 @@ H_FILES = $(srcdir)/../../shared/include/nvram.h \ $(srcdir)/../../shared/include/bsp.h BSP_H_FILES = $(srcdir)/../../shared/console/consoleIo.h \ - $(srcdir)/../../shared/console/uart.h \ - $(srcdir)/../../shared/irq/irq.h \ + $(srcdir)/../../shared/console/uart.h $(srcdir)/../../shared/irq/irq.h \ $(srcdir)/../../shared/motorola/motorola.h # @@ -39,7 +38,7 @@ include $(RTEMS_ROOT)/make/leaf.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs -INSTALLDIRS = $(PROJECT_INCLUDE) +INSTALLDIRS = $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp $(INSTALLDIRS): @$(mkinstalldirs) $(INSTALLDIRS) diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.in index af74498505..e94f6fdb6f 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.in +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.in @@ -18,7 +18,8 @@ C_PIECES = $(RESIDUAL_C_PIECES) C_FILES = $(C_PIECES:%=%.c) C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES = $(srcdir)/../../shared/residual/pnp.h $(srcdir)/../../shared/residual/residual.h +H_FILES = $(srcdir)/../../shared/residual/pnp.h \ + $(srcdir)/../../shared/residual/residual.h SRCS = $(C_FILES) $(H_FILES) OBJS = $(C_O_FILES) diff --git a/c/src/lib/libbsp/powerpc/shared/Makefile.in b/c/src/lib/libbsp/powerpc/shared/Makefile.in index a9c04df2cb..fc6a413784 100644 --- a/c/src/lib/libbsp/powerpc/shared/Makefile.in +++ b/c/src/lib/libbsp/powerpc/shared/Makefile.in @@ -23,13 +23,13 @@ SRCS = all: $(SRCS) # We only build the Network library if HAS_NETWORKING was defined -NETWORK_yes_V = dec21140 +NETWORK_yes_V = dec21140 NETWORK = $(NETWORK_$(HAS_NETWORKING)_V) # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUB_DIRS = clock console include pci residual openpic irq vectors \ - start startup motorola bootloader $(NETWORK) +SUBDIRS = clock console include pci residual openpic irq vectors start \ + startup motorola bootloader $(NETWORK) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/Makefile.in b/c/src/lib/libbsp/powerpc/shared/bootloader/Makefile.in index 4ab15dcc7e..5aa50af807 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/Makefile.in +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/Makefile.in @@ -14,11 +14,11 @@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@:@srcdir@/../../../shared:@srcdir@/../console # C source names, if any, go here -- minus the .c -C_PIECES = +C_PIECES = C_FILES = $(C_PIECES:%=%.c) C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES = @srcdir@/bootldr.h @srcdir@/zlib.h @srcdir@/pci.h +H_FILES = @srcdir@/bootldr.h @srcdir@/zlib.h @srcdir@/pci.h # Assembly source names, if any, go here -- minus the .s S_PIECES = diff --git a/c/src/lib/libbsp/powerpc/shared/start/Makefile.in b/c/src/lib/libbsp/powerpc/shared/start/Makefile.in index 08ba289e91..e4b90cc9ca 100644 --- a/c/src/lib/libbsp/powerpc/shared/start/Makefile.in +++ b/c/src/lib/libbsp/powerpc/shared/start/Makefile.in @@ -6,7 +6,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = ../../.. -subdir = powerpc/mcp750/start +subdir = powerpc/shared/start RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ |