Changeset 64b1f81 in rtems


Ignore:
Timestamp:
Jan 16, 2002, 10:53:30 PM (19 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
36a63d78
Parents:
38fcef5c
Message:

2002-01-09 Ralf Corsepius <corsepiu@…>

  • Makefile.am: Apply @subdirs. Remove POSIX_SUBDIRS. Remove ITRON_SUBDIRS.
  • configure.ac: Rework enable_unixlib handling. Add RTEMS_MULTILIBS to cpuopts.h.
  • include/Makefile.am: Add rtems/fs.h, rtems/userenv.h. Add $(PROJECT_INCLUDE)/rtems. Remove libio_.h.
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • c/src/exec/ChangeLog

    r38fcef5c r64b1f81  
     12002-01-09      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * Makefile.am: Apply @subdirs. Remove POSIX_SUBDIRS. Remove
     4        ITRON_SUBDIRS.
     5        * configure.ac: Rework enable_unixlib handling.
     6        Add RTEMS_MULTILIBS to cpuopts.h.
     7        * include/Makefile.am: Add rtems/fs.h, rtems/userenv.h.
     8        Add $(PROJECT_INCLUDE)/rtems. Remove libio_.h.
     9
     10
    1112002-01-07      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    212
  • c/src/exec/Makefile.am

    r38fcef5c r64b1f81  
    88include $(top_srcdir)/../../../automake/multilib.am
    99
    10 if HAS_POSIX
    11 POSIX_SUBDIRS = posix
    12 endif
    13 
    14 if HAS_ITRON
    15 ITRON_SUBDIRS = itron
    16 endif
    17 
    18 SUBDIRS = include score rtems $(POSIX_SUBDIRS) $(ITRON_SUBDIRS) sapi wrapup
     10SUBDIRS = include score rtems sapi @subdirs@ wrapup
    1911
    2012include $(top_srcdir)/../../../automake/subdirs.am
  • c/src/exec/configure.ac

    r38fcef5c r64b1f81  
    6767# HACK: We should use a feature-based configuration.
    6868AS_IF([test x"${RTEMS_CPU}" = x"unix"],[
    69   AC_DEFINE_UNQUOTED(RTEMS_UNIX,1,[to indicate RTEMS unix])
     69  AC_DEFINE_UNQUOTED([RTEMS_UNIX],[1],[to indicate RTEMS unix])
    7070# HACK: silently accept --enable-unixlib
    71   test "${enable_unixlib}+set" != set || enable_unixlib="yes"
     71  test -n "${enable_unixlib}" || enable_unixlib="yes"
    7272])
    7373
    7474AS_IF([test x"${enable_unixlib}" = x"yes"],
    75   [AC_DEFINE_UNQUOTED(RTEMS_UNIXLIB,[1],
     75  [AC_DEFINE_UNQUOTED([RTEMS_UNIXLIB],[1],
    7676    [to indicate RTEMS using RTEMS's unixlib])]
    7777)
     
    8080
    8181AC_ENABLE_MULTILIB([Makefile],[..])
     82
     83## HACK: Add a define to cpuopts.h to indicate using multilibs
     84## Can be applied to produce compiler errors if using
     85## multilib-incompatible settings somewhere else (eg. bspopts.h).
     86AS_IF([test x"${enable_multilib}" = x"yes"],[
     87  AC_DEFINE_UNQUOTED([RTEMS_MULTILIBS],[1],[using multilib'ed RTEMS])
     88])
    8289
    8390# Explicitly list all Makefiles here
  • c/src/exec/include/Makefile.am

    r38fcef5c r64b1f81  
    1111        @$(mkinstalldirs) $@
    1212
     13$(PROJECT_INCLUDE)/rtems:
     14        @$(mkinstalldirs) $@
     15
    1316PREINSTALL_FILES = $(PROJECT_INCLUDE) \
    1417    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
    1518
    1619include_rtemsdir = $(includedir)/rtems
    17 include_rtems_HEADERS = rtems/bspIo.h rtems/libio_.h
    18 
    19 $(PROJECT_INCLUDE)/rtems:
    20         @$(mkinstalldirs) $@
     20include_rtems_HEADERS = rtems/bspIo.h rtems/userenv.h rtems/fs.h
    2121
    2222PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
  • cpukit/ChangeLog

    r38fcef5c r64b1f81  
     12002-01-09      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * Makefile.am: Apply @subdirs. Remove POSIX_SUBDIRS. Remove
     4        ITRON_SUBDIRS.
     5        * configure.ac: Rework enable_unixlib handling.
     6        Add RTEMS_MULTILIBS to cpuopts.h.
     7        * include/Makefile.am: Add rtems/fs.h, rtems/userenv.h.
     8        Add $(PROJECT_INCLUDE)/rtems. Remove libio_.h.
     9
     10
    1112002-01-07      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    212
  • cpukit/Makefile.am

    r38fcef5c r64b1f81  
    88include $(top_srcdir)/../../../automake/multilib.am
    99
    10 if HAS_POSIX
    11 POSIX_SUBDIRS = posix
    12 endif
    13 
    14 if HAS_ITRON
    15 ITRON_SUBDIRS = itron
    16 endif
    17 
    18 SUBDIRS = include score rtems $(POSIX_SUBDIRS) $(ITRON_SUBDIRS) sapi wrapup
     10SUBDIRS = include score rtems sapi @subdirs@ wrapup
    1911
    2012include $(top_srcdir)/../../../automake/subdirs.am
  • cpukit/configure.ac

    r38fcef5c r64b1f81  
    6767# HACK: We should use a feature-based configuration.
    6868AS_IF([test x"${RTEMS_CPU}" = x"unix"],[
    69   AC_DEFINE_UNQUOTED(RTEMS_UNIX,1,[to indicate RTEMS unix])
     69  AC_DEFINE_UNQUOTED([RTEMS_UNIX],[1],[to indicate RTEMS unix])
    7070# HACK: silently accept --enable-unixlib
    71   test "${enable_unixlib}+set" != set || enable_unixlib="yes"
     71  test -n "${enable_unixlib}" || enable_unixlib="yes"
    7272])
    7373
    7474AS_IF([test x"${enable_unixlib}" = x"yes"],
    75   [AC_DEFINE_UNQUOTED(RTEMS_UNIXLIB,[1],
     75  [AC_DEFINE_UNQUOTED([RTEMS_UNIXLIB],[1],
    7676    [to indicate RTEMS using RTEMS's unixlib])]
    7777)
     
    8080
    8181AC_ENABLE_MULTILIB([Makefile],[..])
     82
     83## HACK: Add a define to cpuopts.h to indicate using multilibs
     84## Can be applied to produce compiler errors if using
     85## multilib-incompatible settings somewhere else (eg. bspopts.h).
     86AS_IF([test x"${enable_multilib}" = x"yes"],[
     87  AC_DEFINE_UNQUOTED([RTEMS_MULTILIBS],[1],[using multilib'ed RTEMS])
     88])
    8289
    8390# Explicitly list all Makefiles here
  • cpukit/include/Makefile.am

    r38fcef5c r64b1f81  
    1111        @$(mkinstalldirs) $@
    1212
     13$(PROJECT_INCLUDE)/rtems:
     14        @$(mkinstalldirs) $@
     15
    1316PREINSTALL_FILES = $(PROJECT_INCLUDE) \
    1417    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
    1518
    1619include_rtemsdir = $(includedir)/rtems
    17 include_rtems_HEADERS = rtems/bspIo.h rtems/libio_.h
    18 
    19 $(PROJECT_INCLUDE)/rtems:
    20         @$(mkinstalldirs) $@
     20include_rtems_HEADERS = rtems/bspIo.h rtems/userenv.h rtems/fs.h
    2121
    2222PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
Note: See TracChangeset for help on using the changeset viewer.