2002-07-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* automake/multilib.am: Add install-multi.
	* aclocal/rtems-top.m4: Reflect new RTEMS_TOPdir to detecting
	version.m4.
	Add --with-project-root.
	Reflect --with-project-root to setting up PROJECT_ROOT.
	* aclocal/env-rtemscpu.m4: Reflect new RTEMS_TOPdir (HACK).
	* aclocal/check-cpu.m4:  Reflect new RTEMS_TOPdir.
	* aclocal/check-bsps.m4: Reflect new RTEMS_TOPdir.
This commit is contained in:
Ralf Corsepius
2002-07-05 16:13:07 +00:00
parent 51b4875ac0
commit 1b16e63c4f
12 changed files with 50 additions and 26 deletions

View File

@@ -1,3 +1,14 @@
2002-07-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* automake/multilib.am: Add install-multi.
* aclocal/rtems-top.m4: Reflect new RTEMS_TOPdir to detecting
version.m4.
Add --with-project-root.
Reflect --with-project-root to setting up PROJECT_ROOT.
* aclocal/env-rtemscpu.m4: Reflect new RTEMS_TOPdir (HACK).
* aclocal/check-cpu.m4: Reflect new RTEMS_TOPdir.
* aclocal/check-bsps.m4: Reflect new RTEMS_TOPdir.
2002-07-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: RTEMS_TOP(..).

View File

@@ -5,7 +5,7 @@ AC_DEFUN(RTEMS_CHECK_CUSTOM_BSP,
AC_REQUIRE([RTEMS_TOP])
AC_MSG_CHECKING([for make/custom/[$]$1.cfg])
if test -r "$srcdir/$RTEMS_TOPdir/make/custom/[$]$1.cfg"; then
if test -r "$srcdir/$RTEMS_TOPdir/../../make/custom/[$]$1.cfg"; then
AC_MSG_RESULT([yes])
else
AC_MSG_ERROR([no])

View File

@@ -8,7 +8,7 @@ AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])
# Is this a supported CPU?
AC_MSG_CHECKING([if cpu $RTEMS_CPU is supported])
if test -d "$srcdir/$RTEMS_TOPdir/c/src/exec/score/cpu/$RTEMS_CPU"; then
if test -d "$srcdir/$RTEMS_TOPdir/exec/score/cpu/$RTEMS_CPU"; then
AC_MSG_RESULT(yes)
else
AC_MSG_ERROR(no)

View File

@@ -18,7 +18,7 @@ if test x"$multilib" = x"yes"; then
fi
AC_SUBST(MULTISUBDIR)
PROJECT_ROOT="${RTEMS_TOPdir}/\$(MULTIBUILDTOP)\$(top_builddir)"
PROJECT_ROOT="../../${RTEMS_TOPdir}/\$(MULTIBUILDTOP)\$(top_builddir)"
GCC_SPECS="-isystem \$(PROJECT_ROOT)/lib/include"
AC_SUBST(GCC_SPECS)

View File

@@ -35,18 +35,14 @@ PROJECT_TOPdir=${dots}${RTEMS_TOPdir}/'$(top_builddir)'
fi
AC_SUBST(PROJECT_TOPdir)
if test "$with_target_subdir" = "." ; then
# Native
PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)"
else
# Cross
PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)"
fi
AS_IF([test "${with_project_root+set}" = set],
[PROJECT_ROOT="${with_project_root}${RTEMS_TOPdir}/\$(top_builddir)"],
[PROJECT_ROOT="../../${RTEMS_TOPdir}/\$(top_builddir)"])
AC_SUBST(PROJECT_ROOT)
AC_MSG_CHECKING([for RTEMS Version])
AS_IF([test -r "${srcdir}/${RTEMS_TOPdir}/aclocal/version.m4"],
AS_IF([test -r "${srcdir}/${RTEMS_TOPdir}/exec/aclocal/version.m4"],
[],
[AC_MSG_ERROR([Unable to find ${RTEMS_TOPdir}/aclocal/version.m4])])
[AC_MSG_ERROR([Unable to find ${RTEMS_TOPdir}/exec/aclocal/version.m4])])
AC_MSG_RESULT([_RTEMS_VERSION])
])dnl

View File

@@ -8,11 +8,13 @@ MULTICLEAN = true
endif
# Multilib support rules
.PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \
.PHONY: all-multi install-multi mostlyclean-multi clean-multi distclean-multi \
maintainer-clean-multi
if MULTILIB
all-recursive: all-multi
install-recursive: install-multi
mostlyclean-recursive: mostlyclean-multi
clean-recursive: clean-multi
distclean-recursive: distclean-multi
@@ -20,6 +22,9 @@ maintainer-clean-recursive: maintainer-clean-multi
all-multi:
$(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
install-multi:
$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do
mostlyclean-multi:
$(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean
clean-multi:

View File

@@ -1,3 +1,14 @@
2002-07-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* automake/multilib.am: Add install-multi.
* aclocal/rtems-top.m4: Reflect new RTEMS_TOPdir to detecting
version.m4.
Add --with-project-root.
Reflect --with-project-root to setting up PROJECT_ROOT.
* aclocal/env-rtemscpu.m4: Reflect new RTEMS_TOPdir (HACK).
* aclocal/check-cpu.m4: Reflect new RTEMS_TOPdir.
* aclocal/check-bsps.m4: Reflect new RTEMS_TOPdir.
2002-07-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: RTEMS_TOP(..).

View File

@@ -5,7 +5,7 @@ AC_DEFUN(RTEMS_CHECK_CUSTOM_BSP,
AC_REQUIRE([RTEMS_TOP])
AC_MSG_CHECKING([for make/custom/[$]$1.cfg])
if test -r "$srcdir/$RTEMS_TOPdir/make/custom/[$]$1.cfg"; then
if test -r "$srcdir/$RTEMS_TOPdir/../../make/custom/[$]$1.cfg"; then
AC_MSG_RESULT([yes])
else
AC_MSG_ERROR([no])

View File

@@ -8,7 +8,7 @@ AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])
# Is this a supported CPU?
AC_MSG_CHECKING([if cpu $RTEMS_CPU is supported])
if test -d "$srcdir/$RTEMS_TOPdir/c/src/exec/score/cpu/$RTEMS_CPU"; then
if test -d "$srcdir/$RTEMS_TOPdir/exec/score/cpu/$RTEMS_CPU"; then
AC_MSG_RESULT(yes)
else
AC_MSG_ERROR(no)

View File

@@ -18,7 +18,7 @@ if test x"$multilib" = x"yes"; then
fi
AC_SUBST(MULTISUBDIR)
PROJECT_ROOT="${RTEMS_TOPdir}/\$(MULTIBUILDTOP)\$(top_builddir)"
PROJECT_ROOT="../../${RTEMS_TOPdir}/\$(MULTIBUILDTOP)\$(top_builddir)"
GCC_SPECS="-isystem \$(PROJECT_ROOT)/lib/include"
AC_SUBST(GCC_SPECS)

View File

@@ -35,18 +35,14 @@ PROJECT_TOPdir=${dots}${RTEMS_TOPdir}/'$(top_builddir)'
fi
AC_SUBST(PROJECT_TOPdir)
if test "$with_target_subdir" = "." ; then
# Native
PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)"
else
# Cross
PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)"
fi
AS_IF([test "${with_project_root+set}" = set],
[PROJECT_ROOT="${with_project_root}${RTEMS_TOPdir}/\$(top_builddir)"],
[PROJECT_ROOT="../../${RTEMS_TOPdir}/\$(top_builddir)"])
AC_SUBST(PROJECT_ROOT)
AC_MSG_CHECKING([for RTEMS Version])
AS_IF([test -r "${srcdir}/${RTEMS_TOPdir}/aclocal/version.m4"],
AS_IF([test -r "${srcdir}/${RTEMS_TOPdir}/exec/aclocal/version.m4"],
[],
[AC_MSG_ERROR([Unable to find ${RTEMS_TOPdir}/aclocal/version.m4])])
[AC_MSG_ERROR([Unable to find ${RTEMS_TOPdir}/exec/aclocal/version.m4])])
AC_MSG_RESULT([_RTEMS_VERSION])
])dnl

View File

@@ -8,11 +8,13 @@ MULTICLEAN = true
endif
# Multilib support rules
.PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \
.PHONY: all-multi install-multi mostlyclean-multi clean-multi distclean-multi \
maintainer-clean-multi
if MULTILIB
all-recursive: all-multi
install-recursive: install-multi
mostlyclean-recursive: mostlyclean-multi
clean-recursive: clean-multi
distclean-recursive: distclean-multi
@@ -20,6 +22,9 @@ maintainer-clean-recursive: maintainer-clean-multi
all-multi:
$(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
install-multi:
$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do
mostlyclean-multi:
$(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean
clean-multi: