summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libcpu/powerpc/mpc8xx
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2002-12-02 15:14:36 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2002-12-02 15:14:36 +0000
commit0dcf8597c4ebf11e27ee5c69700deba44c87330c (patch)
tree6cb6f978746111e5446988dd422c387fdac1c5ce /c/src/lib/libcpu/powerpc/mpc8xx
parent2002-12-02 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-0dcf8597c4ebf11e27ee5c69700deba44c87330c.tar.bz2
2002-12-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* 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.
Diffstat (limited to 'c/src/lib/libcpu/powerpc/mpc8xx')
-rw-r--r--c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am21
-rw-r--r--c/src/lib/libcpu/powerpc/mpc8xx/include/Makefile.am26
2 files changed, 20 insertions, 27 deletions
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