From a942a7ef75bcf5c7a50111a5c8b915aec5868101 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 24 Oct 2001 23:55:27 +0000 Subject: 2001-10-24 Ralf Corsepius * mpc8260/exceptions/Makefile.am, mpc8260/include/Makefile.am, mpc8xx/exceptions/Makefile.am: Updated to autoconf 2.52. --- c/src/lib/libcpu/powerpc/ChangeLog | 5 +++++ c/src/lib/libcpu/powerpc/mpc8260/exceptions/Makefile.am | 7 ++++--- c/src/lib/libcpu/powerpc/mpc8260/include/Makefile.am | 12 ++++++------ c/src/lib/libcpu/powerpc/mpc8xx/exceptions/Makefile.am | 5 +++-- 4 files changed, 18 insertions(+), 11 deletions(-) (limited to 'c/src/lib') diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog index 493f6d6856..2e7f01c981 100644 --- a/c/src/lib/libcpu/powerpc/ChangeLog +++ b/c/src/lib/libcpu/powerpc/ChangeLog @@ -1,3 +1,8 @@ +2001-10-24 Ralf Corsepius + + * mpc8260/exceptions/Makefile.am, mpc8260/include/Makefile.am, + mpc8xx/exceptions/Makefile.am: Updated to autoconf 2.52. + 2001-10-24 Joel Sherrill * mpc8260/include/mpc8260.h: "or" is a keyword in C++. diff --git a/c/src/lib/libcpu/powerpc/mpc8260/exceptions/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8260/exceptions/Makefile.am index d79699810d..bfc3d5b861 100644 --- a/c/src/lib/libcpu/powerpc/mpc8260/exceptions/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc8260/exceptions/Makefile.am @@ -10,7 +10,8 @@ C_FILES = raw_exception.c S_FILES = asm_utils.S -H_FILES = raw_exception.h +include_libcpudir = $(includedir)/libcpu +include_libcpu_HEADERS = raw_exception.h exceptions_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) \ $(S_FILES:%.S=$(ARCH)/%.o) @@ -31,8 +32,8 @@ $(PROJECT_INCLUDE)/libcpu/%.h: %.h $(PGM): $(exceptions_rel_OBJECTS) $(make-rel) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \ - $(PROJECT_INCLUDE)/libcpu/raw_exception.h +PREINSTALL_FILES = $(PROJECT_INCLUDE)/libcpu \ + $(include_libcpu_HEADERS:%=$(PROJECT_INCLUDE)/libcpu/%) all-local: $(ARCH) $(PREINSTALL_FILES) $(exceptions_rel_OBJECTS) $(PGM) diff --git a/c/src/lib/libcpu/powerpc/mpc8260/include/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8260/include/Makefile.am index 5dc0a978f2..5fe2aaa9e0 100644 --- a/c/src/lib/libcpu/powerpc/mpc8260/include/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc8260/include/Makefile.am @@ -4,14 +4,14 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = mpc8260.h -MPC8260_H_FILES = console.h mmu.h cpm.h +include_mpc8260dir = $(includedir)/mpc8260 -noinst_HEADERS = $(H_FILES) $(MPC8260_H_FILES) +include_HEADERS = mpc8260.h +include_mpc8260_HEADERS = console.h mmu.h cpm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8260 \ - $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \ - $(MPC8260_H_FILES:%.h=$(PROJECT_INCLUDE)/mpc8260/%.h) +PREINSTALL_FILES = $(PROJECT_INCLUDE)/mpc8260 \ + $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) \ + $(include_mpc8260_HEADERS:%=$(PROJECT_INCLUDE)/mpc8260/%) $(PROJECT_INCLUDE)/mpc8260: $(mkinstalldirs) $@ diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/exceptions/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/exceptions/Makefile.am index 3ef944acf4..bfc3d5b861 100644 --- a/c/src/lib/libcpu/powerpc/mpc8xx/exceptions/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc8xx/exceptions/Makefile.am @@ -10,7 +10,8 @@ C_FILES = raw_exception.c S_FILES = asm_utils.S -H_FILES = raw_exception.h +include_libcpudir = $(includedir)/libcpu +include_libcpu_HEADERS = raw_exception.h exceptions_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) \ $(S_FILES:%.S=$(ARCH)/%.o) @@ -32,7 +33,7 @@ $(PGM): $(exceptions_rel_OBJECTS) $(make-rel) PREINSTALL_FILES = $(PROJECT_INCLUDE)/libcpu \ - $(PROJECT_INCLUDE)/libcpu/raw_exception.h + $(include_libcpu_HEADERS:%=$(PROJECT_INCLUDE)/libcpu/%) all-local: $(ARCH) $(PREINSTALL_FILES) $(exceptions_rel_OBJECTS) $(PGM) -- cgit v1.2.3