diff options
-rw-r--r-- | c/src/lib/libcpu/arm/ChangeLog | 7 | ||||
-rw-r--r-- | c/src/lib/libcpu/arm/configure.ac | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/c/src/lib/libcpu/arm/ChangeLog b/c/src/lib/libcpu/arm/ChangeLog index d4dde220d2..72afdf9572 100644 --- a/c/src/lib/libcpu/arm/ChangeLog +++ b/c/src/lib/libcpu/arm/ChangeLog @@ -1,3 +1,10 @@ +2005-05-11 Ralf Corsepius <ralf.corsepius@rtems.org> + + * Makefile.am: Merge-in shared/Makefile.am. + * preinstall.am: New. + * shared/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2005-05-03 Joel Sherrill <joel@OARcorp.com> * mc9328mxl/irq/irq.c, s3c2400/irq/irq.c: Remove warnings. diff --git a/c/src/lib/libcpu/arm/configure.ac b/c/src/lib/libcpu/arm/configure.ac index 8dcfbe32c4..9d67c86680 100644 --- a/c/src/lib/libcpu/arm/configure.ac +++ b/c/src/lib/libcpu/arm/configure.ac @@ -30,9 +30,12 @@ AM_CONDITIONAL(at91rm9200, test "$RTEMS_CPU_MODEL" = "at91rm9200") AM_CONDITIONAL(mc9328mxl, test "$RTEMS_CPU_MODEL" = "mc9328mxl") AM_CONDITIONAL(s3c2400, test "$RTEMS_CPU_MODEL" = "s3c2400") +AC_PATH_PROG([AMPOLISH3],[ampolish3],[]) +AM_CONDITIONAL([AMPOLISH3],[test x"$USE_MAINTAINER_MODE" = x"yes" \ + && test -n "$AMPOLISH3"]) + # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile -shared/Makefile at91rm9200/Makefile mc9328mxl/Makefile s3c2400/Makefile |