diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-08-09 04:41:52 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-08-09 04:41:52 +0000 |
| commit | 3ba1627b39463bf3aded8c719543c76f9eaa4e64 (patch) | |
| tree | 1d9fbc3db5be60d2fca9d7ce4ffb0d3eb6ba5f19 /c/src/make | |
| parent | 2002-08-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-3ba1627b39463bf3aded8c719543c76f9eaa4e64.tar.bz2 | |
2002-08-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Remove RTEMS_BSP.cache generation.
Remove handling custom/*.cfgs.
Remove handling custom/default.cfg.
* configure.ac: Remove handling of custom/*.cfgs.
Remove auto* generated custom/default.cfg.
Diffstat (limited to 'c/src/make')
| -rw-r--r-- | c/src/make/ChangeLog | 8 | ||||
| -rw-r--r-- | c/src/make/Makefile.am | 20 | ||||
| -rw-r--r-- | c/src/make/configure.ac | 23 |
3 files changed, 9 insertions, 42 deletions
diff --git a/c/src/make/ChangeLog b/c/src/make/ChangeLog index 7549dae590..2b8484dbce 100644 --- a/c/src/make/ChangeLog +++ b/c/src/make/ChangeLog @@ -1,3 +1,11 @@ +2002-08-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Remove RTEMS_BSP.cache generation. + Remove handling custom/*.cfgs. + Remove handling custom/default.cfg. + * configure.ac: Remove handling of custom/*.cfgs. + Remove auto* generated custom/default.cfg. + 2002-04-24 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * custom/Makefile.am: Remove. diff --git a/c/src/make/Makefile.am b/c/src/make/Makefile.am index 462d6b8c36..59665579c3 100644 --- a/c/src/make/Makefile.am +++ b/c/src/make/Makefile.am @@ -29,27 +29,9 @@ $(srcdir)/host.cfg.in: $(top_srcdir)/@RTEMS_TOPdir@/make/host.cfg.in cp $< $@ endif -@RTEMS_BSP@.cache: Makefile - @$(RM) $@ - @echo rtems_cv_RTEMS_CPU_MODEL=\$${rtems_cv_RTEMS_CPU_MODEL=$(RTEMS_CPU_MODEL)} >> $@ - @echo rtems_cv_RTEMS_BSP_FAMILY=\$${rtems_cv_RTEMS_BSP_FAMILY=$(RTEMS_BSP_FAMILY)} >> $@ - @echo rtems_cv_RTEMS_BSP_CFLAGS=\$${rtems_cv_RTEMS_BSP_CFLAGS=$(CPU_CFLAGS)} >> $@ - @echo rtems_cv_RTEMS_BSP_CFLAGS_OPTIMIZE_V=\$${rtems_cv_RTEMS_BSP_CFLAGS_OPTIMIZE_V=$(CFLAGS_OPTIMIZE_V)} >> $@ - @echo rtems_cv_RTEMS_BSP_CFLAGS_DEBUG_V=\$${rtems_cv_RTEMS_BSP_CFLAGS_DEBUG_V=$(CFLAGS_DEBUG_V)} >> $@ - @echo rtems_cv_RTEMS_BSP_CFLAGS_PROFILE_V=\$${rtems_cv_RTEMS_BSP_CFLAGS_PROFILE_V=$(CFLAGS_PROFILE_V)} >> $@ -noinst_DATA += @RTEMS_BSP@.cache -DISTCLEANFILES = @RTEMS_BSP@.cache - -rtems_make_compilersdir = $(rtems_makedir)/compilers - ## At the moment all actively supported configurations ## use gcc-target-default.cfg only. +rtems_make_compilersdir = $(rtems_makedir)/compilers dist_rtems_make_compilers_DATA = compilers/gcc-target-default.cfg -rtems_make_customdir = $(rtems_makedir)/custom -rtems_make_custom_DATA = @CUSTOM_CFG_FILES@ - -noinst_DATA += custom/default.cfg -DISTCLEANFILES += custom/default.cfg - include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/make/configure.ac b/c/src/make/configure.ac index da7553c29f..549f111ab6 100644 --- a/c/src/make/configure.ac +++ b/c/src/make/configure.ac @@ -85,22 +85,7 @@ AC_SUBST(CC_CFLAGS_DEBUG_V) AC_SUBST(CC_CFLAGS_PROFILE_V) AC_SUBST(CC_LDFLAGS_PROFILE_V) -# Collect the files needed to build a BSP cfg_dir="${RTEMS_TOPdir}/make" -CUSTOM_CFG_FILES="" -f="${RTEMS_BSP}.cfg" -while test -n "$f"; do - if test -r "${srcdir}/${cfg_dir}/custom/$f"; then - AC_CONFIG_LINKS([custom/$f:${cfg_dir}/custom/$f]) - CUSTOM_CFG_FILES="$CUSTOM_CFG_FILES custom/$f" - f=`grep "^include.*make/custom" ${srcdir}/${cfg_dir}/custom/$f \ - | sed \ - -e 's%^.*custom\/%%' \ - -e s%\$\(RTEMS_HOST\)%${RTEMS_HOST}% \ - -e 's%default\.cfg%%'`; - else break; fi; -done -AC_SUBST(CUSTOM_CFG_FILES) AC_SUBST(cfg_dir) # Symlink the *.cfg files from the toplevel make directory into the build @@ -125,14 +110,6 @@ AC_CONFIG_FILES([Makefile Makefile.inc host.cfg bsp.cfg -custom/default.cfg ]) -AC_CONFIG_COMMANDS([default], -[[${MAKE} $RTEMS_BSP.cache -]], -[[MAKE=${MAKE-make} - RTEMS_BSP=${RTEMS_BSP} -]]) - AC_OUTPUT |