Changeset 94f4a9ba in rtems


Ignore:
Timestamp:
Aug 9, 2002, 9:47:16 AM (18 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
e27cd182
Parents:
bac8dd48
Message:

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

  • configure.ac: Merge wrapup/configure.ac. Cosmetic cleanups.
  • Makefile.am: Add wrapup-SUBDIR.
  • wrapup/ChangeLog: Remove.
  • wrapup/configure.ac: Remove.
Location:
c/src
Files:
2 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • c/src/ChangeLog

    rbac8dd48 r94f4a9ba  
     12002-08-09      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * configure.ac: Merge wrapup/configure.ac.
     4        Cosmetic cleanups.
     5        * Makefile.am: Add wrapup-SUBDIR.
     6        * wrapup/ChangeLog: Remove.
     7        * wrapup/configure.ac: Remove.
     8
    192002-08-09      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    210
  • c/src/Makefile.am

    rbac8dd48 r94f4a9ba  
    55ACLOCAL_AMFLAGS = -I ../../aclocal
    66
    7 SUBDIRS = @exec@ @subdirs@
     7SUBDIRS = @exec@ @subdirs@ wrapup
    88
    99clean-local:
  • c/src/configure.ac

    rbac8dd48 r94f4a9ba  
    1818AM_INIT_AUTOMAKE([no-define foreign 1.6])
    1919AM_MAINTAINER_MODE
     20
     21RTEMS_PROG_CC_FOR_TARGET
     22RTEMS_CANONICALIZE_TOOLS
    2023
    2124RTEMS_ENABLE_MULTILIB
     
    6164AC_SUBST(cfg_dir)
    6265
    63 ## Note: the order of the directories below is essential
    64 AC_CONFIG_SUBDIRS([make])
    65 
    6666## Configure ${srcdir}/../../cpukit as exec/ if multilibs are enabled
    6767AS_IF([test x"$multilib" = x"no"],[
    6868  RTEMS_CHECK_MULTIPROCESSING
    69   RTEMS_CONFIG_SUBDIR([exec],[../../cpukit],[--with-project-root="../../"])
     69  RTEMS_CONFIG_SUBDIR([exec],[../../cpukit],
     70  [--with-project-root="../../" --enable-rtemsbsp=$RTEMS_BSP
     71  ])
    7072  AC_SUBST([exec],[exec])
    7173])
    7274
    73 AC_CONFIG_SUBDIRS(optman)
    74 AC_CONFIG_SUBDIRS(lib/libcpu)
    75 AC_CONFIG_SUBDIRS(lib/libbsp)
    76 AC_CONFIG_SUBDIRS(libmisc)
     75## Note: the order of the directories below is essential
     76AC_CONFIG_SUBDIRS([make])
     77AC_CONFIG_SUBDIRS([optman])
     78AC_CONFIG_SUBDIRS([lib/libcpu])
     79AC_CONFIG_SUBDIRS([lib/libbsp])
     80AC_CONFIG_SUBDIRS([libmisc])
    7781
    7882AS_IF([test "$RTEMS_CPU" != "unix"],[
     
    8185])
    8286
    83 if test "$HAS_NETWORKING" = "yes"; then
     87AS_IF([test "$HAS_NETWORKING" = "yes"],[
    8488  AC_CONFIG_SUBDIRS(libnetworking)
    85   if test "$RTEMS_HAS_RDBG" = "yes"; then
     89  AS_IF([test "$RTEMS_HAS_RDBG" = "yes"],[
    8690    RTEMS_CHECK_RDBG(RTEMS_BSP)
    87   fi
    88 fi
     91  ])
     92])
    8993
    90 if test "$HAS_RDBG" = "yes"; then
     94AS_IF([test "$HAS_RDBG" = "yes"],[
    9195  AC_CONFIG_SUBDIRS(librdbg)
    92 fi
     96])
     97
     98AS_IF([test "$RTEMS_HAS_CPLUSPLUS" = "yes"],[
     99  AC_CONFIG_SUBDIRS(librtems++)
     100])
     101
     102AC_CONFIG_SUBDIRS(wrapup tests)
     103
    93104AM_CONDITIONAL(HAS_NETWORKING, test "$HAS_NETWORKING" = "yes" )
    94105AM_CONDITIONAL(HAS_RDBG, test "$HAS_RDBG" = "yes" )
    95106
    96 if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
    97   AC_CONFIG_SUBDIRS(librtems++)
    98 fi
    99 
    100 AC_CONFIG_SUBDIRS(wrapup tests)
     107# The bare bsp doesn't have libbsp.a
     108# FIXME: We should use a feature based check, here
     109AM_CONDITIONAL(HAS_LIBBSP,[! test "$RTEMS_BSP_FAMILY" = "bare"])
     110AM_CONDITIONAL([MULTILIB],[test x"${enable_multilib}" = x"yes"])
    101111
    102112RTEMS_PROJECT_ROOT
     
    108118 MAKE=${MAKE}])
    109119
     120AC_CONFIG_FILES([wrapup/Makefile])
     121
    110122AC_OUTPUT
  • c/src/wrapup/Makefile.am

    rbac8dd48 r94f4a9ba  
    55##
    66
    7 ACLOCAL_AMFLAGS = -I ../../../aclocal
    8 
    97include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    10 include $(top_srcdir)/../../../automake/compile.am
    11 include $(top_srcdir)/../../../automake/lib.am
     8include $(top_srcdir)/../../automake/compile.am
     9include $(top_srcdir)/../../automake/lib.am
    1210
    1311LIB = $(PROJECT_RELEASE)/lib/librtemsbsp${LIB_VARIANT}.a
     
    3331    $(wildcard $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).o)
    3432
    35 TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/librtemsbsp${LIB_VARIANT}.a
     33TMPINSTALL_FILES += $(LIB)
    3634
    3735all-local: $(ARCH) $(TMPINSTALL_FILES)
     
    7068bsplib_DATA = $(LIB)
    7169
    72 include $(top_srcdir)/../../../automake/local.am
     70include $(top_srcdir)/../../automake/local.am
Note: See TracChangeset for help on using the changeset viewer.