diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-01-30 21:49:51 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-01-30 21:49:51 +0000 |
commit | 5c3511e5cff1019e683239fd71f6ea3254e1eccb (patch) | |
tree | 6b63bc3b948de974251de8e23f06946f13323363 /c/src/lib/libbsp/i960/cvme961 | |
parent | Corrected Linux port for glibc2 (diff) | |
download | rtems-5c3511e5cff1019e683239fd71f6ea3254e1eccb.tar.bz2 |
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
Diffstat (limited to '')
-rw-r--r-- | c/src/lib/libbsp/i960/cvme961/Makefile.in | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/i960/cvme961/clock/Makefile.in | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/i960/cvme961/console/Makefile.in | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/i960/cvme961/include/Makefile.in | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.in | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/i960/cvme961/start/Makefile.in | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/i960/cvme961/startup/Makefile.in | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/i960/cvme961/timer/Makefile.in | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in | 6 |
9 files changed, 18 insertions, 36 deletions
diff --git a/c/src/lib/libbsp/i960/cvme961/Makefile.in b/c/src/lib/libbsp/i960/cvme961/Makefile.in index 0e705b50ab..7a8d6260ed 100644 --- a/c/src/lib/libbsp/i960/cvme961/Makefile.in +++ b/c/src/lib/libbsp/i960/cvme961/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 # wrapup is the one that actually builds and installs the library diff --git a/c/src/lib/libbsp/i960/cvme961/clock/Makefile.in b/c/src/lib/libbsp/i960/cvme961/clock/Makefile.in index 7f985380de..59df4f2702 100644 --- a/c/src/lib/libbsp/i960/cvme961/clock/Makefile.in +++ b/c/src/lib/libbsp/i960/cvme961/clock/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 PGM=${ARCH}/clock.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/i960/cvme961/console/Makefile.in b/c/src/lib/libbsp/i960/cvme961/console/Makefile.in index 580c9e9c7d..fd05ddfedd 100644 --- a/c/src/lib/libbsp/i960/cvme961/console/Makefile.in +++ b/c/src/lib/libbsp/i960/cvme961/console/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 PGM=${ARCH}/console.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/i960/cvme961/include/Makefile.in b/c/src/lib/libbsp/i960/cvme961/include/Makefile.in index b4103ce041..8cf95dc7c3 100644 --- a/c/src/lib/libbsp/i960/cvme961/include/Makefile.in +++ b/c/src/lib/libbsp/i960/cvme961/include/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 H_FILES = $(srcdir)/bsp.h $(srcdir)/coverhd.h @@ -27,7 +25,7 @@ EQ_FILES = SRCS=$(H_FILES) $(EQ_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += diff --git a/c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.in b/c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.in index 71f9604301..031a0aa0cd 100644 --- a/c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.in +++ b/c/src/lib/libbsp/i960/cvme961/shmsupp/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 PGM=${ARCH}/shmsupp.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/i960/cvme961/start/Makefile.in b/c/src/lib/libbsp/i960/cvme961/start/Makefile.in index e726972629..68dcd2196e 100644 --- a/c/src/lib/libbsp/i960/cvme961/start/Makefile.in +++ b/c/src/lib/libbsp/i960/cvme961/start/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 # C source names, if any, go here -- minus the .c C_PIECES= @@ -25,7 +23,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(C_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_O_FILES) $(S_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg PGM=${ARCH}/start.o diff --git a/c/src/lib/libbsp/i960/cvme961/startup/Makefile.in b/c/src/lib/libbsp/i960/cvme961/startup/Makefile.in index 2b0cfc3f4c..514cf8fdcc 100644 --- a/c/src/lib/libbsp/i960/cvme961/startup/Makefile.in +++ b/c/src/lib/libbsp/i960/cvme961/startup/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/../../../shared -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/startup.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/i960/cvme961/timer/Makefile.in b/c/src/lib/libbsp/i960/cvme961/timer/Makefile.in index 62d7c793d5..24809cbed8 100644 --- a/c/src/lib/libbsp/i960/cvme961/timer/Makefile.in +++ b/c/src/lib/libbsp/i960/cvme961/timer/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 PGM=${ARCH}/timer.rel @@ -27,7 +25,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(C_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_O_FILES) $(S_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in b/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in index 58e3074729..11ca32d8c7 100644 --- a/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in +++ b/c/src/lib/libbsp/i960/cvme961/wrapup/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 BSP_PIECES=startup clock console shmsupp timer GENERIC_PIECES=shmdr @@ -18,7 +16,7 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) LIB=$(ARCH)/libbsp.a -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # |