From fb16fed75af901ef67a2f887fc119b37414eccfb Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 21 Dec 1999 15:25:05 +0000 Subject: Patch rtems-rc-19991203-10.diff from Ralf Corsepius 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 --- c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.in | 4 +++- c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.in | 5 ++--- c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.in | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) (limited to 'c/src/lib/libbsp/powerpc/motorola_powerpc') 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) -- cgit v1.2.3