From 674c900f24a91e1503d5f6f07bbe2f423ef5bf4b Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Wed, 10 Dec 1997 16:58:00 +0000
Subject: Modified a lot of files to take a first cut at supporting building
 from any directory in the build tree.  The only variable which must be set
 before the command "gmake" is invoked is RTEMS_BSP (e.g. RTEMS_BSP=erc32).

---
 Makefile.in | 60 ++++++++----------------------------------------------------
 1 file changed, 8 insertions(+), 52 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 466a35754e..8d590f8b9f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,35 +16,10 @@ manext = 1
 mandir = @mandir@/man$(manext)
 program_prefix = @program_prefix@
 
-
-VPATH=@srcdir@
-
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-DEFS = @DEFS@
-LDFLAGS =
-LIBS = @LIBS@
-CC_FOR_BUILD = gcc
-
-
-CC_FOR_TARGET = $(program_prefix)gcc
-AS_FOR_TARGET = $(program_prefix)as
-AR_FOR_TARGET = $(program_prefix)ar
-NM_FOR_TARGET = $(program_prefix)nm
-LD_FOR_TARGET = $(program_prefix)ld
-OBJCOPY_FOR_TARGET = $(program_prefix)objcopy
-SIZE_FOR_TARGET = $(program_prefix)size
-
 RTEMS_ROOT = @RTEMS_ROOT@
-RTEMS_HOST = @RTEMS_HOST@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_USE_OWN_PDIR = @RTEMS_USE_OWN_PDIR@
-RTEMS_HAS_POSIX_API = @RTEMS_HAS_POSIX_API@
-RTEMS_HAS_KA9Q = @RTEMS_HAS_KA9Q@
-RTEMS_HAS_CPLUSPLUS = @RTEMS_HAS_CPLUSPLUS@
-RTEMS_USE_MACROS = @RTEMS_USE_MACROS@
-RTEMS_USE_GCC272 = @RTEMS_USE_GCC272@
-RTEMS_LIBC_DIR = @RTEMS_LIBC_DIR@
+
+VPATH=@srcdir@
 
 ifeq ($(RTEMSBSP),)
   RTEMS_BSP = @RTEMS_BSP@
@@ -52,6 +27,8 @@ else
   RTEMS_BSP = $(RTEMSBSP)
 endif
 
+MAKE_CONFIG_EXTRA_DIR_PART=c/
+
 include $(RTEMS_ROOT)/make/main.cfg
 
 MTARGETS = all install $(TARGET_VARIANTS) $(TARGET_VARIANTS:%=%_all) \
@@ -65,34 +42,14 @@ EXIT_CMD = exit 1
 # Don't pass flags from previous make - especially NOT CFLAGS 
 override MAKEFLAGS=
 
+#            \"XCFLAGS=$(CFLAGS_FOR_TARGET)\"
+
 $(MTARGETS): make_subdir
 	BASEDIR=`pwd`; \
 	for bsp in $(RTEMS_BSP) xxx; \
 	do if [ $$bsp != xxx ] ; then  \
 	    cd $$BASEDIR; \
 	    cmd="cd c; $(MAKE) RTEMS_BSP=$$bsp $(FLAGS_TO_PASS) \
-	    RTEMS_CUSTOM=$(RTEMS_ROOT)/make/custom/$$bsp.cfg \
-	    INSTALL=$(PROJECT_ROOT)/$$bsp/build-tools/install-if-change \
-            \"CC=$(CC_FOR_TARGET)\" \
-            \"XCFLAGS=$(CFLAGS_FOR_TARGET)\" \
-            \"CC_FOR_BUILD=$(CC_FOR_BUILD)\" \
-            \"AS=$(AS_FOR_TARGET)\" \
-            \"LD=$(LD_FOR_TARGET)\" \
-            \"NM=$(NM_FOR_TARGET)\" \
-            \"AR=$(AR_FOR_TARGET)\" \
-            \"SIZE=$(SIZE_FOR_TARGET)\" \
-            \"OBJCOPY=$(OBJCOPY_FOR_TARGET)\" \
-            \"RTEMS_ROOT=$(RTEMS_ROOT)\" \
-            \"RTEMS_HOST=$(RTEMS_HOST)\" \
-            \"PROJECT_HOME=$(PROJECT_ROOT)/$$bsp\" \
-            \"PROJECT_ROOT=$(PROJECT_ROOT)\" \
-            \"RTEMS_USE_OWN_PDIR=$(RTEMS_USE_OWN_PDIR)\" \
-            \"RTEMS_HAS_POSIX_API=$(RTEMS_HAS_POSIX_API)\" \
-            \"RTEMS_HAS_KA9Q=$(RTEMS_HAS_KA9Q)\" \
-            \"RTEMS_HAS_CPLUSPLUS=$(RTEMS_HAS_CPLUSPLUS)\" \
-            \"RTEMS_USE_MACROS=$(RTEMS_USE_MACROS)\" \
-            \"RTEMS_USE_GCC272=$(RTEMS_USE_GCC272)\" \
-            \"RTEMS_LIBC_DIR=$(RTEMS_LIBC_DIR)\" \
             $@" ; \
 	    eval $$cmd || $(EXIT_CMD); \
 	fi; done; 
@@ -109,7 +66,6 @@ make_subdir:
 	        make/Templates/Makefile.leaf make/Templates/Makefile.lib) | \
 		tar xpBf - ; rm -rf make/CVS make/*/CVS ; \
 	  cp c/make/Templates/Makefile.inc make/Templates/Makefile.inc ; \
+	  cp c/make/host.cfg make/host.cfg ; \
+	  cp c/make/target.cfg make/target.cfg ; \
 	fi
-  	
- 	
-
-- 
cgit v1.2.3