Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-26 06:08:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

2001-12-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* 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.
This commit is contained in:
Joel Sherrill
2001-12-20 17:32:49 +00:00
parent dfe5faf880
commit f92cc34b38
3 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
c/src/wrapup/ChangeLog
View File

@@ -1,3 +1,11 @@
2001-12-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* 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.
2001-10-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* .cvsignore: Add autom4te.cache for autoconf > 2.52.

26
c/src/wrapup/Makefile.am
View File

@@ -13,6 +13,16 @@ include $(top_srcdir)/../../../automake/lib.am
LIB = $(PROJECT_RELEASE)/lib/librtemsall${LIB_VARIANT}.a
# HACK: We need to evaluate CFLAGS at make-time, because these
# fscking <bsp>.cfgs change CFLAGS and can change
# MULTISUBDIR on-the-fly - A true PITA :(
if MULTILIB
MULTISUBDIR = /$(shell $(CC) --print-multi-directory $(CFLAGS))
PROJECT_CPUdir = $(PROJECT_ROOT)/lib$(MULTISUBDIR)
else
PROJECT_CPUdir = $(PROJECT_RELEASE)/lib
endif
if HAS_NETWORKING
LIBNETWORKING = $(PROJECT_RELEASE)/lib/libnetworking$(LIB_VARIANT).a \
$(wildcard $(PROJECT_RELEASE)/lib/librpc$(LIB_VARIANT).a) \
@@ -23,11 +33,17 @@ if HAS_RDBG
LIBRDBG = $(PROJECT_RELEASE)/lib/librdbg$(LIB_VARIANT).a
endif
SRCS = $(wildcard $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a) \
$(PROJECT_RELEASE)/lib/librtems$(LIB_VARIANT).a \
$(wildcard $(PROJECT_RELEASE)/lib/libposix$(LIB_VARIANT).a) \
$(wildcard $(PROJECT_RELEASE)/lib/libitron$(LIB_VARIANT).a) \
$(LIBNETWORKING) $(LIBRDBG) \
if HAS_POSIX
LIBPOSIX = $(PROJECT_CPUdir)/libposix$(LIB_VARIANT).a
endif
if HAS_ITRON
LIBITRON = $(PROJECT_CPUdir)/libitron$(LIB_VARIANT).a
endif
SRCS = $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a
SRCS += $(PROJECT_CPUdir)/librtems$(LIB_VARIANT).a
SRCS += $(LIBNETWORKING) $(LIBRDBG) $(LIBPOSIX) $(LIBITRON) \
$(wildcard $(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a) \
$(wildcard $(PROJECT_RELEASE)/lib/librtcio$(LIB_VARIANT).a) \
$(wildcard $(PROJECT_RELEASE)/lib/libserialio$(LIB_VARIANT).a) \

4
c/src/wrapup/configure.ac
View File

@@ -36,6 +36,10 @@ RTEMS_PROJECT_ROOT
RTEMS_PROG_CC_FOR_TARGET
RTEMS_CANONICALIZE_TOOLS
AM_CONDITIONAL([MULTILIB],[test x"$enable_multilib" = x"yes"])
AM_CONDITIONAL([HAS_POSIX],[test x"$enable_posix" = x"yes"])
AM_CONDITIONAL([HAS_ITRON],[test x"$enable_itron" = x"yes"])
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
])