Changeset b422de6c in rtems


Ignore:
Timestamp:
Jul 8, 2003, 1:50:16 PM (18 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
44c889a
Parents:
13482e5d
Message:

2003-07-08 Ralf Corsepius <corsepiu@…>

  • configure.ac: Merge-in posix/configure.ac. Merge-in itron/configure.ac. Misc. cosmetical changes.
  • Makefile.am: Add posix, itron to SUBDIRS.
Location:
cpukit
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    r13482e5d rb422de6c  
     12003-07-08      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * configure.ac: Merge-in posix/configure.ac.
     4        Merge-in itron/configure.ac.
     5        Misc. cosmetical changes.
     6        * Makefile.am: Add posix, itron to SUBDIRS.
     7
    182003-07-08      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    29
  • cpukit/Makefile.am

    r13482e5d rb422de6c  
    77include $(top_srcdir)/automake/multilib.am
    88
    9 SUBDIRS = . include ada score rtems sapi libblock libfs
     9SUBDIRS = . include ada score rtems sapi posix itron
     10SUBDIRS += libblock libfs
    1011SUBDIRS += libnetworking
    1112SUBDIRS += @subdirs@
  • cpukit/configure.ac

    r13482e5d rb422de6c  
    4646  [INLINEdir="inline"])
    4747AC_SUBST(INLINEdir)
    48 AM_CONDITIONAL(INLINE,test x"$INLINEdir" = x"inline" )
    49 AM_CONDITIONAL(MACROS,test x"$INLINEdir" = x"macros" )
    50 AM_CONDITIONAL(HAS_MP,test x"$HAS_MP" = x"yes" )
    51 
    5248AC_DEFINE(RTEMS_VERSION,["][_RTEMS_VERSION]["],[RTEMS version string])
    5349
    54 AM_CONDITIONAL(HAS_POSIX,test x"$HAS_POSIX_API" = x"yes")
    55 AM_CONDITIONAL(HAS_ITRON,test x"$HAS_ITRON_API" = x"yes")
    56 AM_CONDITIONAL(HAS_NETWORKING,test x"$HAS_NETWORKING" = x"yes")
    57 
    58 AS_IF([test x"$HAS_POSIX_API" = x"yes"],
    59   [AC_CONFIG_SUBDIRS([posix])]
    60 )
    61 AS_IF([test x"$HAS_ITRON_API" = x"yes"],
    62   [AC_CONFIG_SUBDIRS(itron)]
    63 )
    6450RTEMS_CPU_SUBDIRS([score/cpu])
    65 # FIXME: All ports should have a libscorecpu.a - But the powerpc doesn't!
    66 AM_CONDITIONAL([LIBSCORECPU],
    67 [test -f "${srcdir}/score/cpu/${RTEMS_CPU}/cpu.c"])
    68 
    6951AC_CONFIG_SUBDIRS([libcsupport])
    7052
     
    8264  ])
    8365])
    84 AM_CONDITIONAL(LIBRPC,[test "$LIBRPC" = "yes"])
    85 
    8666AC_ARG_ENABLE([ada],
    8767[AC_HELP_STRING([--enable-ada],[enable ada support])],
     
    10383])
    10484
    105 AM_CONDITIONAL(UNIX,[test x"${RTEMS_CPU}" = x"unix"])
    10685
    10786AS_IF([test x"${enable_unixlib}" = x"yes"],
     
    11089)
    11190
     91# BSD-isms, used throughout the sources
     92# Not really used by this configure script
     93# FIXME: They should be eliminated if possible.
    11294AC_CHECK_FUNCS([strsep strcasecmp snprintf])
     95AC_CHECK_FUNCS([bcopy bcmp])
     96AC_CHECK_FUNCS([isascii fileno])
    11397
    11498AM_CONFIG_HEADER([score/include/rtems/score/cpuopts-tmp.h],[
     
    168152])
    169153
     154AM_CONDITIONAL(LIBRPC,[test "$LIBRPC" = "yes"])
     155AM_CONDITIONAL(UNIX,[test x"${RTEMS_CPU}" = x"unix"])
     156
     157AM_CONDITIONAL(INLINE,test x"$INLINEdir" = x"inline" )
     158AM_CONDITIONAL(MACROS,test x"$INLINEdir" = x"macros" )
     159AM_CONDITIONAL(HAS_MP,test x"$HAS_MP" = x"yes" )
     160
     161AM_CONDITIONAL(HAS_POSIX,test x"$HAS_POSIX_API" = x"yes")
     162AM_CONDITIONAL(HAS_ITRON,test x"$HAS_ITRON_API" = x"yes")
     163AM_CONDITIONAL(HAS_NETWORKING,test x"$HAS_NETWORKING" = x"yes")
     164
     165# FIXME: All ports should have a libscorecpu.a - But the powerpc doesn't!
     166AM_CONDITIONAL([LIBSCORECPU],
     167[test -f "${srcdir}/score/cpu/${RTEMS_CPU}/cpu.c"])
     168
    170169AM_CONDITIONAL(RTEMS_ADA,[test x"$enable_ada" = x"yes" \
    171170  && test x"$HAS_POSIX_API" = x"yes"])
     
    175174
    176175# Explicitly list all Makefiles here
    177 AC_CONFIG_FILES([Makefile
     176AC_CONFIG_FILES([
     177Makefile
    178178include/Makefile
     179ada/Makefile
    179180rtems/Makefile
    180181sapi/Makefile
    181182score/Makefile
    182183score/cpu/Makefile
    183 ])
    184 
    185 AC_CONFIG_FILES([libblock/Makefile])
    186 
    187 AC_CONFIG_FILES([libfs/Makefile
     184posix/Makefile
     185itron/Makefile
     186libblock/Makefile
     187libfs/Makefile
    188188libfs/src/Makefile
    189189libfs/src/imfs/Makefile
    190 libfs/src/dosfs/Makefile])
    191 
    192 AC_CONFIG_FILES([libnetworking/Makefile
     190libfs/src/dosfs/Makefile
     191libnetworking/Makefile
    193192libnetworking/lib/Makefile
    194193libnetworking/libc/Makefile
    195 libnetworking/wrapup/Makefile])
    196 
    197 AC_CONFIG_FILES([ada/Makefile])
    198 
    199 AC_CONFIG_FILES([libmisc/Makefile
     194libnetworking/wrapup/Makefile
     195libmisc/Makefile
    200196libmisc/cpuuse/Makefile
    201197libmisc/shell/Makefile
     
    211207libmisc/mw-fb/Makefile
    212208libmisc/wrapup/Makefile
    213 ])
    214 
    215 AC_CONFIG_FILES([wrapup/Makefile])
     209
     210wrapup/Makefile
     211])
    216212
    217213AC_OUTPUT
Note: See TracChangeset for help on using the changeset viewer.