From dedb090fcc0369f08fd9df64de154ba6b9e11ba5 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Thu, 29 Jun 2000 15:32:03 +0000
Subject: Patch rtems-rc-20000627-2 from Ralf Corsepius
 <corsepiu@faw.uni-ulm.de> that does some cleanup:

  * remove c/src/make/main.cfg.in (obsolete, unused) and any reference to it.
  * remove RTEMS_BSP_SPECS from c/src/make/custom/default.cfg.in (unused)

  Notes:
    All files being effected by this patch are only used when building
    RTEMS, therefore this patch should not have any side-effects outside
    of the source- rsp. build-tree.
---
 c/src/make/Makefile.am           | 2 +-
 c/src/make/configure.in          | 4 ++--
 c/src/make/custom/default.cfg.in | 5 -----
 c/src/make/main.cfg.in           | 9 ---------
 4 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 c/src/make/main.cfg.in

(limited to 'c')

diff --git a/c/src/make/Makefile.am b/c/src/make/Makefile.am
index 4c09e3160b..5c4efd052c 100644
--- a/c/src/make/Makefile.am
+++ b/c/src/make/Makefile.am
@@ -13,7 +13,7 @@ MAKE_FILES = README directory.cfg lib.cfg
 
 rtems_make_DATA = $(MAKE_FILES) $(GENERIC_FILES)
 
-noinst_DATA = main.cfg leaf.cfg
+noinst_DATA = leaf.cfg
 
 rtemsdir = $(prefix)
 rtems_bspdir = $(rtemsdir)/@RTEMS_BSP@
diff --git a/c/src/make/configure.in b/c/src/make/configure.in
index f4d00a20c9..52e87874d1 100644
--- a/c/src/make/configure.in
+++ b/c/src/make/configure.in
@@ -7,7 +7,7 @@ dnl This script configures the configuration files below make/
 dnl
 
 AC_PREREQ(2.13)
-AC_INIT(main.cfg.in)
+AC_INIT(bsp.cfg.in)
 RTEMS_TOP(../../..)
 AC_CONFIG_AUX_DIR(../../..)
 
@@ -67,6 +67,7 @@ dnl if this is an i386, does gas have good code16 support?
 RTEMS_I386_GAS_CODE16
 
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_BSP_ALIAS(${RTEMS_BSP})
 RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 RTEMS_CHECK_NETWORKING(RTEMS_BSP)
 RTEMS_CHECK_RDBG(RTEMS_BSP)
@@ -121,7 +122,6 @@ AC_LINK_FILES($cfg_dir/README,README)
 AC_OUTPUT( 
 Makefile
 Makefile.inc
-main.cfg
 host.cfg
 bsp.cfg
 custom/Makefile
diff --git a/c/src/make/custom/default.cfg.in b/c/src/make/custom/default.cfg.in
index 7f6f5e51a9..7eb7dc037f 100644
--- a/c/src/make/custom/default.cfg.in
+++ b/c/src/make/custom/default.cfg.in
@@ -11,15 +11,10 @@
 include $(RTEMS_ROOT)/../make/target.cfg
 include $(RTEMS_ROOT)/make/host.cfg
 
-include $(RTEMS_ROOT)/make/main.cfg
 include $(RTEMS_ROOT)/make/bsp.cfg
 
 ## Target compiler config file, if any
 CONFIG.CC = $(RTEMS_ROOT)/make/compilers/gcc-target-default.cfg
 
-## GCC specs extension file location
-RTEMS_BSP_SPECS = $(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs
-
 # Base name of start file
 START_BASE=start
-
diff --git a/c/src/make/main.cfg.in b/c/src/make/main.cfg.in
deleted file mode 100644
index 4f72950a3d..0000000000
--- a/c/src/make/main.cfg.in
+++ /dev/null
@@ -1,9 +0,0 @@
-#  $Id$
-#
-# make/main.cfg
-#
-#   Make(1) configuration file include'd by all Makefile's
-#
-# NOTE: This file does not get exported from the source tree
-#
-# Now, it's empty :)
-- 
cgit v1.2.3