From 0dcf8597c4ebf11e27ee5c69700deba44c87330c Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 2 Dec 2002 15:14:36 +0000 Subject: 2002-12-02 Ralf Corsepius * mpc8260/Makefile.am: Merge-in mpc8260/include/Makefile.am. * mpc8xx/Makefile.am: Merge-in mpc8xx/include/Makefile.am. * mpc8260/include/Makefile.am: Remove. * mpc8xx/include/Makefile.am: Remove. * configure.ac: Remove mpc8260/include/Makefile. Remove mpc8xx/include/Makefile. --- c/src/lib/libcpu/powerpc/ChangeLog | 9 ++++++++ c/src/lib/libcpu/powerpc/configure.ac | 2 -- c/src/lib/libcpu/powerpc/mpc8260/Makefile.am | 21 ++++++++++++++++- .../lib/libcpu/powerpc/mpc8260/include/Makefile.am | 26 ---------------------- c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am | 21 ++++++++++++++++- .../lib/libcpu/powerpc/mpc8xx/include/Makefile.am | 26 ---------------------- 6 files changed, 49 insertions(+), 56 deletions(-) delete mode 100644 c/src/lib/libcpu/powerpc/mpc8260/include/Makefile.am delete mode 100644 c/src/lib/libcpu/powerpc/mpc8xx/include/Makefile.am diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog index 17ad063f28..314cb7a7cd 100644 --- a/c/src/lib/libcpu/powerpc/ChangeLog +++ b/c/src/lib/libcpu/powerpc/ChangeLog @@ -1,3 +1,12 @@ +2002-12-02 Ralf Corsepius + + * mpc8260/Makefile.am: Merge-in mpc8260/include/Makefile.am. + * mpc8xx/Makefile.am: Merge-in mpc8xx/include/Makefile.am. + * mpc8260/include/Makefile.am: Remove. + * mpc8xx/include/Makefile.am: Remove. + * configure.ac: Remove mpc8260/include/Makefile. + Remove mpc8xx/include/Makefile. + 2002-12-01 Ralf Corsepius * configure.ac: Add RTEMS_PROG_CCAS. diff --git a/c/src/lib/libcpu/powerpc/configure.ac b/c/src/lib/libcpu/powerpc/configure.ac index 43f869dc16..6af8ae7ca3 100644 --- a/c/src/lib/libcpu/powerpc/configure.ac +++ b/c/src/lib/libcpu/powerpc/configure.ac @@ -62,7 +62,6 @@ mpc8xx/clock/Makefile mpc8xx/console-generic/Makefile mpc8xx/cpm/Makefile mpc8xx/exceptions/Makefile -mpc8xx/include/Makefile mpc8xx/mmu/Makefile mpc8xx/timer/Makefile ppc403/Makefile @@ -81,7 +80,6 @@ mpc6xx/wrapup/Makefile mpc8260/Makefile mpc8260/clock/Makefile mpc8260/console-generic/Makefile -mpc8260/include/Makefile mpc8260/timer/Makefile mpc8260/exceptions/Makefile mpc8260/mmu/Makefile diff --git a/c/src/lib/libcpu/powerpc/mpc8260/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8260/Makefile.am index fde1e2f248..3219b48f9b 100644 --- a/c/src/lib/libcpu/powerpc/mpc8260/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc8260/Makefile.am @@ -2,8 +2,27 @@ ## $Id$ ## +SUBDIRS = . console-generic clock timer exceptions mmu cpm -SUBDIRS = include console-generic clock timer exceptions mmu cpm +include_mpc8260dir = $(includedir)/mpc8260 + +include_HEADERS = include/mpc8260.h +include_mpc8260_HEADERS = include/console.h include/mmu.h include/cpm.h + +PREINSTALL_FILES = $(PROJECT_INCLUDE)/mpc8260 \ + $(include_HEADERS:include/%=$(PROJECT_INCLUDE)/%) \ + $(include_mpc8260_HEADERS:include/%=$(PROJECT_INCLUDE)/mpc8260/%) + +$(PROJECT_INCLUDE)/mpc8260: + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/%.h: include/%.h + $(INSTALL_DATA) $< $@ + +$(PROJECT_INCLUDE)/mpc8260/%.h: include/%.h + $(INSTALL_DATA) $< $@ + +all-local: $(PREINSTALL_FILES) include $(top_srcdir)/../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libcpu/powerpc/mpc8260/include/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8260/include/Makefile.am deleted file mode 100644 index 552f10f2a0..0000000000 --- a/c/src/lib/libcpu/powerpc/mpc8260/include/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -## -## $Id$ -## - - -include_mpc8260dir = $(includedir)/mpc8260 - -include_HEADERS = mpc8260.h -include_mpc8260_HEADERS = console.h mmu.h cpm.h - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/mpc8260 \ - $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) \ - $(include_mpc8260_HEADERS:%=$(PROJECT_INCLUDE)/mpc8260/%) - -$(PROJECT_INCLUDE)/mpc8260: - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/mpc8260/%.h: %.h - $(INSTALL_DATA) $< $@ - -all-local: $(PREINSTALL_FILES) - -include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am index 6df975c921..86fd518c6f 100644 --- a/c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am @@ -2,8 +2,27 @@ ## $Id$ ## +SUBDIRS = . console-generic clock timer cpm mmu exceptions -SUBDIRS = include console-generic clock timer cpm mmu exceptions +include_mpc8xxdir = $(includedir)/mpc8xx + +include_HEADERS = include/mpc8xx.h +include_mpc8xx_HEADERS = include/console.h include/cpm.h include/mmu.h + +PREINSTALL_FILES = $(PROJECT_INCLUDE)/mpc8xx \ + $(include_HEADERS:include/%=$(PROJECT_INCLUDE)/%) \ + $(include_mpc8xx_HEADERS:include/%=$(PROJECT_INCLUDE)/mpc8xx/%) + +$(PROJECT_INCLUDE)/mpc8xx: + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/%.h: include/%.h + $(INSTALL_DATA) $< $@ + +$(PROJECT_INCLUDE)/mpc8xx/%.h: include/%.h + $(INSTALL_DATA) $< $@ + +all-local: $(PREINSTALL_FILES) include $(top_srcdir)/../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/include/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/include/Makefile.am deleted file mode 100644 index 78214486a5..0000000000 --- a/c/src/lib/libcpu/powerpc/mpc8xx/include/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -## -## $Id$ -## - - -include_mpc8xxdir = $(includedir)/mpc8xx - -include_HEADERS = mpc8xx.h -include_mpc8xx_HEADERS = console.h cpm.h mmu.h - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/mpc8xx \ - $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) \ - $(include_mpc8xx_HEADERS:%=$(PROJECT_INCLUDE)/mpc8xx/%) - -$(PROJECT_INCLUDE)/mpc8xx: - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/mpc8xx/%.h: %.h - $(INSTALL_DATA) $< $@ - -all-local: $(PREINSTALL_FILES) - -include $(top_srcdir)/../../../../../automake/local.am -- cgit v1.2.3