Changeset 5c3511e in rtems for c/src/lib/libbsp/m68k/ods68302


Ignore:
Timestamp:
01/30/98 21:49:51 (25 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
594a413
Parents:
421dfef6
Message:

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
Location:
c/src/lib/libbsp/m68k/ods68302
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • c/src/lib/libbsp/m68k/ods68302/Makefile.in

    r421dfef6 r5c3511e  
    55@SET_MAKE@
    66srcdir = @srcdir@
    7 top_srcdir = @top_srcdir@
    87VPATH = @srcdir@
    9 RTEMS_ROOT = @RTEMS_ROOT@
     8RTEMS_ROOT = @top_srcdir@
    109PROJECT_ROOT = @PROJECT_ROOT@
    11 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
    1210
    13 include $(RTEMS_CUSTOM)
     11include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
    1412include $(RTEMS_ROOT)/make/directory.cfg
    1513

  • c/src/lib/libbsp/m68k/ods68302/clock/Makefile.in

    r421dfef6 r5c3511e  
    55@SET_MAKE@
    66srcdir = @srcdir@
    7 top_srcdir = @top_srcdir@
    87VPATH = @srcdir@
    9 RTEMS_ROOT = @RTEMS_ROOT@
     8RTEMS_ROOT = @top_srcdir@
    109PROJECT_ROOT = @PROJECT_ROOT@
    11 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
    1210
    1311PGM=${ARCH}/clock.rel
    … …  
    2321OBJS=$(C_O_FILES)
    2422
    25 include $(RTEMS_CUSTOM)
     23include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
    2624include $(RTEMS_ROOT)/make/leaf.cfg
    2725

  • c/src/lib/libbsp/m68k/ods68302/console/Makefile.in

    r421dfef6 r5c3511e  
    55@SET_MAKE@
    66srcdir = @srcdir@
    7 top_srcdir = @top_srcdir@
    87VPATH = @srcdir@
    9 RTEMS_ROOT = @RTEMS_ROOT@
     8RTEMS_ROOT = @top_srcdir@
    109PROJECT_ROOT = @PROJECT_ROOT@
    11 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
    1210
    1311PGM=${ARCH}/console.rel
    … …  
    2321OBJS=$(C_O_FILES)
    2422
    25 include $(RTEMS_CUSTOM)
     23include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
    2624include $(RTEMS_ROOT)/make/leaf.cfg
    2725

  • c/src/lib/libbsp/m68k/ods68302/include/Makefile.in

    r421dfef6 r5c3511e  
    55@SET_MAKE@
    66srcdir = @srcdir@
    7 top_srcdir = @top_srcdir@
    87VPATH = @srcdir@
    9 RTEMS_ROOT = @RTEMS_ROOT@
     8RTEMS_ROOT = @top_srcdir@
    109PROJECT_ROOT = @PROJECT_ROOT@
    11 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
    1210
    1311H_FILES = $(srcdir)/bare.h $(srcdir)/bsp.h \
    … …  
    2826SRCS=$(H_FILES) $(EQ_FILES)
    2927
    30 include $(RTEMS_CUSTOM)
     28include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
    3129include $(RTEMS_ROOT)/make/leaf.cfg
    3230

  • c/src/lib/libbsp/m68k/ods68302/start/Makefile.in

    r421dfef6 r5c3511e  
    55@SET_MAKE@
    66srcdir = @srcdir@
    7 top_srcdir = @top_srcdir@
    87VPATH = @srcdir@
    9 RTEMS_ROOT = @RTEMS_ROOT@
     8RTEMS_ROOT = @top_srcdir@
    109PROJECT_ROOT = @PROJECT_ROOT@
    11 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
    1210
    1311PGM=${ARCH}/start302.o
    … …  
    3533OBJS=$(S_O_FILES) $(C_O_FILES)
    3634
    37 include $(RTEMS_CUSTOM)
     35include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
    3836include $(RTEMS_ROOT)/make/leaf.cfg
    3937

  • c/src/lib/libbsp/m68k/ods68302/start302/Makefile.in

    r421dfef6 r5c3511e  
    55@SET_MAKE@
    66srcdir = @srcdir@
    7 top_srcdir = @top_srcdir@
    87VPATH = @srcdir@
    9 RTEMS_ROOT = @RTEMS_ROOT@
     8RTEMS_ROOT = @top_srcdir@
    109PROJECT_ROOT = @PROJECT_ROOT@
    11 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
    1210
    1311PGM=${ARCH}/start302.o
    … …  
    3533OBJS=$(S_O_FILES) $(C_O_FILES)
    3634
    37 include $(RTEMS_CUSTOM)
     35include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
    3836include $(RTEMS_ROOT)/make/leaf.cfg
    3937

  • c/src/lib/libbsp/m68k/ods68302/startup/Makefile.in

    r421dfef6 r5c3511e  
    55@SET_MAKE@
    66srcdir = @srcdir@
    7 top_srcdir = @top_srcdir@
    87VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared
    9 RTEMS_ROOT = @RTEMS_ROOT@
     8RTEMS_ROOT = @top_srcdir@
    109PROJECT_ROOT = @PROJECT_ROOT@
    11 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
    1210
    1311PGM=${ARCH}/startup.rel
    … …  
    2422OBJS=$(C_O_FILES)
    2523
    26 include $(RTEMS_CUSTOM)
     24include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
    2725include $(RTEMS_ROOT)/make/leaf.cfg
    2826

  • c/src/lib/libbsp/m68k/ods68302/timer/Makefile.in

    r421dfef6 r5c3511e  
    55@SET_MAKE@
    66srcdir = @srcdir@
    7 top_srcdir = @top_srcdir@
    87VPATH = @srcdir@
    9 RTEMS_ROOT = @RTEMS_ROOT@
     8RTEMS_ROOT = @top_srcdir@
    109PROJECT_ROOT = @PROJECT_ROOT@
    11 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
    1210
    1311PGM=${ARCH}/timer.rel
    … …  
    2826OBJS=$(C_O_FILES) $(S_O_FILES)
    2927
    30 include $(RTEMS_CUSTOM)
     28include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
    3129include $(RTEMS_ROOT)/make/leaf.cfg
    3230

  • c/src/lib/libbsp/m68k/ods68302/wrapup/Makefile.in

    r421dfef6 r5c3511e  
    55@SET_MAKE@
    66srcdir = @srcdir@
    7 top_srcdir = @top_srcdir@
    87VPATH = @srcdir@
    9 RTEMS_ROOT = @RTEMS_ROOT@
     8RTEMS_ROOT = @top_srcdir@
    109PROJECT_ROOT = @PROJECT_ROOT@
    11 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
    1210
    1311BSP_PIECES=startup clock console timer
    … …  
    1917LIB=$(ARCH)/libbsp.a
    2018
    21 include $(RTEMS_CUSTOM)
     19include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
    2220include $(RTEMS_ROOT)/make/lib.cfg
    2321
Note: See TracChangeset for help on using the changeset viewer.