Changeset 6b7ab9bf in rtems for make


Ignore:
Timestamp:
Apr 16, 1999, 6:23:48 PM (21 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
60e6a0f
Parents:
c00fa38
Message:

Patch from Ralf Corsepius <corsepiu@…>:

FYI: I am not talking about using "make -C <dir>", which probably
is much faster on M$ hosts than RTEMS's implementation, but about
removing --enable-gmake-print support and to apply a variant of
automake's subdirectory.

Automake's subdirectory rule seems to be a little bit faster, but I
wouldn't bet on this.

Attached to this mail is my proposal.

After applying the patch, please run

cvs rm aclocal/enable-gmake-print.m4
./autogen

Location:
make
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • make/Templates/Makefile.inc.in

    rc00fa38 r6b7ab9bf  
    3333RTEMS_CUSTOM = $(prefix)/make/custom/$(RTEMS_BSP).cfg
    3434PROJECT_ROOT = $(prefix)/
    35 RTEMS_USE_OWN_PDIR = @RTEMS_USE_OWN_PDIR@
     35RTEMS_USE_OWN_PDIR = no
    3636RTEMS_HAS_POSIX_API = @RTEMS_HAS_POSIX_API@
    3737RTEMS_USE_MACROS = @RTEMS_USE_MACROS@
  • make/directory.cfg

    rc00fa38 r6b7ab9bf  
    99#
    1010
    11 # include $(RTEMS_ROOT)/make/main.cfg
     11# RULE=$(shell echo $@ | $(SED) -e s/debug_// -e s/profile_//)
    1212
    13 # on a 'make -k' we don't want to bomb out of directory list
    14 EXIT_CMD=exit 1
    15 ifeq (k, $(findstring k, $(MAKEFLAGS)))
    16 EXIT_CMD=true
    17 endif
    18 
    19 RULE=$(shell echo $@ | $(SED) -e s/debug_// -e s/profile_//)
    20 
    21 ifeq ($(RTEMS_USE_OWN_PDIR),yes)
     13# This is a simplified variant of automake-1.4's rule for handling
     14# subdirectories
    2215$(RECURSE_TARGETS):
    23         @$(ECHO); \
    24         BASEDIR=`pwd`; \
    25         test -d $$BASEDIR || $(EXIT_CMD) ; \
    26         for subd in $(SUB_DIRS) xxx; \
    27         do if [ $$subd != xxx ] ; then  \
    28             cd $$BASEDIR; \
    29             if [ ! -d $$subd ] ; then \
    30               $(ECHO) "*** ERROR -- Directory ($$subd) does not exist!!!"; \
    31               $(EXIT_CMD) ; \
    32             fi ; \
    33             $(ECHO); \
    34             $(ECHO) "***  $$BASEDIR/$$subd ($@)" ; \
    35             cmd="cd $$subd; $(MAKE) $(RULE)"; \
    36             $(ECHO) $$cmd; \
    37             eval $$cmd || $(EXIT_CMD); \
    38   fi; done; \
    39         $(ECHO); \
    40         $(ECHO) "***  $$BASEDIR/$@ ($@) Finished."; \
    41         $(ECHO)
    42         $($@_WRAPUP)
    43 else
    44 ifdef RECURSE_TARGETS
    45 $(RECURSE_TARGETS):
    46         @$(ECHO) ; set -e ; \
    47         if [ "$(SUB_DIRS)" != "" ] ; then \
    48           sdirs="$(SUB_DIRS)" ; \
    49         else \
    50           sdirs="xxx" ; \
    51         fi ; \
    52         if [ "$$sdirs" != "xxx" ] ; then \
    53           for subd in $$sdirs; do $(MAKE) -w -C $$subd $(RULE); done ;\
    54         fi
    55 endif
    56 endif
    57 
     16        @set fnord $(MAKEFLAGS); amf=$$2; \
     17        dot_seen=no; \
     18        target=`echo $@ | sed -e s/-recursive// -e s/debug_// -e s/profile_// `; \
     19        list='$(SUB_DIRS)'; for subdir in $$list; do \
     20          echo "Making $$target RTEMS_BSP=${RTEMS_BSP} in $$subdir"; \
     21          local_target="$$target"; \
     22          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
     23           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
     24        done && test -z "$$fail"
  • make/main.cfg

    rc00fa38 r6b7ab9bf  
    6767                $(TARGET_VARIANTS) $(TARGET_VARIANTS:%=%_install)
    6868
    69 ifeq ($(RTEMS_USE_OWN_PDIR),yes)
    70 MAKEFLAGS += --no-print-directory
    71 endif
    72 
    7369${ARCH}:
    7470        test -d ${ARCH} || $(MKDIR) ${ARCH}
  • make/target.cfg.in

    rc00fa38 r6b7ab9bf  
    3939
    4040RTEMS_HOST = @RTEMS_HOST@
    41 RTEMS_USE_OWN_PDIR = @RTEMS_USE_OWN_PDIR@
    4241RTEMS_HAS_MULTIPROCESSING = @RTEMS_HAS_MULTIPROCESSING@
    4342RTEMS_HAS_POSIX_API = @RTEMS_HAS_POSIX_API@
Note: See TracChangeset for help on using the changeset viewer.