RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2002-08-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
Posix-BSP-Hacks:
	* configure.ac: Add AM_CONDITIONAL(LIBCHIP).
	Pass RTEMS_HOST to make/bsp.mak
	* Makefile.am: Pass RTEMS_HOST to make/bsp.mak.
	* wrapup/Makefile.am: Apply AM_CONDITIONAL(LIBCHIP).
This commit is contained in:
Ralf Corsepius
2002-08-12 14:29:54 +00:00
parent 0e2bfb8d60
commit 67bfd9a63e
4 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
c/src/ChangeLog
View File

@@ -1,3 +1,11 @@
2002-08-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
Posix-BSP-Hacks:
* configure.ac: Add AM_CONDITIONAL(LIBCHIP).
Pass RTEMS_HOST to make/bsp.mak
* Makefile.am: Pass RTEMS_HOST to make/bsp.mak.
* wrapup/Makefile.am: Apply AM_CONDITIONAL(LIBCHIP).
2002-08-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2002-08-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* wrapup/Makefile.am: Use .$(OBJEXT) instead of .o. * wrapup/Makefile.am: Use .$(OBJEXT) instead of .o.

2
c/src/Makefile.am
View File

@@ -12,7 +12,7 @@ clean-local:
make/@RTEMS_BSP@.cache: make/bsp.mak @CUSTOM_CFG_FILES@ make/@RTEMS_BSP@.cache: make/bsp.mak @CUSTOM_CFG_FILES@
$(RM) make/@RTEMS_BSP@.cache $(RM) make/@RTEMS_BSP@.cache
$(MAKE) -f ${srcdir}/make/bsp.mak \ $(MAKE) -f ${srcdir}/make/bsp.mak \
RTEMS_BSP=@RTEMS_BSP@ RTEMS_ROOT=. BARE_CPU_MODEL=${BARE_CPU_MODEL} \ RTEMS_BSP=@RTEMS_BSP@ RTEMS_HOST=@RTEMS_HOST@ RTEMS_ROOT=. BARE_CPU_MODEL=${BARE_CPU_MODEL} \
make/@RTEMS_BSP@.cache make/@RTEMS_BSP@.cache
noinst_DATA = make/@RTEMS_BSP@.cache noinst_DATA = make/@RTEMS_BSP@.cache

9
c/src/configure.ac
View File

@@ -54,6 +54,7 @@ cp ${srcdir}/make/custom/default.cfg.in make/custom/default.cfg
AC_MSG_NOTICE([creating make/${RTEMS_BSP}.cache]) AC_MSG_NOTICE([creating make/${RTEMS_BSP}.cache])
${MAKE-make} -f ${srcdir}/make/bsp.mak \ ${MAKE-make} -f ${srcdir}/make/bsp.mak \
RTEMS_BSP=${RTEMS_BSP} \ RTEMS_BSP=${RTEMS_BSP} \
RTEMS_HOST=${RTEMS_HOST} \
BARE_CPU_MODEL=${BARE_CPU_MODEL} \ BARE_CPU_MODEL=${BARE_CPU_MODEL} \
RTEMS_ROOT=. make/${RTEMS_BSP}.cache RTEMS_ROOT=. make/${RTEMS_BSP}.cache
@@ -114,8 +115,12 @@ BSP_SUBDIRS="$BSP_SUBDIRS tests"
AC_SUBST([BSP_SUBDIRS],[$BSP_SUBDIRS]) AC_SUBST([BSP_SUBDIRS],[$BSP_SUBDIRS])
AM_CONDITIONAL(HAS_NETWORKING, test "$HAS_NETWORKING" = "yes" ) AM_CONDITIONAL([HAS_NETWORKING],[test "$HAS_NETWORKING" = "yes"])
AM_CONDITIONAL(HAS_RDBG, test "$HAS_RDBG" = "yes" ) AM_CONDITIONAL([HAS_RDBG],[test "$HAS_RDBG" = "yes"])
# The posix bsp doesn't support libchip
# FIXME: We should use a feature based check, here
AM_CONDITIONAL([LIBCHIP],[test "$RTEMS_BSP_FAMILY" != "posix"])
# The bare bsp doesn't have libbsp.a # The bare bsp doesn't have libbsp.a
# FIXME: We should use a feature based check, here # FIXME: We should use a feature based check, here

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

@@ -22,11 +22,16 @@ if HAS_LIBBSP
LIBBSP = ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/wrapup/$(ARCH)/libbsp.a LIBBSP = ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/wrapup/$(ARCH)/libbsp.a
endif endif
SRCS = $(LIBBSP) $(LIBNETWORKING) $(LIBRDBG) \ if LIBCHIP
$(wildcard $(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a) \ LIBCHIP = \
../libchip/rtc/$(ARCH)/librtcio.a \ ../libchip/rtc/$(ARCH)/librtcio.a \
../libchip/serial/$(ARCH)/libserialio.a \ ../libchip/serial/$(ARCH)/libserialio.a \
$(wildcard $(PROJECT_RELEASE)/lib/libnetchip$(LIB_VARIANT).a) \ $(wildcard $(PROJECT_RELEASE)/lib/libnetchip$(LIB_VARIANT).a)
endif
SRCS = $(LIBBSP) $(LIBNETWORKING) $(LIBRDBG) \
$(wildcard $(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a) \
$(LIBCHIP) \
../libmisc/wrapup/$(ARCH)/libmisc.a \ ../libmisc/wrapup/$(ARCH)/libmisc.a \
$(wildcard $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT)) $(wildcard $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT))