summaryrefslogtreecommitdiffstats
path: root/c/src
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-11-14 18:44:17 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-11-14 18:44:17 +0000
commit5f4867debf3215d68c60851bba4c9cfa742ecd15 (patch)
tree4a0363557592a5837eb3151b574fb03b2a9b2249 /c/src
parent7409426d8792168f7d7a8645cae8b0bb22ba7b01 (diff)
downloadrtems-5f4867debf3215d68c60851bba4c9cfa742ecd15.tar.bz2
2001-11-10 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Add bspopts.h. * include/.cvsignore: Add stamp-h* and bspopts.h*. * include/Makefile.am: Add bspopts.h. * pci/Makefile.am: Append -O2 to AM_CFLAGS.
Diffstat (limited to 'c/src')
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog7
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac1
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/include/.cvsignore2
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.am8
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am2
5 files changed, 18 insertions, 2 deletions
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog
index d7aa6cef60..ea64ff5b06 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog
@@ -1,3 +1,10 @@
+ * Makefile.am: Add @exceptions@ to SUBDIRS;
+ Remove need_motorola_powerpc.
+ * configure.ac: Apply RTEMS_BSPOPTS_*(*) to merge-in settings from
+ make/custom/mcp750.cfg, make/custom/mvme2307.cfg;
+ Remove need_motorola_powerpc;
+ Add RTEMS_PPC_EXCEPTIONS([new]).
+ * include/Makefile.am: Replace PREINSTALL_FILES with
TMPINSTALL_FILES, include force-preinstall.am.
* wrapup/Makefile.am: Apply @exceptions@.
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac
index e72acb647e..879374f718 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac
@@ -28,6 +28,7 @@ AM_CONDITIONAL(need_motorola_powerpc, test "$RTEMS_BSP_FAMILY" = "motorola_power
AS=$CC
AM_PROG_AS
+AM_CONFIG_HEADER(include/bspopts.h)
RTEMS_PROJECT_ROOT
# Explicitly list all Makefiles here
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/.cvsignore b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/.cvsignore
index 282522db03..2be206e5ff 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/.cvsignore
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/.cvsignore
@@ -1,2 +1,4 @@
Makefile
Makefile.in
+stamp-h*
+bspopts.h*
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 e21d7ca022..4ae605a8e8 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.am
@@ -4,6 +4,8 @@
AUTOMAKE_OPTIONS = foreign 1.4
+include_HEADERS = bspopts.h
+
H_FILES = ../../shared/include/nvram.h ../../shared/include/bsp.h \
../../../shared/include/coverhd.h
@@ -16,6 +18,9 @@ $(PROJECT_INCLUDE):
$(PROJECT_INCLUDE)/bsp:
$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/%.h: %.h
+ $(INSTALL_DATA) $< $@
+
$(PROJECT_INCLUDE)/nvram.h: ../../shared/include/nvram.h
$(INSTALL_DATA) $< $@
@@ -41,7 +46,8 @@ PREINSTALL_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
+ $(PROJECT_INCLUDE)/bsp/motorola.h \
+ $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
all-local: $(PREINSTALL_FILES)
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am
index bcc30a506b..380f48f065 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am
@@ -21,7 +21,7 @@ include $(top_srcdir)/../../../../../../automake/lib.am
# (OPTIONAL) Add local stuff here using +=
#
-AM_CFLAGS = -O2
+AM_CFLAGS += -O2
$(PROJECT_INCLUDE)/bsp:
$(mkinstalldirs) $<