From b55e727e6d4e7452a1e858801d9dbc803429b2c5 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 21 Jan 2004 06:42:49 +0000 Subject: 2003-01-21 Ralf Corsepius * Makefile.am: Unconditionally build subdirs sh7032, sh7045, sh7750. * configure.ac: Merge-in sh7032/configure.ac, sh7045/configure.ac, sh7750/configure.ac. Add AM_CONDITIONALS sh7032, sh7045, sh7750. * sh7032/Makefile.am, sh7045/Makefile.am, sh7750/Makefile.am: Reflect changes above. Add PREINSTALL_DIRS. * sh7032/configure.ac, sh7045/configure.ac, sh7750/configure.ac: Remove. * sh7032/.cvsignore, sh7045/.cvsignore, sh7750/.cvsignore: Reflect changes above. --- c/src/lib/libcpu/sh/configure.ac | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'c/src/lib/libcpu/sh/configure.ac') diff --git a/c/src/lib/libcpu/sh/configure.ac b/c/src/lib/libcpu/sh/configure.ac index 0d036ed05f..3af95e5427 100644 --- a/c/src/lib/libcpu/sh/configure.ac +++ b/c/src/lib/libcpu/sh/configure.ac @@ -9,24 +9,29 @@ RTEMS_TOP(../../../../..) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE([no-define foreign 1.8]) +AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.8.2]) AM_MAINTAINER_MODE RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP - RTEMS_PROJECT_ROOT +RTEMS_PROG_CC_FOR_TARGET +AM_PROG_CC_C_O +RTEMS_CANONICALIZE_TOOLS +RTEMS_PROG_CCAS + RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -case "$RTEMS_CPU_MODEL" in -sh7032 ) AC_CONFIG_SUBDIRS([sh7032]);; -sh7045 ) AC_CONFIG_SUBDIRS([sh7045]);; -sh7750 ) AC_CONFIG_SUBDIRS([sh7750]);; -*) AC_MSG_ERROR([Invalid RTEMS_CPU_MODEL]); -esac +AM_CONDITIONAL([sh7032],[test x"$RTEMS_CPU_MODEL" = x"sh7032"]) +AM_CONDITIONAL([sh7045],[test x"$RTEMS_CPU_MODEL" = x"sh7045"]) +AM_CONDITIONAL([sh7750],[test x"$RTEMS_CPU_MODEL" = x"sh7750"]) # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([Makefile +sh7032/Makefile +sh7045/Makefile +sh7750/Makefile +]) AC_OUTPUT -- cgit v1.2.3