From 4619da90eb98451bea69ac5615407472f95af0ff Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 1 May 2002 23:11:05 +0000 Subject: 2002-04-24 Ralf Corsepius * custom/Makefile.am: Remove. * compilers/Makefile.am: Remove. * compilers/.cvsignore: Remove. * Makefile.am: Merge-in former */Makefile.ams. Add more vars to .cache. * configure.ac: Reflect changes above. Cosmetic fixes. --- c/src/make/ChangeLog | 9 +++++++++ c/src/make/Makefile.am | 29 ++++++++++++++++++++--------- c/src/make/compilers/.cvsignore | 2 -- c/src/make/compilers/Makefile.am | 13 ------------- c/src/make/configure.ac | 15 +++++++++------ c/src/make/custom/Makefile.am | 12 ------------ 6 files changed, 38 insertions(+), 42 deletions(-) delete mode 100644 c/src/make/compilers/.cvsignore delete mode 100644 c/src/make/compilers/Makefile.am delete mode 100644 c/src/make/custom/Makefile.am (limited to 'c') diff --git a/c/src/make/ChangeLog b/c/src/make/ChangeLog index ac0da33b54..7549dae590 100644 --- a/c/src/make/ChangeLog +++ b/c/src/make/ChangeLog @@ -1,3 +1,12 @@ +2002-04-24 Ralf Corsepius + + * custom/Makefile.am: Remove. + * compilers/Makefile.am: Remove. + * compilers/.cvsignore: Remove. + * Makefile.am: Merge-in former */Makefile.ams. + Add more vars to .cache. + * configure.ac: Reflect changes above. Cosmetic fixes. + 2002-04-15 Ralf Corsepius * configure.ac: Remove ENABLE_GCC28. diff --git a/c/src/make/Makefile.am b/c/src/make/Makefile.am index 2b0dd7c5ee..462d6b8c36 100644 --- a/c/src/make/Makefile.am +++ b/c/src/make/Makefile.am @@ -4,6 +4,8 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg + rtems_makedir = $(prefix)/make GENERIC_FILES = host.cfg @@ -13,6 +15,7 @@ MAKE_FILES = README directory.cfg lib.cfg rtems_make_DATA = $(MAKE_FILES) $(GENERIC_FILES) noinst_DATA = leaf.cfg +EXTRA_DIST = leaf.cfg rtemsdir = $(exec_prefix) rtems_bspdir = $(rtemsdir)/@RTEMS_BSP@ @@ -24,21 +27,29 @@ rtems_bsp_make_DATA = bsp.cfg if MAINTAINER_MODE $(srcdir)/host.cfg.in: $(top_srcdir)/@RTEMS_TOPdir@/make/host.cfg.in cp $< $@ - endif -SUBDIRS = compilers custom - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg - @RTEMS_BSP@.cache: Makefile - $(RM) $@ + @$(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 -EXTRA_DIST = leaf.cfg +rtems_make_compilersdir = $(rtems_makedir)/compilers + +## At the moment all actively supported configurations +## use gcc-target-default.cfg only. +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/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/make/compilers/.cvsignore b/c/src/make/compilers/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/make/compilers/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/make/compilers/Makefile.am b/c/src/make/compilers/Makefile.am deleted file mode 100644 index 83073c75a3..0000000000 --- a/c/src/make/compilers/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -## -## $Id$ -## - - -rtems_makedir = $(prefix)/make -rtems_make_compilersdir = $(rtems_makedir)/compilers - -## At the moment all actively supported configurations -## use gcc-target-default.cfg only. -rtems_make_compilers_DATA = gcc-target-default.cfg - -include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/make/configure.ac b/c/src/make/configure.ac index b566f67684..da7553c29f 100644 --- a/c/src/make/configure.ac +++ b/c/src/make/configure.ac @@ -92,7 +92,7 @@ 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 $f" + CUSTOM_CFG_FILES="$CUSTOM_CFG_FILES custom/$f" f=`grep "^include.*make/custom" ${srcdir}/${cfg_dir}/custom/$f \ | sed \ -e 's%^.*custom\/%%' \ @@ -118,7 +118,6 @@ AC_CONFIG_LINKS([ ],,[ RTEMS_TOPdir=${RTEMS_TOPdir} cfg_dir=${cfg_dir} - test -d Templates || mkdir Templates ]) # Explicitly list all Makefiles here @@ -126,10 +125,14 @@ AC_CONFIG_FILES([Makefile Makefile.inc host.cfg bsp.cfg -custom/Makefile custom/default.cfg -compilers/Makefile]) -AC_CONFIG_COMMANDS([default],[[${MAKE} $RTEMS_BSP.cache]],[[MAKE=${MAKE-make} -RTEMS_BSP=${RTEMS_BSP} +]) + +AC_CONFIG_COMMANDS([default], +[[${MAKE} $RTEMS_BSP.cache +]], +[[MAKE=${MAKE-make} + RTEMS_BSP=${RTEMS_BSP} ]]) + AC_OUTPUT diff --git a/c/src/make/custom/Makefile.am b/c/src/make/custom/Makefile.am deleted file mode 100644 index d78295f93e..0000000000 --- a/c/src/make/custom/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -## -## $Id$ -## - - -rtems_makedir = $(prefix)/make -rtems_make_customdir = $(rtems_makedir)/custom -rtems_make_custom_DATA = @CUSTOM_CFG_FILES@ - -noinst_DATA = default.cfg - -include $(top_srcdir)/../../../automake/local.am -- cgit v1.2.3