From 674c900f24a91e1503d5f6f07bbe2f423ef5bf4b Mon Sep 17 00:00:00 2001 From: Joel Sherrill 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). --- c/src/lib/libmisc/Makefile.in | 5 ++++- c/src/lib/libmisc/assoc/Makefile.in | 5 ++++- c/src/lib/libmisc/cpuuse/Makefile.in | 5 ++++- c/src/lib/libmisc/error/Makefile.in | 5 ++++- c/src/lib/libmisc/monitor/Makefile.in | 5 ++++- c/src/lib/libmisc/rtmonuse/Makefile.in | 5 ++++- c/src/lib/libmisc/stackchk/Makefile.in | 5 ++++- c/src/lib/libmisc/wrapup/Makefile.in | 11 +++++++---- 8 files changed, 35 insertions(+), 11 deletions(-) (limited to 'c/src/lib/libmisc') diff --git a/c/src/lib/libmisc/Makefile.in b/c/src/lib/libmisc/Makefile.in index 20974965bd..480179dc8f 100644 --- a/c/src/lib/libmisc/Makefile.in +++ b/c/src/lib/libmisc/Makefile.in @@ -5,7 +5,10 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -VPATH=@srcdir@ +VPATH = @srcdir@ +RTEMS_ROOT = @RTEMS_ROOT@ +PROJECT_ROOT = @PROJECT_ROOT@ +RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_CUSTOM) include $(PROJECT_ROOT)/make/directory.cfg diff --git a/c/src/lib/libmisc/assoc/Makefile.in b/c/src/lib/libmisc/assoc/Makefile.in index 3e2c4faccf..2f88fd0837 100644 --- a/c/src/lib/libmisc/assoc/Makefile.in +++ b/c/src/lib/libmisc/assoc/Makefile.in @@ -5,7 +5,10 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -VPATH=@srcdir@ +VPATH = @srcdir@ +RTEMS_ROOT = @RTEMS_ROOT@ +PROJECT_ROOT = @PROJECT_ROOT@ +RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg LIB=${ARCH}/libassoc-tmp.a diff --git a/c/src/lib/libmisc/cpuuse/Makefile.in b/c/src/lib/libmisc/cpuuse/Makefile.in index 0545acd3b6..00e4bcb615 100644 --- a/c/src/lib/libmisc/cpuuse/Makefile.in +++ b/c/src/lib/libmisc/cpuuse/Makefile.in @@ -5,7 +5,10 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -VPATH=@srcdir@ +VPATH = @srcdir@ +RTEMS_ROOT = @RTEMS_ROOT@ +PROJECT_ROOT = @PROJECT_ROOT@ +RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg LIB=${ARCH}/libcpuuse-tmp.a diff --git a/c/src/lib/libmisc/error/Makefile.in b/c/src/lib/libmisc/error/Makefile.in index 1bbf268219..add38a1d7f 100644 --- a/c/src/lib/libmisc/error/Makefile.in +++ b/c/src/lib/libmisc/error/Makefile.in @@ -5,7 +5,10 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -VPATH=@srcdir@ +VPATH = @srcdir@ +RTEMS_ROOT = @RTEMS_ROOT@ +PROJECT_ROOT = @PROJECT_ROOT@ +RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg LIB=${ARCH}/liberror-tmp.a diff --git a/c/src/lib/libmisc/monitor/Makefile.in b/c/src/lib/libmisc/monitor/Makefile.in index d7683ee041..6a390b2c41 100644 --- a/c/src/lib/libmisc/monitor/Makefile.in +++ b/c/src/lib/libmisc/monitor/Makefile.in @@ -5,7 +5,10 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -VPATH=@srcdir@ +VPATH = @srcdir@ +RTEMS_ROOT = @RTEMS_ROOT@ +PROJECT_ROOT = @PROJECT_ROOT@ +RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg LIB=${ARCH}/libmonitor-tmp.a # C source names, if any, go here -- minus the .c diff --git a/c/src/lib/libmisc/rtmonuse/Makefile.in b/c/src/lib/libmisc/rtmonuse/Makefile.in index 419a57c304..835f94d32f 100644 --- a/c/src/lib/libmisc/rtmonuse/Makefile.in +++ b/c/src/lib/libmisc/rtmonuse/Makefile.in @@ -5,7 +5,10 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -VPATH=@srcdir@ +VPATH = @srcdir@ +RTEMS_ROOT = @RTEMS_ROOT@ +PROJECT_ROOT = @PROJECT_ROOT@ +RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg LIB=${ARCH}/librtmonuse-tmp.a diff --git a/c/src/lib/libmisc/stackchk/Makefile.in b/c/src/lib/libmisc/stackchk/Makefile.in index 66768d2a67..d55e4d8096 100644 --- a/c/src/lib/libmisc/stackchk/Makefile.in +++ b/c/src/lib/libmisc/stackchk/Makefile.in @@ -5,7 +5,10 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -VPATH=@srcdir@ +VPATH = @srcdir@ +RTEMS_ROOT = @RTEMS_ROOT@ +PROJECT_ROOT = @PROJECT_ROOT@ +RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg LIB=${ARCH}/libstackchk-tmp.a diff --git a/c/src/lib/libmisc/wrapup/Makefile.in b/c/src/lib/libmisc/wrapup/Makefile.in index 5884336105..092b12f411 100644 --- a/c/src/lib/libmisc/wrapup/Makefile.in +++ b/c/src/lib/libmisc/wrapup/Makefile.in @@ -5,10 +5,16 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -VPATH=@srcdir@ +VPATH = @srcdir@ +RTEMS_ROOT = @RTEMS_ROOT@ +PROJECT_ROOT = @PROJECT_ROOT@ +RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg LIB=$(ARCH)/libmisc.a +include $(RTEMS_CUSTOM) +include $(PROJECT_ROOT)/make/lib.cfg + # Using the wildcard on the Purify support makes sure it may not be there LIBS=../monitor/$(ARCH)/libmonitor-tmp.a \ @@ -20,9 +26,6 @@ LIBS=../monitor/$(ARCH)/libmonitor-tmp.a \ $(wildcard ../purify/$(ARCH)/libpurify-tmp.a) RELS= -include $(RTEMS_CUSTOM) -include $(PROJECT_ROOT)/make/lib.cfg - CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -- cgit v1.2.3