From 825b1197038511e491d70f71727a1515fd87721a Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 28 Nov 2001 19:09:22 +0000 Subject: 2001-11-28 Ralf Corsepius * include/Makefile.am: Use _HEADER instead of H_FILES. * irq/Makefile.am: Ditto. * openpic/Makefile.am: Ditto. * include/bsp.h: Include . --- c/src/lib/libbsp/powerpc/shared/ChangeLog | 7 +++++++ c/src/lib/libbsp/powerpc/shared/include/Makefile.am | 4 +--- c/src/lib/libbsp/powerpc/shared/include/bsp.h | 2 ++ c/src/lib/libbsp/powerpc/shared/irq/Makefile.am | 5 +++-- c/src/lib/libbsp/powerpc/shared/openpic/Makefile.am | 7 ++++--- 5 files changed, 17 insertions(+), 8 deletions(-) (limited to 'c/src/lib') 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 + #include #include #include 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 -- cgit v1.2.3