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
This commit is contained in:
Joel Sherrill
1999-12-21 15:25:05 +00:00
parent 9ba1f0a79e
commit fb16fed75a
13 changed files with 24 additions and 20 deletions

View File

@@ -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@

View File

@@ -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@

View File

@@ -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@

View File

@@ -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@

View File

@@ -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 =

View File

@@ -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)

View File

@@ -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)

View File

@@ -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 =

View File

@@ -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)

View File

@@ -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)

View File

@@ -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) \

View File

@@ -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 =

View File

@@ -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@