Changeset e90cff96 in rtems


Ignore:
Timestamp:
Dec 14, 2003, 11:00:58 PM (17 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
41fc78d
Parents:
6e94600
Message:

2003-12-14 Ralf Corsepius <corsepiu@…>

  • automake/compile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g.
  • wrapup/Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g.
  • acinclude.m4: Rework RTEMS_CONFIG_SUBDIR.
  • Makefile.am: Reflect changes to RTEMS_CONFIG_SUBDIR.
Location:
c/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • c/src/ChangeLog

    r6e94600 re90cff96  
     12003-12-14      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * automake/compile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g.
     4        * wrapup/Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g.
     5        * acinclude.m4: Rework RTEMS_CONFIG_SUBDIR.
     6        * Makefile.am: Reflect changes to RTEMS_CONFIG_SUBDIR.
     7
    182003-12-14      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    29
  • c/src/acinclude.m4

    r6e94600 re90cff96  
    66# subdirectory handling solution is introduced to RTEMS.
    77
     8AC_DEFUN([RTEMS_SUBCONFIGURE_ARGS_QUOTE],
     9[
     10   RTEMS_CONFIGURE_ARGS_QUOTE([ac_sub_configure_args])
     11])
     12
    813AC_DEFUN([RTEMS_CONFIG_SUBDIR],
    9 [
    10 AC_CONFIG_COMMANDS_POST(
    11 [
    12 if test "$multilib" != "yes"; then
    13  ac_sub_sourcedir=$2
    14  ac_sub_builddir=$1
    15 
     14[AC_REQUIRE([RTEMS_SUBCONFIGURE_ARGS_QUOTE])
    1615if test "$no_recursion" != yes; then
    17   RTEMS_CONFIGURE_ARGS_QUOTE([ac_sub_configure_args])
    18 
    19   ac_sub_configure_args="$ac_sub_configure_args $3"
     16  ac_sub_sourcedir=$2
     17  ac_sub_builddir=$1
    2018
    2119  for ac_subdir in : $ac_sub_sourcedir; do test "x$ac_subdir" = x: && continue
     
    7371      esac
    7472
    75       AC_MSG_NOTICE([running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir])
     73      AC_MSG_NOTICE([running $ac_sub_configure $ac_sub_configure_args $3 --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir])
    7674      # The eval makes quoting arguments work.
    77       eval $ac_sub_configure $ac_sub_configure_args \
     75      eval $ac_sub_configure $ac_sub_configure_args $3 \
    7876           --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir ||
    7977        AC_MSG_ERROR([$ac_sub_configure failed for $ac_subdir])
     
    8381  done
    8482fi
    85 fi
    8683])
    87 ])
  • c/src/automake/compile.am

    r6e94600 re90cff96  
    140140LINK_OBJS = \
    141141    $(OBJS) \
    142     $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel)
     142    $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%$(LIB_VARIANT).rel)
    143143
    144144LINK_FILES =\
    145145    $(START_FILE) \
    146146    $(OBJS) \
    147     $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel)
     147    $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%$(LIB_VARIANT).rel)
    148148
    149149if RTEMS_USE_GCC
  • c/src/wrapup/Makefile.am

    r6e94600 re90cff96  
    2525endif
    2626
    27 SRCS += $(wildcard $(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a)
     27SRCS += $(wildcard $(PROJECT_LIB)/libcpu$(LIB_VARIANT).a)
    2828
    2929if LIBCHIP
     
    3737
    3838SRCS += $(wildcard \
    39     $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT))
     39    $(PROJECT_LIB)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT))
    4040
    4141all-local: $(TMPINSTALL_FILES)
Note: See TracChangeset for help on using the changeset viewer.