Changeset 4619da9 in rtems

Timestamp:

05/01/02 23:11:05 (21 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

907ef1f6

Parents:

51b39864

Message:

2002-04-24 Ralf Corsepius <corsepiu@…>

• custom/Makefile.am: Remove.
• compilers/Makefile.am: Remove.
• compilers/.cvsignore: Remove.
• Makefile.am: Merge-in former */Makefile.ams. Add more vars to <BSP>.cache.
• configure.ac: Reflect changes above. Cosmetic fixes.

Location:

c/src/make

Files:

• ChangeLog (modified) (1 diff)
• Makefile.am (modified) (3 diffs)
• compilers/.cvsignore (deleted)
• compilers/Makefile.am (deleted)
• configure.ac (modified) (3 diffs)
• custom/Makefile.am (deleted)

c/src/make/ChangeLog

@@ +1 @@
+2002-04-24      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+        * custom/Makefile.am: Remove.
+        * compilers/Makefile.am: Remove.
+        * compilers/.cvsignore: Remove.
+        * Makefile.am: Merge-in former */Makefile.ams.
+        Add more vars  to <BSP>.cache.
+        * configure.ac: Reflect changes above. Cosmetic fixes.
+
 2002-04-15      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 

c/src/make/Makefile.am

@@ -4 +4 @@
 
 ACLOCAL_AMFLAGS = -I ../../../aclocal
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 
 rtems_makedir = $(prefix)/make
@@ -14 +16 @@
 
 noinst_DATA = leaf.cfg
+EXTRA_DIST = leaf.cfg
 
 rtemsdir = $(exec_prefix)
@@ -25 +28 @@
 $(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
 
-include $(top_srcdir)/../../../automake/subdirs.am
+## 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/local.am

c/src/make/configure.ac

@@ -93 +93 @@
   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 \
@@ -119 +119 @@
   RTEMS_TOPdir=${RTEMS_TOPdir}
   cfg_dir=${cfg_dir}
-  test -d Templates || mkdir Templates
 ])
 
@@ -127 +126 @@
 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