summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-11-28 19:09:22 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-11-28 19:09:22 +0000
commit825b1197038511e491d70f71727a1515fd87721a (patch)
tree363bc3f1f6d702265d5424aacaa60f18c9605cb6
parentb6084844ddc303b5c0a8b49be04872216e87347d (diff)
downloadrtems-825b1197038511e491d70f71727a1515fd87721a.tar.bz2
2001-11-28 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/Makefile.am: Use _HEADER instead of H_FILES. * irq/Makefile.am: Ditto. * openpic/Makefile.am: Ditto. * include/bsp.h: Include <bspopts.h>.
-rw-r--r--c/src/lib/libbsp/powerpc/shared/ChangeLog7
-rw-r--r--c/src/lib/libbsp/powerpc/shared/include/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/shared/include/bsp.h2
-rw-r--r--c/src/lib/libbsp/powerpc/shared/irq/Makefile.am5
-rw-r--r--c/src/lib/libbsp/powerpc/shared/openpic/Makefile.am7
5 files changed, 17 insertions, 8 deletions
diff --git a/c/src/lib/libbsp/powerpc/shared/ChangeLog b/c/src/lib/libbsp/powerpc/shared/ChangeLog
index 27101e1886..49c3279791 100644
--- a/c/src/lib/libbsp/powerpc/shared/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/shared/ChangeLog
@@ -1,3 +1,10 @@
+ * include/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * irq/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * motorola/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * openpic/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * pci/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * residual/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * start/Makefile.am: Remove AUTOMAKE_OPTIONS.
* startup/Makefile.am: Remove AUTOMAKE_OPTIONS.
* vectors/Makefile.am: Remove AUTOMAKE_OPTIONS.
diff --git a/c/src/lib/libbsp/powerpc/shared/include/Makefile.am b/c/src/lib/libbsp/powerpc/shared/include/Makefile.am
index 0f1ce0ff94..2e32a786c4 100644
--- a/c/src/lib/libbsp/powerpc/shared/include/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/shared/include/Makefile.am
@@ -4,8 +4,6 @@
AUTOMAKE_OPTIONS = foreign 1.4
-H_FILES = nvram.h bsp.h
-
-EXTRA_DIST = bsp.h nvram.h
+noinst_HEADERS = nvram.h bsp.h
include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/shared/include/bsp.h b/c/src/lib/libbsp/powerpc/shared/include/bsp.h
index 2da65dc5e9..1f969ce9ef 100644
--- a/c/src/lib/libbsp/powerpc/shared/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/shared/include/bsp.h
@@ -12,6 +12,8 @@
#ifndef LIBBSP_POWERPC_MOTOROLA_SHARED_BSP_H
#define LIBBSP_POWERPC_MOTOROLA_SHARED_BSP_H
+#include <bspopts.h>
+
#include <rtems.h>
#include <console.h>
#include <libcpu/io.h>
diff --git a/c/src/lib/libbsp/powerpc/shared/irq/Makefile.am b/c/src/lib/libbsp/powerpc/shared/irq/Makefile.am
index 852e8a0c44..8c671f0c79 100644
--- a/c/src/lib/libbsp/powerpc/shared/irq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/shared/irq/Makefile.am
@@ -6,7 +6,8 @@ AUTOMAKE_OPTIONS = foreign 1.4
C_FILES = i8259.c irq.c irq_init.c
-H_FILES = irq.h
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS = irq.h
S_FILES = irq_asm.S
@@ -17,7 +18,7 @@ $(PROJECT_INCLUDE)/bsp/%.h: %.h
$(INSTALL_DATA) $< $@
PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp \
- $(H_FILES:%.h=$(PROJECT_INCLUDE)/bsp/%.h)
+ $(include_bsp_HEADERS:%=$(PROJECT_INCLUDE)/bsp/%)
all-local: $(PREINSTALL_FILES)
diff --git a/c/src/lib/libbsp/powerpc/shared/openpic/Makefile.am b/c/src/lib/libbsp/powerpc/shared/openpic/Makefile.am
index fd1aabfa50..ce2cbf56c1 100644
--- a/c/src/lib/libbsp/powerpc/shared/openpic/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/shared/openpic/Makefile.am
@@ -6,7 +6,8 @@ AUTOMAKE_OPTIONS = foreign 1.4
C_FILES = openpic.c
-H_FILES = openpic.h
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS = openpic.h
$(PROJECT_INCLUDE)/bsp:
$(mkinstalldirs) $@
@@ -15,10 +16,10 @@ $(PROJECT_INCLUDE)/bsp/%.h: %.h
$(INSTALL_DATA) $< $@
PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp \
- $(H_FILES:%.h=$(PROJECT_INCLUDE)/bsp/%.h)
+ $(include_bsp_HEADERS:%=$(PROJECT_INCLUDE)/bsp/%)
all-local: $(PREINSTALL_FILES)
-EXTRA_DIST = openpic.c openpic.h
+EXTRA_DIST = openpic.c
include $(top_srcdir)/../../../../../automake/local.am