Changeset c672d97 in rtems


Ignore:
Timestamp:
01/04/02 17:53:48 (22 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
46ea78a
Parents:
4ee84fc
Message:

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

  • configure.ac: Remove references to POSIX, ITRON, MULTILIB.
  • Makefile.ac: Remove librtems, libposix, libitron. Build librtemsbsp instead of librtemsall.
Location:
c/src/wrapup
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • c/src/wrapup/ChangeLog

    r4ee84fc rc672d97  
     12001-12-22      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * configure.ac: Remove references to POSIX, ITRON, MULTILIB.
     4        * Makefile.ac: Remove librtems, libposix, libitron. Build
     5        librtemsbsp instead of librtemsall.
     6
    172001-12-20      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    28

  • c/src/wrapup/Makefile.am

    r4ee84fc rc672d97  
    22##  $Id$
    33##
    4 ##  build and install "glommed" librtemsall.a
     4##  build and install "glommed" librtemsbsp.a
    55##
    66
    … …  
    1212include $(top_srcdir)/../../../automake/lib.am
    1313
    14 LIB = $(PROJECT_RELEASE)/lib/librtemsall${LIB_VARIANT}.a
    15 
    16 # HACK: We need to evaluate CFLAGS at make-time, because these
    17 #       fscking <bsp>.cfgs change CFLAGS and can change
    18 #       MULTISUBDIR on-the-fly - A true PITA :(
    19 if MULTILIB
    20 MULTISUBDIR = /$(shell $(CC) --print-multi-directory $(CFLAGS))
    21 PROJECT_CPUdir = $(PROJECT_ROOT)/lib$(MULTISUBDIR)
    22 else
    23 PROJECT_CPUdir = $(PROJECT_RELEASE)/lib
    24 endif
     14LIB = $(PROJECT_RELEASE)/lib/librtemsbsp${LIB_VARIANT}.a
    2515
    2616if HAS_NETWORKING
    … …  
    3424endif
    3525
    36 if HAS_POSIX
    37 LIBPOSIX = $(PROJECT_CPUdir)/libposix$(LIB_VARIANT).a
    38 endif
    39 
    40 if HAS_ITRON
    41 LIBITRON = $(PROJECT_CPUdir)/libitron$(LIB_VARIANT).a
    42 endif
    43 
    4426SRCS =  $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a
    45 SRCS += $(PROJECT_CPUdir)/librtems$(LIB_VARIANT).a
    46 SRCS += $(LIBNETWORKING) $(LIBRDBG) $(LIBPOSIX) $(LIBITRON) \
     27SRCS += $(LIBNETWORKING) $(LIBRDBG) \
    4728    $(wildcard $(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a) \
    4829    $(wildcard $(PROJECT_RELEASE)/lib/librtcio$(LIB_VARIANT).a) \
    … …  
    5435    $(wildcard $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).o)
    5536
    56 TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/librtemsall${LIB_VARIANT}.a
     37TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/librtemsbsp${LIB_VARIANT}.a
    5738
    5839all-local: $(ARCH) $(TMPINSTALL_FILES)

  • c/src/wrapup/configure.ac

    r4ee84fc rc672d97  
    3737RTEMS_CANONICALIZE_TOOLS
    3838
    39 AM_CONDITIONAL([MULTILIB],[test x"$enable_multilib" = x"yes"])
    40 AM_CONDITIONAL([HAS_POSIX],[test x"$enable_posix" = x"yes"])
    41 AM_CONDITIONAL([HAS_ITRON],[test x"$enable_itron" = x"yes"])
     39AM_CONDITIONAL([MULTILIB],[test x"${enable_multilib}" = x"yes"])
    4240
    4341# Explicitly list all Makefiles here
    44 AC_CONFIG_FILES([Makefile
    45 ])
     42AC_CONFIG_FILES([Makefile])
    4643AC_OUTPUT
Note: See TracChangeset for help on using the changeset viewer.