Changeset f92cc34 in rtems


Ignore:
Timestamp:
Dec 20, 2001, 5:32:49 PM (19 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
ba748523
Parents:
dfe5faf8
Message:

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

  • configure.ac: Add AM_CONDITIONAL for enable_multilib, enable_posix, enable_itron.
  • Makefile.am: Compute MULTISUBDIR on-the-fly. Conditionally add libposix and libitron to SRCS. Apply MULTISUBDIR for picking up librtems, libposix and libitron.
Location:
c/src/wrapup
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • c/src/wrapup/ChangeLog

    rdfe5faf8 rf92cc34  
     12001-12-20      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * configure.ac: Add AM_CONDITIONAL for enable_multilib,
     4        enable_posix, enable_itron.
     5        * Makefile.am: Compute MULTISUBDIR on-the-fly. Conditionally add
     6        libposix and libitron to SRCS. Apply MULTISUBDIR for picking up
     7        librtems, libposix and libitron.
     8
    192001-10-11      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    210
  • c/src/wrapup/Makefile.am

    rdfe5faf8 rf92cc34  
    1414LIB = $(PROJECT_RELEASE)/lib/librtemsall${LIB_VARIANT}.a
    1515
     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 :(
     19if MULTILIB
     20MULTISUBDIR = /$(shell $(CC) --print-multi-directory $(CFLAGS))
     21PROJECT_CPUdir = $(PROJECT_ROOT)/lib$(MULTISUBDIR)
     22else
     23PROJECT_CPUdir = $(PROJECT_RELEASE)/lib
     24endif
     25
    1626if HAS_NETWORKING
    1727LIBNETWORKING = $(PROJECT_RELEASE)/lib/libnetworking$(LIB_VARIANT).a \
     
    2434endif
    2535
    26 SRCS = $(wildcard $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a) \
    27     $(PROJECT_RELEASE)/lib/librtems$(LIB_VARIANT).a \
    28     $(wildcard $(PROJECT_RELEASE)/lib/libposix$(LIB_VARIANT).a) \
    29     $(wildcard $(PROJECT_RELEASE)/lib/libitron$(LIB_VARIANT).a) \
    30     $(LIBNETWORKING) $(LIBRDBG) \
     36if HAS_POSIX
     37LIBPOSIX = $(PROJECT_CPUdir)/libposix$(LIB_VARIANT).a
     38endif
     39
     40if HAS_ITRON
     41LIBITRON = $(PROJECT_CPUdir)/libitron$(LIB_VARIANT).a
     42endif
     43
     44SRCS =  $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a
     45SRCS += $(PROJECT_CPUdir)/librtems$(LIB_VARIANT).a
     46SRCS += $(LIBNETWORKING) $(LIBRDBG) $(LIBPOSIX) $(LIBITRON) \
    3147    $(wildcard $(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a) \
    3248    $(wildcard $(PROJECT_RELEASE)/lib/librtcio$(LIB_VARIANT).a) \
  • c/src/wrapup/configure.ac

    rdfe5faf8 rf92cc34  
    3737RTEMS_CANONICALIZE_TOOLS
    3838
     39AM_CONDITIONAL([MULTILIB],[test x"$enable_multilib" = x"yes"])
     40AM_CONDITIONAL([HAS_POSIX],[test x"$enable_posix" = x"yes"])
     41AM_CONDITIONAL([HAS_ITRON],[test x"$enable_itron" = x"yes"])
     42
    3943# Explicitly list all Makefiles here
    4044AC_CONFIG_FILES([Makefile
Note: See TracChangeset for help on using the changeset viewer.