summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2002-07-24 10:13:10 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2002-07-24 10:13:10 +0000
commit115a390f61a1e9752c259b179ef822e7fcf3b9ee (patch)
tree81dd4479fff2fc391bb4daba67ca20eeb311a76b
parent323845bd6742a49677a0c59ae1de92e29607ba0f (diff)
downloadrtems-115a390f61a1e9752c259b179ef822e7fcf3b9ee.tar.bz2
2002-07-24 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/Makefile.am: Fix preinstallation. * bootloader: Eliminate $(INCLUDES).
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog5
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am2
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.am23
3 files changed, 20 insertions, 10 deletions
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog
index 8ac592e788..767a733741 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-24 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * include/Makefile.am: Fix preinstallation.
+ * bootloader: Eliminate $(INCLUDES).
+
2002-07-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* start/Makefile.am: Eliminate PGM.
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am
index 652d4b5099..254c6cd74f 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am
@@ -30,7 +30,7 @@ AM_CFLAGS = \
-msoft-float -mstrict-align -fno-builtin -Wall -mmultiple \
-mstring -O2 -fomit-frame-pointer -ffixed-r13 -mno-sdata \
$(CPU_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES) $(AM_CPPFLAGS) \
+AM_CCASFLAGS = $(AM_CPPFLAGS) \
$(GCC_SPECS) -specs bsp_specs -qrtems -mrelocatable \
-DASM $(CPU_CFLAGS)
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.am
index 5d36b99c3a..2d210ce756 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.am
@@ -2,13 +2,13 @@
## $Id$
##
-
include_HEADERS = bspopts.h
-H_FILES = ../../shared/include/nvram.h ../../shared/include/bsp.h \
+include_HEADERS += ../../shared/include/nvram.h ../../shared/include/bsp.h \
../../../shared/include/coverhd.h
-BSP_H_FILES = ../../shared/console/consoleIo.h ../../shared/console/uart.h \
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS = ../../shared/console/consoleIo.h ../../shared/console/uart.h \
../../shared/irq/irq.h ../../shared/motorola/motorola.h
$(PROJECT_INCLUDE):
@@ -41,12 +41,17 @@ $(PROJECT_INCLUDE)/bsp/irq.h: ../../shared/irq/irq.h
$(PROJECT_INCLUDE)/bsp/motorola.h: ../../shared/motorola/motorola.h
$(INSTALL_DATA) $< $@
-TMPINSTALL_FILES = $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp \
- $(PROJECT_INCLUDE)/nvram.h $(PROJECT_INCLUDE)/bsp.h \
- $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_INCLUDE)/bsp/consoleIo.h \
- $(PROJECT_INCLUDE)/bsp/uart.h $(PROJECT_INCLUDE)/bsp/irq.h \
- $(PROJECT_INCLUDE)/bsp/motorola.h \
- $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
+TMPINSTALL_FILES = $(PROJECT_INCLUDE)
+TMPINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
+TMPINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
+TMPINSTALL_FILES += $(PROJECT_INCLUDE)/nvram.h
+TMPINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
+
+TMPINSTALL_FILES += $(PROJECT_INCLUDE)/bsp
+TMPINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/motorola.h
+TMPINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/consoleIo.h
+TMPINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart.h
+TMPINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
all-local: $(TMPINSTALL_FILES)