Changeset 662


Ignore:
Timestamp:
Sep 7, 2003, 11:28:18 PM (22 years ago)
Author:
bird
Message:

Multijob make.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile

    • Property cvs2svn:cvs-rev changed from 1.47 to 1.48
    r661 r662  
    119119all:   
    120120        mkdir -p $(PATH_OBJ)
    121         $(NICE)  $(MAKE) -C . all-logged 2>&1 | $(UNIXROOT)/usr/bin/tee $(PATH_OBJ)/build-`date +"%Y%m%d-%H%M%S"`.log
     121        $(NICE) $(MAKE) $(MAKEOPT) -j 1 -C . all-logged 2>&1 | $(UNIXROOT)/usr/bin/tee $(PATH_OBJ)/build-`date +"%Y%m%d-%H%M%S"`.log
    122122
    123123all-logged:     \
    … …  
    232232        @echo "    SHELL                = $(SHELL)"
    233233        @echo "    MAKE                 = $(MAKE)"
     234        @echo "    MAKEOPT              = $(MAKEOPT)"
    234235        @echo "    PATH                 = $(PATH)"
    235236        @echo "    C_INCLUDE_PATH       = $(C_INCLUDE_PATH)"
    … …  
    313314$(PATH_OBJ)/.ts.versionstamped:
    314315        echo '#define INNOTEK_VERSION  "$(INNOTEK_VERSION)"' > include/innotekversion.h
    315         $(MAKE) -f $(MAKEFILE) "INNOTEK_VERSION=$(INNOTEK_VERSION)" gcc-versionstamps binutils-versionstamps emx-versionstamps
     316        $(MAKE) $(MAKEOPT) -j 1 -f $(MAKEFILE) "INNOTEK_VERSION=$(INNOTEK_VERSION)" gcc-versionstamps binutils-versionstamps emx-versionstamps
    316317        mkdir -p $(@D)
    317318        touch $@
    … …  
    326327all-stage1: $(PATH_OBJ)/.all-stage1
    327328$(PATH_OBJ)/.all-stage1:
    328         $(MAKE) -f $(MAKEFILE) all-stage1-it
     329        $(MAKE) $(MAKEOPT) -j 1 -f $(MAKEFILE) all-stage1-it
    329330        echo "$(@F)" > $(PATH_OBJ)/.last-stage
    330331        touch $@
    … …  
    344345$(PATH_OBJ)/.all-stage2: \
    345346                $(PATH_OBJ)/.all-stage2.save-stage1
    346         $(MAKE) -f $(MAKEFILE) all-stage2-it
     347        $(MAKE) $(MAKEOPT) -j 1 -f $(MAKEFILE) all-stage2-it
    347348        echo "$(@F)" > $(PATH_OBJ)/.last-stage
    348349        touch $@
    … …  
    355356        @echo "+ Saving Stage 1 - Starting: $(shell date)"
    356357        @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
    357         $(MAKE) -f $(MAKEFILE) all-preload-unload
    358         $(MAKE) -f $(MAKEFILE) all-builttools-stage2
     358        $(MAKE) $(MAKEOPT) -j 1 -f $(MAKEFILE) all-preload-unload
     359        $(MAKE) $(MAKEOPT) -j 1 -f $(MAKEFILE) all-builttools-stage2
    359360        rm -Rf $(PATH_OBJ)/stage1
    360361        mkdir -p $(PATH_OBJ)/stage1
    … …  
    362363        if [ -d $(PATH_OBJ)/emx ] ; then mv $(PATH_OBJ)/emx $(PATH_OBJ)/stage1/emx; fi
    363364        if [ -d $(PATH_TOP)/src/emx/out ] ; then mv $(PATH_TOP)/src/emx/out $(PATH_OBJ)/stage1/emx_out; fi
    364         $(MAKE) -f $(MAKEFILE) all-preload
     365        $(MAKE) $(MAKEOPT) -j 1 -f $(MAKEFILE) all-preload
    365366        touch $@
    366367        @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
    … …  
    652653endif
    653654        for dir in $(GCC_CONFIGURE_DIRS); do \
    654                 if $(MAKE) $(@:gcc-autoconf-%=%) -f $(PWD)/config.gmk -C src/$$dir ; then \
     655                if $(MAKE) $(MAKEOPT) -j 1 $(@:gcc-autoconf-%=%) -f $(PWD)/config.gmk -C src/$$dir ; then \
    655656                        true; \
    656657                else \
    … …  
    664665gcc-build gcc-install gcc-configure:
    665666        mkdir -p $(PATH_OBJ)/gcc
    666         $(MAKE) -C $(PATH_OBJ)/gcc -f $(MAKEFILE) $@-it
     667        $(MAKE) $(MAKEOPT) -j 1 -C $(PATH_OBJ)/gcc -f $(MAKEFILE) $@-it
    667668
    668669
    … …  
    679680                $(PATH_OBJ)/gcc/.ts.configured
    680681ifeq "$(BUILD_PLATFORM)" "OS2"         
    681         unset GCCLOAD ; $(MAKE) -C $(PATH_OBJ)/gcc \
     682        unset GCCLOAD ; $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/gcc \
    682683            LIBGCC2_DEBUG_CFLAGS="$(BUILD_DEBUGINFO)" \
    683684                      CFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -O2" \
    … …  
    688689                bootstrap
    689690else
    690         $(MAKE) -C $(PATH_OBJ)/gcc bootstrap
     691        $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/gcc bootstrap
    691692endif   
    692693               
    … …  
    728729#       Repeating the prefix doesn't hurt anybody.
    729730gcc-install-it:
    730         $(MAKE) prefix=$(ALL_PREFIX) install
     731        $(MAKE) $(MAKEOPT) prefix=$(ALL_PREFIX) install
    731732
    732733
    … …  
    744745##     WARNING! Another spec HACK!
    745746gcc-builttools-stage2:
    746         $(MAKE) -C $(PATH_OBJ)/gcc prefix=$(PATH_BUILTTOOLS_TMPD) install
     747        $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/gcc prefix=$(PATH_BUILTTOOLS_TMPD) install
    747748##      cp $(PATH_TOP)/src/emx/src/lib/libc.specs $(PATH_OBJ)/gcc/gcc/specs
    748749
    … …  
    769770gccomf:
    770771        mkdir -p $(PATH_OBJ)/gccomf
    771         $(NICE) $(MAKE) -C . gccomf-logged 2>&1 | $(UNIXROOT)/usr/bin/tee $(PATH_OBJ)/gccomf/build-`date +"%Y%m%d-%H%M%S"`.log
     772        $(NICE) $(MAKE) $(MAKEOPT) -C . gccomf-logged 2>&1 | $(UNIXROOT)/usr/bin/tee $(PATH_OBJ)/gccomf/build-`date +"%Y%m%d-%H%M%S"`.log
    772773                                       
    773774gccomf-logged: \
    … …  
    780781gccomf-build gccomf-install gccomf-configure:
    781782        mkdir -p $(PATH_OBJ)/gccomf
    782         $(MAKE) -C $(PATH_OBJ)/gccomf -f $(MAKEFILE) $@-it
     783        $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/gccomf -f $(MAKEFILE) $@-it
    783784
    784785
    … …  
    786787gccomf-shell:                   
    787788        mkdir -p $(PATH_OBJ)/gccomf
    788         $(MAKE) -e -C $(PATH_OBJ)/gccomf -f $(MAKEFILE) $@-it
     789        $(MAKE) $(MAKEOPT) -e -C $(PATH_OBJ)/gccomf -f $(MAKEFILE) $@-it
    789790gccomf-shell-it:
    790791        chdir $(PATH_OBJ)/gccomf ; \
    … …  
    814815ifeq "$(BUILD_PLATFORM)" "OS2"         
    815816        if test -d $(PATH_BUILTTOOLS)/omfhack; then mv -f $(PATH_BUILTTOOLS)/omfhack $(PATH_BUILTTOOLS)/omfhackbin; fi
    816         unset GCCLOAD ; export GCC_OMF="real" ; echo GCC_OMF=$$GCC_OMF; $(MAKE) -C $(PATH_OBJ)/gccomf \
     817        unset GCCLOAD ; export GCC_OMF="real" ; echo GCC_OMF=$$GCC_OMF; $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/gccomf \
    817818            LIBGCC2_DEBUG_CFLAGS="-g -Zaout" \
    818819                      CFLAGS="$(OMFSPEC_HACK) -Zomf -g " \
    … …  
    824825        mv -f $(PATH_BUILTTOOLS)/omfhackbin $(PATH_BUILTTOOLS)/omfhack
    825826else
    826         $(MAKE) -C $(PATH_OBJ)/gcc all
     827        $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/gcc all
    827828endif   
    828829
    … …  
    865866#       Repeating the prefix doesn't hurt anybody.
    866867gccomf-install-it:
    867         $(MAKE) prefix=$(ALL_PREFIX) install
     868        $(MAKE) $(MAKEOPT) prefix=$(ALL_PREFIX) install
    868869
    869870
    … …  
    915916endif
    916917        for dir in $(BINUTILS_CONFIGURE_DIRS); do \
    917                 if $(MAKE) $(@:binutils-autoconf-%=%) -f $(PWD)/config.gmk -C src/$$dir ; then \
     918                if $(MAKE) $(MAKEOPT) -j 1 $(@:binutils-autoconf-%=%) -f $(PWD)/config.gmk -C src/$$dir ; then \
    918919                        true; \
    919920                else \
    … …  
    927928binutils-build binutils-install binutils-configure:
    928929        mkdir -p $(PATH_OBJ)/binutils
    929         $(MAKE) -C $(PATH_OBJ)/binutils -f $(MAKEFILE) $@-it
     930        $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/binutils -f $(MAKEFILE) $@-it
    930931
    931932
    … …  
    933934binutils-build-it: \
    934935                $(PATH_OBJ)/binutils/.ts.configured
    935         $(ASH) -c " unset GCCLOAD ; $(MAKE) -C $(PATH_OBJ)/binutils "
     936        $(ASH) -c " unset GCCLOAD ; $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/binutils "
    936937               
    937938# configure it (invoked after directory change).
    … …  
    978979#       Repeating the prefix doesn't hurt anybody.
    979980binutils-install-it:
    980         $(MAKE) prefix=$(ALL_PREFIX) install
     981        $(MAKE) $(MAKEOPT) prefix=$(ALL_PREFIX) install
    981982
    982983
    … …  
    10681069emx-build emx-install emx-configure:
    10691070        mkdir -p $(PATH_OBJ)/emx
    1070         $(MAKE) -C $(PATH_TOP)/src/emx -f $(MAKEFILE) $@-it
     1071        $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/src/emx -f $(MAKEFILE) $@-it
    10711072
    10721073# This is the configure equivalent.     
    … …  
    10741075$(EMX_RULES):
    10751076        rm -f $(EMX_RULES)
    1076         $(MAKE) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) $(EMX_RULES)
     1077        $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) $(EMX_RULES)
    10771078       
    10781079# make handle issue here. Make portions at the time.
    10791080emx-build-it: $(EMX_RULES)
    1080         $(MAKE) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) tools
    1081         $(MAKE) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) os2
    1082         $(MAKE) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) libc
    1083         $(MAKE) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) app
    1084         $(MAKE) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) alias
    1085         $(MAKE) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) regexp
    1086         $(MAKE) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) libc-dll
    1087         $(MAKE) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) libsocket libdl
    1088         $(MAKE) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) libs
    1089         $(MAKE) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) all
     1081        $(MAKE) $(MAKEOPT) -j 1 -C $(PATH_TOP)/src/emx $(EMX_DEFINES) tools
     1082        $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) os2
     1083        $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) libc
     1084        $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) app
     1085        $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) alias
     1086        $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) regexp
     1087        $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) libc-dll
     1088        $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) libsocket libdl
     1089        $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) libs
     1090        $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) all
    10901091
    10911092emx-install-it: $(EMX_RULES)
    1092         $(MAKE) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) INS=$(ALL_PREFIX)/ install
     1093        $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) INS=$(ALL_PREFIX)/ install
    10931094
    10941095                                       
    … …  
    11001101##emx-builttools-stage2: emx-builttools-stage2-specs
    11011102emx-builttools-stage2:
    1102         $(MAKE) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) INS=$(PATH_BUILTTOOLS_TMP)/  install
     1103        $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) INS=$(PATH_BUILTTOOLS_TMP)/  install
    11031104
    11041105## bird: for now we will just replace the specs with the constantly updated libc specs.
    … …  
    12221223endif
    12231224        for dir in $(DEJAGNU_CONFIGURE_DIRS); do \
    1224                 if $(MAKE) $(@:dejagnu-autoconf-%=%) -f $(PWD)/config.gmk -C $$dir ; then \
     1225                if $(MAKE) $(MAKEOPT) -j 1 $(@:dejagnu-autoconf-%=%) -f $(PWD)/config.gmk -C $$dir ; then \
    12251226                        true; \
    12261227                else \
    … …  
    12421243expect-build expect-install expect-configure:
    12431244        mkdir -p $(PATH_OBJ)/misc/expect
    1244         $(MAKE) -C $(PATH_OBJ)/misc/expect -f $(MAKEFILE) $@-it
     1245        $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/misc/expect -f $(MAKEFILE) $@-it
    12451246
    12461247
    … …  
    12481249expect-build-it: \
    12491250                $(PATH_OBJ)/misc/expect/.ts.configured
    1250         $(MAKE) -C $(PATH_OBJ)/misc/expect
     1251        $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/misc/expect
    12511252               
    12521253# configure it (invoked after directory change).
    … …  
    12771278# install to builttools (if anywhere!)
    12781279expect-install-it:
    1279         $(MAKE) prefix=$(PATH_BUILTTOOLSD) install
     1280        $(MAKE) $(MAKEOPT) prefix=$(PATH_BUILTTOOLSD) install
    12801281       
    12811282
    … …  
    12921293endif
    12931294        for dir in $(EXPECT_CONFIGURE_DIRS); do \
    1294                 if $(MAKE) $(@:expect-autoconf-%=%) -f $(PWD)/config.gmk -C $$dir ; then \
     1295                if $(MAKE) $(MAKEOPT) -j 1 $(@:expect-autoconf-%=%) -f $(PWD)/config.gmk -C $$dir ; then \
    12951296                        true; \
    12961297                else \
Note: See TracChangeset for help on using the changeset viewer.