summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libcpu/m68k
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2002-08-06 14:20:40 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2002-08-06 14:20:40 +0000
commitc5ada0b35a59f08d4730646bb4c918420f228b5b (patch)
tree2e4f8e27f8e5ae749a80b969c8dcc04bf23b0686 /c/src/lib/libcpu/m68k
parent2002-08-06 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-c5ada0b35a59f08d4730646bb4c918420f228b5b.tar.bz2
2002-08-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Replace mcpu32 by mcpu32p conditional. * share/misc/Makefile.am: Fix AM_CPPFLAGS bug.
Diffstat (limited to 'c/src/lib/libcpu/m68k')
-rw-r--r--c/src/lib/libcpu/m68k/ChangeLog5
-rw-r--r--c/src/lib/libcpu/m68k/configure.ac2
-rw-r--r--c/src/lib/libcpu/m68k/shared/misc/Makefile.am4
3 files changed, 9 insertions, 2 deletions
diff --git a/c/src/lib/libcpu/m68k/ChangeLog b/c/src/lib/libcpu/m68k/ChangeLog
index f89966b43f..721d4fdc20 100644
--- a/c/src/lib/libcpu/m68k/ChangeLog
+++ b/c/src/lib/libcpu/m68k/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.ac: Replace mcpu32 by mcpu32p conditional.
+ * share/misc/Makefile.am: Fix AM_CPPFLAGS bug.
+
2002-08-05 Joel Sherrill <joel@OARcorp.com>
* Per PR260 eliminate use of make-target-options. This impacted
diff --git a/c/src/lib/libcpu/m68k/configure.ac b/c/src/lib/libcpu/m68k/configure.ac
index 9286d795d5..4c5e5b5a28 100644
--- a/c/src/lib/libcpu/m68k/configure.ac
+++ b/c/src/lib/libcpu/m68k/configure.ac
@@ -42,7 +42,7 @@ AM_CONDITIONAL(m68040, test "$RTEMS_CPU_MODEL" = "m68040")
AM_CONDITIONAL(mcf5206, test "$RTEMS_CPU_MODEL" = "mcf5206")
-AM_CONDITIONAL(mcpu32, test "$RTEMS_CPU_MODEL" = "mcpu32")
+AM_CONDITIONAL(mcpu32p, test "$RTEMS_CPU_MODEL" = "mcpu32p")
case "$RTEMS_CPU_MODEL" in
mcf5206 ) AC_CONFIG_SUBDIRS([mcf5206]);;
diff --git a/c/src/lib/libcpu/m68k/shared/misc/Makefile.am b/c/src/lib/libcpu/m68k/shared/misc/Makefile.am
index fade9ff257..d0688c3f1c 100644
--- a/c/src/lib/libcpu/m68k/shared/misc/Makefile.am
+++ b/c/src/lib/libcpu/m68k/shared/misc/Makefile.am
@@ -14,9 +14,11 @@ include $(top_srcdir)/../../../../../automake/lib.am
# gcc doesn't recognize difference between the cpu32 and cpu32+ so we have to
if mcpu32p
-AM_CPPFLAGS += -D__mcpu32p__
+MCPU32P_CPPFLAGS = -D__mcpu32p__
endif
+AM_CPPFLAGS += $(MCPU32P_CPPFLAGS)
+
all-local: $(ARCH) $(OBJS)
EXTRA_DIST = memcpy.c