summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2005-07-08 21:39:58 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2005-07-08 21:39:58 +0000
commitfb875a8585e87c05fa8fc0a75fe19d2c1170164c (patch)
treeee8b73694ac99f0a313ba6cdb775bf72ce078cc9 /c
parent2005-06-17 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-fb875a8585e87c05fa8fc0a75fe19d2c1170164c.tar.bz2
2005-07-08 Joel Sherrill <joel@OARcorp.com>
* Makefile.am: Eliminate duplicate entry for include_mcf5235... .
Diffstat (limited to 'c')
-rw-r--r--c/src/lib/libcpu/m68k/ChangeLog4
-rw-r--r--c/src/lib/libcpu/m68k/Makefile.am8
2 files changed, 5 insertions, 7 deletions
diff --git a/c/src/lib/libcpu/m68k/ChangeLog b/c/src/lib/libcpu/m68k/ChangeLog
index 2df6187e26..03349de5ed 100644
--- a/c/src/lib/libcpu/m68k/ChangeLog
+++ b/c/src/lib/libcpu/m68k/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-08 Joel Sherrill <joel@OARcorp.com>
+
+ * Makefile.am: Eliminate duplicate entry for include_mcf5235... .
+
2005-06-17 Mike Bertosh <mbertosh@motioncontrol.org>
* ChangeLog, Makefile.am, configure.ac, preinstall.am: Addition of
diff --git a/c/src/lib/libcpu/m68k/Makefile.am b/c/src/lib/libcpu/m68k/Makefile.am
index 308649faa1..0852d6c1d8 100644
--- a/c/src/lib/libcpu/m68k/Makefile.am
+++ b/c/src/lib/libcpu/m68k/Makefile.am
@@ -96,7 +96,7 @@ mcf5206_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
endif
if mcf5235
-## mcf5238/include
+## mcf5235/include
include_mcf5235dir = $(includedir)/mcf5235
include_mcf5235_HEADERS = mfc5235/include/mcf5235.h
endif
@@ -125,12 +125,6 @@ include_mcf5282dir = $(includedir)/mcf5282
include_mcf5282_HEADERS = mcf5282/include/mcf5282.h
endif
-if mcf5235
-## mcf5235/include
-include_mcf5235dir = $(includedir)/mcf5235
-include_mcf5235_HEADERS = mcf5235/include/mcf5235.h
-endif
-
include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../automake/local.am