2004-11-05 Ralf Corsepius <ralf_corsepius@rtems.org>

* configure.ac: Remove check for libbsp/${RTEMS_CPU}.
	Add dependency tracking for *.cfgs.
	* Makefile.am: Add dependency tracking for *.cfg.
This commit is contained in:
Ralf Corsepius
2004-11-05 08:30:18 +00:00
parent 07a984b1ad
commit 9bb5b9d110
3 changed files with 23 additions and 17 deletions
+6
View File
@@ -1,3 +1,9 @@
2004-11-05 Ralf Corsepius <ralf_corsepius@rtems.org>
* configure.ac: Remove check for libbsp/${RTEMS_CPU}.
Add dependency tracking for *.cfgs.
* Makefile.am: Add dependency tracking for *.cfg.
2004-11-03 Ralf Corsepius <ralf_corsepius@rtems.org>
* libchip/rtc/mc146818a.c: Don't include <bsp.h>
+3 -3
View File
@@ -27,9 +27,6 @@ DISTCLEANFILES += @CUSTOM_CFG_FILES@
make/custom/default.cfg: $(srcdir)/make/custom/default.cfg.in
cp $< $@
make/custom/%.cfg: $(srcdir)/$(cfg_dir)/custom/%.cfg
cp $< $@
noinst_DATA += make/custom/default.cfg
DISTCLEANFILES += make/custom/default.cfg
@@ -47,5 +44,8 @@ pkgconfigdir = $(prefix)/lib/pkgconfig
pkgconfig_DATA = @host_alias@-@RTEMS_BSP@.pc
DISTCLEANFILES += @host_alias@-@RTEMS_BSP@.pc
DISTCLEANFILES += $(DEPDIR)/cfg.P
include $(DEPDIR)/cfg.P
include $(top_srcdir)/automake/subdirs.am
include $(top_srcdir)/automake/local.am
+14 -14
View File
@@ -20,15 +20,6 @@ RTEMS_ENABLE_MULTILIB
RTEMS_ENABLE_MULTIPROCESSING
RTEMS_ENV_RTEMSBSP
# Is this a supported CPU?
AC_MSG_CHECKING([if cpu $RTEMS_CPU is supported])
# FIXME: Temporary hack
if test -d "$srcdir/lib/libbsp/$RTEMS_CPU"; then
AC_MSG_RESULT(yes)
else
AC_MSG_ERROR(no)
fi
AC_ARG_ENABLE(rpcgen,
[AS_HELP_STRING([--enable-rpcgen],[rebuild rpcgen-generated sources])],
[case "${enable_rpcgen}" in
@@ -53,17 +44,26 @@ AC_PROG_AWK
AC_MSG_NOTICE([setting up make/custom])
AS_MKDIR_P([make/custom])
AM_SET_DEPDIR
test -d ${DEPDIR} || mkdir ${DEPDIR}
rm -f ${DEPDIR}/cfg.P
echo "# Do not edit - automatically generated by" > ${DEPDIR}/cfg.P
echo "# $0" >> ${DEPDIR}/cfg.P
# Collect and copy the BSP's make/custom/*.cfg files from the toplevel make
# directory into the build tree's <bsp>/make/custom subdirectories
cfg_dir="${RTEMS_TOPdir}/make"
CUSTOM_CFG_FILES=""
CUSTOM_CFG_FILES=
f="${RTEMS_BSP}.cfg"
while test -n "$f"; do
if test -r "${srcdir}/${cfg_dir}/custom/$f"; then
cp ${srcdir}/${cfg_dir}/custom/$f make/custom/$f
cfg_file=
_RTEMS_CHECK_CUSTOM_BSP([$f],cfg_file)
if test -n "${cfg_file}"; then
cp ${cfg_file} make/custom/$f
echo "make/custom/$f: ${cfg_file}" >> ${DEPDIR}/cfg.P
echo " cp ${cfg_file} make/custom/$f" >> ${DEPDIR}/cfg.P
CUSTOM_CFG_FILES="$CUSTOM_CFG_FILES make/custom/$f"
f=`grep "^include.*make/custom" ${srcdir}/${cfg_dir}/custom/$f \
f=`grep "^include.*make/custom" ${cfg_file} \
| sed \
-e 's%^.*custom\/%%' \
-e s%\$\(RTEMS_HOST\)%${RTEMS_HOST}% \