Changeset 5c3511e in rtems for Makefile.in


Ignore:
Timestamp:
Jan 30, 1998, 9:49:51 PM (22 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 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
File:
1 edited

Legend:

Unmodified
Added
Removed
  • Makefile.in

    r421dfef6 r5c3511e  
    2121export bindir
    2222
    23 RTEMS_ROOT = @RTEMS_ROOT@
     23RTEMS_ROOT = @top_srcdir@
    2424PROJECT_ROOT = @PROJECT_ROOT@
    2525
     
    3030endif
    3131
    32 MAKE_CONFIG_EXTRA_DIR_PART=c/
    33 
    3432include $(RTEMS_ROOT)/make/main.cfg
    3533
     
    3836  clean_wrapup distclean clean_dirs clean_tools tests clean depend
    3937
    40 .PHONY:
    41 
    4238EXIT_CMD = exit 1
    4339
    4440# Don't pass flags from previous make - especially NOT CFLAGS
    4541override MAKEFLAGS=
    46 
    47 #            \"XCFLAGS=$(CFLAGS_FOR_TARGET)\"
    4842
    4943$(MTARGETS):
Note: See TracChangeset for help on using the changeset viewer.