diff options
| -rw-r--r-- | cpukit/aclocal/rtems-cpu-subdirs.m4 | 30 | ||||
| -rw-r--r-- | cpukit/configure.ac | 18 | ||||
| -rw-r--r-- | cpukit/score/cpu/Makefile.am | 5 |
3 files changed, 17 insertions, 36 deletions
diff --git a/cpukit/aclocal/rtems-cpu-subdirs.m4 b/cpukit/aclocal/rtems-cpu-subdirs.m4 deleted file mode 100644 index 260e9fcd43..0000000000 --- a/cpukit/aclocal/rtems-cpu-subdirs.m4 +++ /dev/null @@ -1,30 +0,0 @@ -AC_DEFUN([_RTEMS_CPU_SUBDIR], -[ -$1 ) if test -d ${srcdir}/ifelse([$2],,[$1],[$2/$1]) ; then - AC_CONFIG_SUBDIRS(ifelse([$2],,[$1],[$2/$1])) - fi -]) - -## RTEMS_CPU_SUBDIRS([PREFIX]) -AC_DEFUN([RTEMS_CPU_SUBDIRS], -[ -## EDIT: If adding a new cpu to RTEMS, add it to the case block below. -case $RTEMS_CPU in -_RTEMS_CPU_SUBDIR([a29k],[$1]);; -_RTEMS_CPU_SUBDIR([arm],[$1]);; -_RTEMS_CPU_SUBDIR([c4x],[$1]);; -_RTEMS_CPU_SUBDIR([h8300],[$1]);; -_RTEMS_CPU_SUBDIR([hppa1.1],[$1]);; -_RTEMS_CPU_SUBDIR([i386],[$1]);; -_RTEMS_CPU_SUBDIR([i960],[$1]);; -_RTEMS_CPU_SUBDIR([m68k],[$1]);; -_RTEMS_CPU_SUBDIR([mips],[$1]);; -_RTEMS_CPU_SUBDIR([no_cpu],[$1]);; -_RTEMS_CPU_SUBDIR([or32],[$1]);; -_RTEMS_CPU_SUBDIR([powerpc],[$1]);; -_RTEMS_CPU_SUBDIR([sh],[$1]);; -_RTEMS_CPU_SUBDIR([sparc],[$1]);; -_RTEMS_CPU_SUBDIR([unix],[$1]);; -*) AC_MSG_ERROR([Invalid RTEMS_CPU]) -esac -]) diff --git a/cpukit/configure.ac b/cpukit/configure.ac index 27c0133c68..e487857085 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -47,8 +47,6 @@ RTEMS_CHECK_POSIX_API RTEMS_CHECK_ITRON_API RTEMS_CHECK_NETWORKING -RTEMS_CPU_SUBDIRS([score/cpu]) - AS_IF([test x"$HAS_NETWORKING" = x"yes"],[ ## FIXME: Should better use a feature-based test AC_MSG_CHECKING([whether CPU supports librpc]) @@ -91,6 +89,10 @@ AC_CHECK_FUNCS([bcopy bcmp]) AC_CHECK_FUNCS([isascii fileno]) AS_IF([test x"${RTEMS_CPU}" = x"unix"],[ +## FIXME: This check is doubtful +AS_IF([test "$HAS_MP" = "yes"], + [RTEMS_CHECK_SYSV_UNIX]) + ## The code fragment below had been used in tools/cpu/unix/gensize.c. ## FIXME: ## * The pad very likely is not necessary. @@ -311,6 +313,18 @@ rtems/Makefile sapi/Makefile score/Makefile score/cpu/Makefile +score/cpu/arm/Makefile +score/cpu/c4x/Makefile +score/cpu/h8300/Makefile +score/cpu/i386/Makefile +score/cpu/i960/Makefile +score/cpu/m68k/Makefile +score/cpu/mips/Makefile +score/cpu/or32/Makefile +score/cpu/powerpc/Makefile +score/cpu/sh/Makefile +score/cpu/sparc/Makefile +score/cpu/unix/Makefile posix/Makefile itron/Makefile libblock/Makefile diff --git a/cpukit/score/cpu/Makefile.am b/cpukit/score/cpu/Makefile.am index 20ec0521b5..141d36b70d 100644 --- a/cpukit/score/cpu/Makefile.am +++ b/cpukit/score/cpu/Makefile.am @@ -3,11 +3,8 @@ ## SUBDIRS = @RTEMS_CPU@ -DIST_SUBDIRS = @RTEMS_CPU@ -## FIXME: this does not work -## DIST_SUBDIRS = \ -## arm i386 i960 m68k no_cpu powerpc sh sparc unix +DIST_SUBDIRS = arm c4x h8300 i386 i960 m68k mips no_cpu or32 powerpc sh sparc include $(top_srcdir)/automake/subdirs.am include $(top_srcdir)/automake/local.am |