diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-08-12 14:29:54 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-08-12 14:29:54 +0000 |
| commit | 67bfd9a63ee473f71a19279657ddbf40e46cca0c (patch) | |
| tree | 80d64036aa02ac19afb86df6e93777d8e3ccd6d8 /c | |
| parent | 2002-08-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-67bfd9a63ee473f71a19279657ddbf40e46cca0c.tar.bz2 | |
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).
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/ChangeLog | 8 | ||||
| -rw-r--r-- | c/src/Makefile.am | 2 | ||||
| -rw-r--r-- | c/src/configure.ac | 9 | ||||
| -rw-r--r-- | c/src/wrapup/Makefile.am | 11 |
4 files changed, 24 insertions, 6 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 2352db2fce..f01b2ae559 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -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> * wrapup/Makefile.am: Use .$(OBJEXT) instead of .o. diff --git a/c/src/Makefile.am b/c/src/Makefile.am index e03405decf..28c11c13d8 100644 --- a/c/src/Makefile.am +++ b/c/src/Makefile.am @@ -12,7 +12,7 @@ clean-local: make/@RTEMS_BSP@.cache: make/bsp.mak @CUSTOM_CFG_FILES@ $(RM) make/@RTEMS_BSP@.cache $(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 noinst_DATA = make/@RTEMS_BSP@.cache diff --git a/c/src/configure.ac b/c/src/configure.ac index f384afa114..20f454ac27 100644 --- a/c/src/configure.ac +++ b/c/src/configure.ac @@ -54,6 +54,7 @@ cp ${srcdir}/make/custom/default.cfg.in make/custom/default.cfg AC_MSG_NOTICE([creating make/${RTEMS_BSP}.cache]) ${MAKE-make} -f ${srcdir}/make/bsp.mak \ RTEMS_BSP=${RTEMS_BSP} \ +RTEMS_HOST=${RTEMS_HOST} \ BARE_CPU_MODEL=${BARE_CPU_MODEL} \ RTEMS_ROOT=. make/${RTEMS_BSP}.cache @@ -114,8 +115,12 @@ BSP_SUBDIRS="$BSP_SUBDIRS tests" AC_SUBST([BSP_SUBDIRS],[$BSP_SUBDIRS]) -AM_CONDITIONAL(HAS_NETWORKING, test "$HAS_NETWORKING" = "yes" ) -AM_CONDITIONAL(HAS_RDBG, test "$HAS_RDBG" = "yes" ) +AM_CONDITIONAL([HAS_NETWORKING],[test "$HAS_NETWORKING" = "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 # FIXME: We should use a feature based check, here diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am index 740b6bf7fe..a611faa002 100644 --- a/c/src/wrapup/Makefile.am +++ b/c/src/wrapup/Makefile.am @@ -22,11 +22,16 @@ if HAS_LIBBSP LIBBSP = ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/wrapup/$(ARCH)/libbsp.a endif -SRCS = $(LIBBSP) $(LIBNETWORKING) $(LIBRDBG) \ - $(wildcard $(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a) \ +if LIBCHIP +LIBCHIP = \ ../libchip/rtc/$(ARCH)/librtcio.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 \ $(wildcard $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT)) |