From c5ada0b35a59f08d4730646bb4c918420f228b5b Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 6 Aug 2002 14:20:40 +0000 Subject: 2002-08-06 Ralf Corsepius * configure.ac: Replace mcpu32 by mcpu32p conditional. * share/misc/Makefile.am: Fix AM_CPPFLAGS bug. --- c/src/lib/libcpu/m68k/ChangeLog | 5 +++++ c/src/lib/libcpu/m68k/configure.ac | 2 +- c/src/lib/libcpu/m68k/shared/misc/Makefile.am | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) (limited to 'c/src/lib/libcpu/m68k') 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 + + * configure.ac: Replace mcpu32 by mcpu32p conditional. + * share/misc/Makefile.am: Fix AM_CPPFLAGS bug. + 2002-08-05 Joel Sherrill * 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 -- cgit v1.2.3