From 5c3511e5cff1019e683239fd71f6ea3254e1eccb Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 30 Jan 1998 21:49:51 +0000 Subject: Big patch form Ralf Corsepius described in this email: Here is the result of my nightly work to get RTEMS_ROOT=$srcdir working with different shells and relative/absolute paths. What I did is relatively simple in principle: Instead of setting RTEMS_ROOT in configure.in and then let configure substitute @RTEMS_ROOT@ inside the Makefiles, I now let each Makefile set RTEMS_ROOT from each Makefile's @top_srcdir@ value. The difference is subtile, but with enormous side effects: - If RTEMS_ROOT is set in configure, then the same single value will be propagated to all Makefiles. This breaks using relative paths, as the relative path to the root of the source tree is used inside of all subdirectory Makefiles. - Now each Makefile.in sets RTEMS_ROOT = @top_srcdir@. top_srcdir is computed individually by configure for each single Makefile.in, hereby receiving the correct value, no matter if relative or absolute paths are used. To get this working, I needed to remove setting RTEMS_ROOT from target.cfg.in, because this overrides the value of RTEMS_ROOT from each individual Makefile. Furthermore, I removed RTEMS_CUSTOM from the Makefiles and replaced all "include $(RTEMS_CUSTOM)" directives with"include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP)". Perhaps you don't like this, but I think, to have one variable less is clearer and easier to understand than having several variables refering to the next one. I enclose a small patch to this mail, which - fixes the config.h problem (to finally clearify misunderstands) - removes assignment/subsitution of RTEMS_ROOT from configure.in - contains a workaround for the application Makefile's RTEMS_ROOT problem (reported by Eric) - removes some unused lines from the toplevel Makefile.in - removes assignment of RTEMS_ROOT from make/target.cfg.in --- c/src/lib/libmisc/Makefile.in | 6 ++---- c/src/lib/libmisc/assoc/Makefile.in | 6 ++---- c/src/lib/libmisc/cpuuse/Makefile.in | 6 ++---- c/src/lib/libmisc/error/Makefile.in | 6 ++---- c/src/lib/libmisc/monitor/Makefile.in | 6 ++---- c/src/lib/libmisc/rtmonuse/Makefile.in | 6 ++---- c/src/lib/libmisc/stackchk/Makefile.in | 6 ++---- c/src/lib/libmisc/wrapup/Makefile.in | 6 ++---- 8 files changed, 16 insertions(+), 32 deletions(-) (limited to 'c/src/lib/libmisc') diff --git a/c/src/lib/libmisc/Makefile.in b/c/src/lib/libmisc/Makefile.in index 4de9a14c81..694266ae07 100644 --- a/c/src/lib/libmisc/Makefile.in +++ b/c/src/lib/libmisc/Makefile.in @@ -4,13 +4,11 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/directory.cfg SUB_DIRS=assoc error stackchk monitor cpuuse rtmonuse wrapup diff --git a/c/src/lib/libmisc/assoc/Makefile.in b/c/src/lib/libmisc/assoc/Makefile.in index 695cff0e3a..a547bb6565 100644 --- a/c/src/lib/libmisc/assoc/Makefile.in +++ b/c/src/lib/libmisc/assoc/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg LIB=${ARCH}/libassoc-tmp.a @@ -22,7 +20,7 @@ H_FILES=$(srcdir)/assoc.h SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/lib/libmisc/cpuuse/Makefile.in b/c/src/lib/libmisc/cpuuse/Makefile.in index fc8cc583a4..391b6cac8f 100644 --- a/c/src/lib/libmisc/cpuuse/Makefile.in +++ b/c/src/lib/libmisc/cpuuse/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg LIB=${ARCH}/libcpuuse-tmp.a @@ -23,7 +21,7 @@ INSTALLED_H_FILES=$(srcdir)/cpuuse.h SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/lib/libmisc/error/Makefile.in b/c/src/lib/libmisc/error/Makefile.in index 613ca85784..5cc51de586 100644 --- a/c/src/lib/libmisc/error/Makefile.in +++ b/c/src/lib/libmisc/error/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg LIB=${ARCH}/liberror-tmp.a @@ -22,7 +20,7 @@ H_FILES=$(srcdir)/error.h SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/lib/libmisc/monitor/Makefile.in b/c/src/lib/libmisc/monitor/Makefile.in index c327df7fe8..1ed5d13cb1 100644 --- a/c/src/lib/libmisc/monitor/Makefile.in +++ b/c/src/lib/libmisc/monitor/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ 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 @@ -24,7 +22,7 @@ INSTALLED_H_FILES=$(srcdir)/monitor.h $(srcdir)/symbols.h SRCS=README $(C_FILES) $(H_FILES) $(INSTALLED_H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/lib/libmisc/rtmonuse/Makefile.in b/c/src/lib/libmisc/rtmonuse/Makefile.in index 87d68c9ed1..a344c894b6 100644 --- a/c/src/lib/libmisc/rtmonuse/Makefile.in +++ b/c/src/lib/libmisc/rtmonuse/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg LIB=${ARCH}/librtmonuse-tmp.a @@ -23,7 +21,7 @@ INSTALLED_H_FILES=$(srcdir)/rtmonuse.h SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/lib/libmisc/stackchk/Makefile.in b/c/src/lib/libmisc/stackchk/Makefile.in index e262e27b81..2708e825bc 100644 --- a/c/src/lib/libmisc/stackchk/Makefile.in +++ b/c/src/lib/libmisc/stackchk/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg LIB=${ARCH}/libstackchk-tmp.a @@ -23,7 +21,7 @@ INSTALLED_H_FILES=$(srcdir)/stackchk.h SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/lib/libmisc/wrapup/Makefile.in b/c/src/lib/libmisc/wrapup/Makefile.in index 7d8b43535a..6a78cf222a 100644 --- a/c/src/lib/libmisc/wrapup/Makefile.in +++ b/c/src/lib/libmisc/wrapup/Makefile.in @@ -4,15 +4,13 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg LIB=$(ARCH)/libmisc.a -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # Using the wildcard on the Purify support makes sure it may not be there -- cgit v1.2.3