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/Makefile.am | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) (limited to 'c/src/make/Makefile.am') 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 -- cgit v1.2.3