Changeset 8217c40 in rtems


Ignore:
Timestamp:
Jan 4, 2002, 5:57:28 PM (19 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
b91f0338
Parents:
46ea78a
Message:

2001-12-22 Ralf Corsepius <corsepiu@…>

  • configure.ac: Use AS_IF instead of if/then/else. Add AC_DEFINE_UNQUOTED(RTEMS_UNIX) for RTEMS_CPU==unix. Add AC_DEFINE_UNQUOTED(RTEMS_UNIXLIB) for RTEMS_CPU==unix. Add include/Makefile to CONFIG_FILES. Add AC_ENABLE_MULITLIB. Remove wrapup/rtems, wrapup/itron, wrapup/posix. Remove */optman/Makefile from CONFIG_FILES.
  • Makefile.am: Add include to SUBDIRS.
  • rtems/Makefile.am: Remove optman from SUBDIRS.
  • sapi/Makefile.am: Remove optman from SUBDIRS.
  • include/Makefile.am: New file.
  • include/rtems/bspIo.h: Relocated from lib/include.
  • include/rtems/libio_.h: Relocated from lib/include.
Files:
2 added
10 deleted
12 edited

Legend:

Unmodified
Added
Removed
  • c/src/exec/ChangeLog

    r46ea78a r8217c40  
     12001-12-22      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * configure.ac: Use AS_IF instead of if/then/else.
     4        Add AC_DEFINE_UNQUOTED(RTEMS_UNIX) for RTEMS_CPU==unix.
     5        Add AC_DEFINE_UNQUOTED(RTEMS_UNIXLIB) for RTEMS_CPU==unix.
     6        Add include/Makefile to CONFIG_FILES.
     7        Add AC_ENABLE_MULITLIB.
     8        Remove wrapup/rtems, wrapup/itron, wrapup/posix.
     9        Remove */optman/Makefile from CONFIG_FILES.
     10        * Makefile.am: Add include to SUBDIRS.
     11        * rtems/Makefile.am: Remove optman from SUBDIRS.
     12        * sapi/Makefile.am: Remove optman from SUBDIRS.
     13        * include/Makefile.am: New file.
     14        * include/rtems/bspIo.h: Relocated from lib/include.
     15        * include/rtems/libio_.h: Relocated from lib/include.
     16
    1172001-12-19      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    218
  • c/src/exec/Makefile.am

    r46ea78a r8217c40  
    1616endif
    1717
    18 SUBDIRS = score rtems $(POSIX_SUBDIRS) $(ITRON_SUBDIRS) sapi wrapup
     18SUBDIRS = include score rtems $(POSIX_SUBDIRS) $(ITRON_SUBDIRS) sapi wrapup
    1919
    2020include $(top_srcdir)/../../../automake/subdirs.am
  • c/src/exec/configure.ac

    r46ea78a r8217c40  
    4040
    4141# If RTEMS macros are enabled, then use them.  Otherwise, use inlines.
    42 if test "$RTEMS_USE_MACROS" = "yes"; then
    43   INLINEdir="macros"
    44 else
    45   INLINEdir="inline"
    46 fi
    47 AM_CONDITIONAL(INLINE,test "$INLINEdir" = "inline" )
    48 AM_CONDITIONAL(MACROS,test "$INLINEdir" = "macros" )
    49 AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes" )
     42AS_IF([test "$RTEMS_USE_MACROS" = "yes"],
     43  [INLINEdir="macros"],
     44  [INLINEdir="inline"])
     45
     46AM_CONDITIONAL(INLINE,test x"$INLINEdir" = x"inline" )
     47AM_CONDITIONAL(MACROS,test x"$INLINEdir" = x"macros" )
     48AM_CONDITIONAL(HAS_MP,test x"$HAS_MP" = x"yes" )
    5049
    5150AC_SUBST(RTEMS_VERSION)
    5251
    53 AM_CONDITIONAL(HAS_POSIX,test "$HAS_POSIX_API" = "yes")
    54 AM_CONDITIONAL(HAS_ITRON,test "$HAS_ITRON_API" = "yes")
     52AM_CONDITIONAL(HAS_POSIX,test x"$HAS_POSIX_API" = x"yes")
     53AM_CONDITIONAL(HAS_ITRON,test x"$HAS_ITRON_API" = x"yes")
    5554
    56 if test "$HAS_POSIX_API" = "yes"; then
    57   AC_CONFIG_SUBDIRS(posix)
    58 fi
    59 if test "$HAS_ITRON_API" = "yes"; then
    60   AC_CONFIG_SUBDIRS(itron)
    61 fi
     55AS_IF([test x"$HAS_POSIX_API" = x"yes"],
     56  [AC_CONFIG_SUBDIRS([posix])]
     57)
     58AS_IF([test x"$HAS_ITRON_API" = x"yes"],
     59  [AC_CONFIG_SUBDIRS(itron)]
     60)
    6261RTEMS_CPU_SUBDIRS([score/cpu])
    6362
     
    6766
    6867# HACK: We should use a feature-based configuration.
    69 if test x"${RTEMS_CPU}" = x"unix"; then
    70 AC_DEFINE_UNQUOTED(RTEMS_UNIX,1,[to indicate RTEMS unix])
    71 fi
     68AS_IF([test x"${RTEMS_CPU}" = x"unix"],[
     69  AC_DEFINE_UNQUOTED(RTEMS_UNIX,1,[to indicate RTEMS unix])
     70# HACK: silently accept --enable-unixlib
     71  test "${enable_unixlib}+set" != set || enable_unixlib="yes"
     72])
     73
     74AS_IF([test x"${enable_unixlib}" = x"yes"],
     75  [AC_DEFINE_UNQUOTED(RTEMS_UNIXLIB,[1],
     76    [to indicate RTEMS using RTEMS's unixlib])]
     77)
    7278
    7379AM_CONFIG_HEADER(score/include/rtems/score/cpuopts-tmp.h)
    7480
     81AC_ENABLE_MULTILIB([Makefile],[..])
     82
    7583# Explicitly list all Makefiles here
    7684AC_CONFIG_FILES([Makefile
     85include/Makefile
    7786rtems/Makefile
    7887rtems/src/Makefile
    7988rtems/include/Makefile
    80 rtems/optman/Makefile
    8189rtems/inline/Makefile
    8290rtems/macros/Makefile
     
    8795sapi/inline/Makefile
    8896sapi/macros/Makefile
    89 sapi/optman/Makefile
    9097score/Makefile
    9198score/cpu/Makefile
     
    95102score/src/Makefile
    96103wrapup/Makefile
    97 wrapup/rtems/Makefile
    98 wrapup/itron/Makefile
    99 wrapup/posix/Makefile
    100104])
    101105AC_OUTPUT
  • c/src/exec/include/rtems/libio_.h

    r46ea78a r8217c40  
    309309#endif
    310310/* end of include file */
    311 
    312 
    313 
  • c/src/exec/rtems/Makefile.am

    r46ea78a r8217c40  
    55AUTOMAKE_OPTIONS = foreign 1.5
    66
    7 SUBDIRS = include inline macros optman src
     7SUBDIRS = include inline macros src
    88
    99include $(top_srcdir)/../../../automake/subdirs.am
  • c/src/exec/sapi/Makefile.am

    r46ea78a r8217c40  
    55AUTOMAKE_OPTIONS = foreign 1.5
    66
    7 SUBDIRS = include inline macros optman src
     7SUBDIRS = include inline macros src
    88
    99include $(top_srcdir)/../../../automake/subdirs.am
  • cpukit/ChangeLog

    r46ea78a r8217c40  
     12001-12-22      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * configure.ac: Use AS_IF instead of if/then/else.
     4        Add AC_DEFINE_UNQUOTED(RTEMS_UNIX) for RTEMS_CPU==unix.
     5        Add AC_DEFINE_UNQUOTED(RTEMS_UNIXLIB) for RTEMS_CPU==unix.
     6        Add include/Makefile to CONFIG_FILES.
     7        Add AC_ENABLE_MULITLIB.
     8        Remove wrapup/rtems, wrapup/itron, wrapup/posix.
     9        Remove */optman/Makefile from CONFIG_FILES.
     10        * Makefile.am: Add include to SUBDIRS.
     11        * rtems/Makefile.am: Remove optman from SUBDIRS.
     12        * sapi/Makefile.am: Remove optman from SUBDIRS.
     13        * include/Makefile.am: New file.
     14        * include/rtems/bspIo.h: Relocated from lib/include.
     15        * include/rtems/libio_.h: Relocated from lib/include.
     16
    1172001-12-19      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    218
  • cpukit/Makefile.am

    r46ea78a r8217c40  
    1616endif
    1717
    18 SUBDIRS = score rtems $(POSIX_SUBDIRS) $(ITRON_SUBDIRS) sapi wrapup
     18SUBDIRS = include score rtems $(POSIX_SUBDIRS) $(ITRON_SUBDIRS) sapi wrapup
    1919
    2020include $(top_srcdir)/../../../automake/subdirs.am
  • cpukit/configure.ac

    r46ea78a r8217c40  
    4040
    4141# If RTEMS macros are enabled, then use them.  Otherwise, use inlines.
    42 if test "$RTEMS_USE_MACROS" = "yes"; then
    43   INLINEdir="macros"
    44 else
    45   INLINEdir="inline"
    46 fi
    47 AM_CONDITIONAL(INLINE,test "$INLINEdir" = "inline" )
    48 AM_CONDITIONAL(MACROS,test "$INLINEdir" = "macros" )
    49 AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes" )
     42AS_IF([test "$RTEMS_USE_MACROS" = "yes"],
     43  [INLINEdir="macros"],
     44  [INLINEdir="inline"])
     45
     46AM_CONDITIONAL(INLINE,test x"$INLINEdir" = x"inline" )
     47AM_CONDITIONAL(MACROS,test x"$INLINEdir" = x"macros" )
     48AM_CONDITIONAL(HAS_MP,test x"$HAS_MP" = x"yes" )
    5049
    5150AC_SUBST(RTEMS_VERSION)
    5251
    53 AM_CONDITIONAL(HAS_POSIX,test "$HAS_POSIX_API" = "yes")
    54 AM_CONDITIONAL(HAS_ITRON,test "$HAS_ITRON_API" = "yes")
     52AM_CONDITIONAL(HAS_POSIX,test x"$HAS_POSIX_API" = x"yes")
     53AM_CONDITIONAL(HAS_ITRON,test x"$HAS_ITRON_API" = x"yes")
    5554
    56 if test "$HAS_POSIX_API" = "yes"; then
    57   AC_CONFIG_SUBDIRS(posix)
    58 fi
    59 if test "$HAS_ITRON_API" = "yes"; then
    60   AC_CONFIG_SUBDIRS(itron)
    61 fi
     55AS_IF([test x"$HAS_POSIX_API" = x"yes"],
     56  [AC_CONFIG_SUBDIRS([posix])]
     57)
     58AS_IF([test x"$HAS_ITRON_API" = x"yes"],
     59  [AC_CONFIG_SUBDIRS(itron)]
     60)
    6261RTEMS_CPU_SUBDIRS([score/cpu])
    6362
     
    6766
    6867# HACK: We should use a feature-based configuration.
    69 if test x"${RTEMS_CPU}" = x"unix"; then
    70 AC_DEFINE_UNQUOTED(RTEMS_UNIX,1,[to indicate RTEMS unix])
    71 fi
     68AS_IF([test x"${RTEMS_CPU}" = x"unix"],[
     69  AC_DEFINE_UNQUOTED(RTEMS_UNIX,1,[to indicate RTEMS unix])
     70# HACK: silently accept --enable-unixlib
     71  test "${enable_unixlib}+set" != set || enable_unixlib="yes"
     72])
     73
     74AS_IF([test x"${enable_unixlib}" = x"yes"],
     75  [AC_DEFINE_UNQUOTED(RTEMS_UNIXLIB,[1],
     76    [to indicate RTEMS using RTEMS's unixlib])]
     77)
    7278
    7379AM_CONFIG_HEADER(score/include/rtems/score/cpuopts-tmp.h)
    7480
     81AC_ENABLE_MULTILIB([Makefile],[..])
     82
    7583# Explicitly list all Makefiles here
    7684AC_CONFIG_FILES([Makefile
     85include/Makefile
    7786rtems/Makefile
    7887rtems/src/Makefile
    7988rtems/include/Makefile
    80 rtems/optman/Makefile
    8189rtems/inline/Makefile
    8290rtems/macros/Makefile
     
    8795sapi/inline/Makefile
    8896sapi/macros/Makefile
    89 sapi/optman/Makefile
    9097score/Makefile
    9198score/cpu/Makefile
     
    95102score/src/Makefile
    96103wrapup/Makefile
    97 wrapup/rtems/Makefile
    98 wrapup/itron/Makefile
    99 wrapup/posix/Makefile
    100104])
    101105AC_OUTPUT
  • cpukit/include/rtems/libio_.h

    r46ea78a r8217c40  
    309309#endif
    310310/* end of include file */
    311 
    312 
    313 
  • cpukit/rtems/Makefile.am

    r46ea78a r8217c40  
    55AUTOMAKE_OPTIONS = foreign 1.5
    66
    7 SUBDIRS = include inline macros optman src
     7SUBDIRS = include inline macros src
    88
    99include $(top_srcdir)/../../../automake/subdirs.am
  • cpukit/sapi/Makefile.am

    r46ea78a r8217c40  
    55AUTOMAKE_OPTIONS = foreign 1.5
    66
    7 SUBDIRS = include inline macros optman src
     7SUBDIRS = include inline macros src
    88
    99include $(top_srcdir)/../../../automake/subdirs.am
Note: See TracChangeset for help on using the changeset viewer.