Changeset 1941 for trunk/Makefile


Ignore:
Timestamp:
May 1, 2005, 9:13:28 AM (20 years ago)
Author:
bird
Message:

builttools -> builtunix

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile

    • Property cvs2svn:cvs-rev changed from 1.106 to 1.107
    r1940 r1941  
    3737export PATH_OBJ        = $(PATH_TOP)/obj/$(BUILD_PLATFORM)/$(BUILD_MODE)
    3838export PATH_OBJD       = $(PATH_TOPD)/obj/$(BUILD_PLATFORM)/$(BUILD_MODE)
    39 export PATH_BUILTTOOLS = $(PATH_OBJ)/builttools
    40 export PATH_BUILTTOOLSD= $(PATH_OBJD)/builttools
    41 PATH_BUILTTOOLS_TMP    = $(PATH_OBJ)/builttools.tmp
    42 PATH_BUILTTOOLS_TMPD   = $(PATH_OBJD)/builttools.tmp
     39export PATH_BUILTUNIX  = $(PATH_OBJ)/builttools
     40export PATH_BUILTUNIXD = $(PATH_OBJD)/builttools
     41export PATH_BUILTTOOLS = $(PATH_BUILTUNIX)/usr
     42export PATH_BUILTTOOLSD= $(PATH_BUILTUNIXD)/usr
     43PATH_BUILTUNIX_TMP     = $(PATH_OBJ)/builttools.tmp
     44PATH_BUILTUNIX_TMPD    = $(PATH_OBJD)/builttools.tmp
     45PATH_BUILTTOOLS_TMP    = $(PATH_BUILTUNIX_TMP)/usr
     46PATH_BUILTTOOLS_TMPD   = $(PATH_BUILTUNIX_TMPD)/usr
    4347
    4448# Debug info or not (when ever we feel like passing down such options).
    … …  
    183187        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    184188       
    185 all-banner-builttools-initial:
    186         @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    187         @echo "+ Initializing builttools tree"
    188         @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    189                
    190 all-banner-builttools-stage2:
    191         @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    192         @echo "+ Copying stage2 builttools"
     189all-banner-builtunix-initial:
     190        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
     191        @echo "+ Initializing builtunix tree"
     192        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
     193               
     194all-banner-builtunix-stage2:
     195        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
     196        @echo "+ Copying stage2 builtunix"
    193197        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    194198
    … …  
    389393all-stage1-it: \
    390394                all-banner-stage1 \
    391                 all-builttools-initial \
     395                all-builtunix-initial \
    392396        all-binutils \
    393397                all-gcc \
    … …  
    410414        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    411415        $(MAKE) $(MAKEOPT) -j 1 -f $(MAKEFILE) all-preload-unload
    412         $(MAKE) $(MAKEOPT) -j 1 -f $(MAKEFILE) all-builttools-stage2
     416        $(MAKE) $(MAKEOPT) -j 1 -f $(MAKEFILE) all-builtunix-stage2
    413417        rm -Rf $(PATH_OBJ)/stage1
    414418        mkdir -p $(PATH_OBJ)/stage1
    … …  
    495499                all-env \
    496500                all-sanity \
    497                 all-quick-builttools-initial \
     501                all-quick-builtunix-initial \
    498502                all-versionstamps \
    499503                all-symlinks-unlink \
    … …  
    510514        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    511515       
    512 .PHONY: all-quick-builttools-initial
    513 all-quick-builttools-initial: $(PATH_OBJ)/.quick-builttools-initial
    514 all-quick-builttools-initial-it: \
     516.PHONY: all-quick-builtunix-initial
     517all-quick-builtunix-initial: $(PATH_OBJ)/.quick-builtunix-initial
     518all-quick-builtunix-initial-it: \
    515519                all-preload-unload \
    516                 all-builttools-initial \
     520                all-builtunix-initial \
    517521                all-preload
    518 $(PATH_OBJ)/.quick-builttools-initial:
    519         $(MAKE) $(MAKEOPT) -f $(MAKEFILE) all-quick-builttools-initial-it
     522$(PATH_OBJ)/.quick-builtunix-initial:
     523        $(MAKE) $(MAKEOPT) -f $(MAKEFILE) all-quick-builtunix-initial-it
    520524        touch $@
    521525               
    … …  
    538542                all-sanity \
    539543                all-preload-unload \
    540                 all-double-quick-builttools-initial \
     544                all-double-quick-builtunix-initial \
    541545                all-preload \
    542546                all-versionstamps \
    … …  
    555559        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    556560
    557 .PHONY: all-double-quick-builttools-initial
    558 all-double-quick-builttools-initial: $(PATH_OBJ)/.doublequick-builttools-initial
    559 all-double-quick-builttools-initial-it: \
     561.PHONY: all-double-quick-builtunix-initial
     562all-double-quick-builtunix-initial: $(PATH_OBJ)/.doublequick-builtunix-initial
     563all-double-quick-builtunix-initial-it: \
    560564                all-preload-unload \
    561                 all-builttools-initial \
     565                all-builtunix-initial \
    562566                all-preload
    563 $(PATH_OBJ)/.doublequick-builttools-initial:
    564         $(MAKE) $(MAKEOPT) -f $(MAKEFILE) all-double-quick-builttools-initial-it
     567$(PATH_OBJ)/.doublequick-builtunix-initial:
     568        $(MAKE) $(MAKEOPT) -f $(MAKEFILE) all-double-quick-builtunix-initial-it
    565569        touch $@
    566570       
    … …  
    716720###############################################################################
    717721#
    718 #    B u i l t   T o o l s
    719 #
    720 ###############################################################################
    721 ###############################################################################
    722 ###############################################################################
    723                
    724 all-builttools-initial: \
    725                 all-banner-builttools-initial \
    726                 all-builttools-clean \
    727         all-builttools-dirs \
     722#    B u i l t   U n i x
     723#
     724###############################################################################
     725###############################################################################
     726###############################################################################
     727               
     728all-builtunix-initial: \
     729                all-banner-builtunix-initial \
     730                all-builtunix-clean \
     731        all-builtunix-dirs \
    728732                $(PATH_BUILTTOOLS)/bin/dllar.cmd \
    729733                $(PATH_BUILTTOOLS)/omfhack/ar.exe \
    … …  
    731735                $(PATH_BUILTTOOLS)/omfhack/ranlib.exe
    732736               
    733 all-builttools-clean: \
     737all-builtunix-clean: \
    734738                all-preload-unload
    735         rm -Rf $(PATH_BUILTTOOLS)
    736        
    737 all-builttools-dirs:
     739        rm -Rf $(PATH_BUILTUNIX)
     740       
     741all-builtunix-dirs:
    738742        mkdir -p $(PATH_BUILTTOOLS)/bin $(PATH_BUILTTOOLS)/lib $(PATH_BUILTTOOLS)/include $(PATH_BUILTTOOLS)/omfhack
    739743       
    … …  
    751755        mkdir -p $@
    752756       
    753 all-builttools-stage2: \
    754                 all-banner-builttools-stage2 \
    755                 gcc-builttools-stage2 \
    756                 emx-builttools-stage2 \
    757                 all-builttools-stage2-libs \
     757all-builtunix-stage2: \
     758                all-banner-builtunix-stage2 \
     759                gcc-builtunix-stage2 \
     760                emx-builtunix-stage2 \
     761                all-builtunix-stage2-libs \
    758762                $(PATH_BUILTTOOLS_TMP)/bin/dllar.cmd \
    759763                $(PATH_BUILTTOOLS_TMP)/omfhack \
    … …  
    761765                $(PATH_BUILTTOOLS_TMP)/omfhack/realar.exe \
    762766                $(PATH_BUILTTOOLS_TMP)/omfhack/ranlib.exe \
    763                 all-builttools-clean
    764         mv -f $(PATH_BUILTTOOLS_TMP) $(PATH_BUILTTOOLS)
    765        
    766 all-builttools-stage2-libs:
    767         -for aoutlib in `find $(PATH_BUILTTOOLS_TMP) -name "*.a" | sed -e 's/\.a$$//' `; \
     767                all-builtunix-clean
     768        mv -f $(PATH_BUILTUNIX_TMP) $(PATH_BUILTUNIX)
     769       
     770all-builtunix-stage2-libs:
     771        -for aoutlib in `find $(PATH_BUILTUNIX_TMP) -name "*.a" | sed -e 's/\.a$$//' `; \
    768772        do \
    769773                if [ ! -f $(aoutlib).lib ]; then \
    770774                        echo "  $${aoutlib}"; \
    771                         $(PATH_BUILTTOOLS_TMP)/bin/emxomf.exe -p256 $${aoutlib}.a; \
     775                        $(PATH_BUILTTOOLS_TMP)/bin/emxomf.exe $${aoutlib}.a; \
    772776                fi;\
    773777        done
    … …  
    10881092
    10891093
    1090 # Install to builttools directory.     
     1094# Install to builtunix directory.       
    10911095##     WARNING! Another spec HACK!
    1092 gcc-builttools-stage2:
     1096gcc-builtunix-stage2:
    10931097        $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/gcc prefix=$(PATH_BUILTTOOLS_TMPD) install
    10941098##      cp $(PATH_TOP)/src/emx/src/lib/libc.specs $(PATH_OBJ)/gcc/gcc/specs
    … …  
    11011105       
    11021106gcc-quick-installstage:
    1103         rm -Rf $(PATH_BUILTTOOLS_TMP)
     1107        rm -Rf $(PATH_BUILTUNIX_TMP)
    11041108        $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/gcc prefix=$(PATH_BUILTTOOLS_TMPD) install
    1105         cp -Rf $(PATH_BUILTTOOLS_TMP)/* $(PATH_BUILTTOOLS)/
    1106         rm -Rf $(PATH_BUILTTOOLS_TMP)
     1109        cp -Rf $(PATH_BUILTUNIX_TMP)/* $(PATH_BUILTUNIX)/
     1110        rm -Rf $(PATH_BUILTUNIX_TMP)
    11071111
    11081112               
    … …  
    13111315
    13121316binutils-quick-installstage:
    1313         rm -Rf $(PATH_BUILTTOOLS_TMP)
     1317        rm -Rf $(PATH_BUILTUNIX_TMP)
    13141318        if test -f $(PATH_BUILTTOOLS_TMP)/bin/ld.exe; then cp -f $(PATH_BUILTTOOLS_TMP)/bin/ld.exe                       $(PATH_BUILTTOOLS_TMP)/bin/ld-saved.exe; fi
    13151319        if test -f $(PATH_BUILTTOOLS_TMP)/i386-pc-os2-emx/bin/ld.exe; then cp -f $(PATH_BUILTTOOLS_TMP)/i386-pc-os2-emx/bin/ld.exe       $(PATH_BUILTTOOLS_TMP)/i386-pc-os2-emx/bin/ld-saved.exe; fi
    … …  
    13191323        if test -f $(PATH_BUILTTOOLS_TMP)/bin/ld-saved.exe; then mv -f $(PATH_BUILTTOOLS_TMP)/bin/ld-saved.exe                 $(PATH_BUILTTOOLS_TMP)/bin/ld.exe; fi
    13201324        if test -f $(PATH_BUILTTOOLS_TMP)/i386-pc-os2-emx/bin/ld-saved.exe; then mv -f $(PATH_BUILTTOOLS_TMP)/i386-pc-os2-emx/bin/ld-saved.exe $(PATH_BUILTTOOLS_TMP)/i386-pc-os2-emx/bin/ld.exe; fi
    1321         cp -Rf $(PATH_BUILTTOOLS_TMP)/* $(PATH_BUILTTOOLS)/
    1322         rm -Rf $(PATH_BUILTTOOLS_TMP)
     1325        cp -Rf $(PATH_BUILTUNIX_TMP)/* $(PATH_BUILTUNIX)/
     1326        rm -Rf $(PATH_BUILTUNIX_TMP)
    13231327
    13241328                                       
    … …  
    13821386        @echo "Version stamping EMX... nothing to do"
    13831387                                                                       
    1384 # Install the compiled emx stuff to builttools.
    1385 emx-builttools-stage2:
     1388# Install the compiled emx stuff to builtunix.
     1389emx-builtunix-stage2:
    13861390        $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) INS=$(PATH_BUILTTOOLS_TMP)/  install
    13871391
Note: See TracChangeset for help on using the changeset viewer.