Changeset 2448 for trunk/Makefile


Ignore:
Timestamp:
Nov 15, 2005, 4:40:28 AM (20 years ago)
Author:
bird
Message:

serious restructuring in progress.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile

    r2447 r2448  
    742742        mkdir -p $(PATH_BUILTTOOLS)/bin $(PATH_BUILTTOOLS)/lib $(PATH_BUILTTOOLS)/include $(PATH_BUILTTOOLS)/omfhack
    743743       
    744 $(PATH_BUILTTOOLS)/bin/dllar.cmd $(PATH_BUILTTOOLS_TMP)/bin/dllar.cmd: $(PATH_TOP)/src/misc/dllar.cmd
    745         cp $< $@
    746744$(PATH_BUILTTOOLS)/omfhack/ranlib.exe $(PATH_BUILTTOOLS_TMP)/omfhack/ranlib.exe: $(PATH_TOP)/tools/bin/true.exe
    747745        cp $< $@
    … …  
    997995        for dir in $(GCC_CONFIGURE_DIRS); do \
    998996                echo $$dir; \
    999                 if $(MAKE) $(MAKEOPT) -j 1 $(@:gcc-autoconf-%=%) -f $(PWD)/config.gmk -C src/$$dir ; then \
     997                if $(MAKE) $(MAKEOPT) -j 1 $(@:gcc-autoconf-%=%) -f $(PWD)/config.gmk -C $$dir ; then \
    1000998                        true; \
    1001999                else \
    … …  
    10131011# let the build/bootstrap create the gcc import .def file before kicking off a build.
    10141012gcc-bootstrap gcc-build: gcc/gcc/config/i386/emx-libgcc_so_d.def
    1015 gcc/gcc/config/i386/emx-libgcc_so_d.def: libc/src/lib/libgcc_d.awk $(PATH_OBJD)/emx/omf/libc.def libc/src/lib/libc.def
    1016         $(GAWK) -f libc/src/lib/libgcc_d.awk $(filter %.def,$^) > $@
     1013gcc/gcc/config/i386/emx-libgcc_so_d.def: libc/src/libc/libgcc_d.awk $(PATH_OBJD)/libc/omf/libc.def libc/src/libc/libc.def
     1014        $(GAWK) -f libc/src/libc/libgcc_d.awk $(filter %.def,$^) > $@
    10171015
    10181016
    … …  
    10231021# For the 2nd stage we need a hack for using the right specs when linking...
    10241022#SPEC_HACK = $(if $(wildchar $(PATH_OBJ)/.all-stage1),\
    1025 #              -specs $(PATH_TOP)/libc/src/lib/libc.specs, \
     1023#              -specs $(PATH_TOP)/libc/src/libc/libc.specs, \
    10261024#              -specs $(PATH_TOP)/tools/x86.os2/gcc/staged/lib/gcc-lib/i386-pc-os2-emx/$(GCC_VERSION)/specs)
    10271025SPECS_HACK =
    … …  
    10961094gcc-builtunix-stage2:
    10971095        $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/gcc prefix=$(PATH_BUILTTOOLS_TMPD) install
    1098 ##      cp $(PATH_TOP)/libc/src/lib/libc.specs $(PATH_OBJ)/gcc/gcc/specs
     1096##      cp $(PATH_TOP)/libc/src/libc/libc.specs $(PATH_OBJ)/gcc/gcc/specs
    10991097
    11001098
    … …  
    11661164endif
    11671165        for dir in $(BINUTILS_CONFIGURE_DIRS); do \
    1168                 if $(MAKE) $(MAKEOPT) -j 1 $(@:binutils-autoconf-%=%) -f $(PWD)/config.gmk -C src/$$dir ; then \
     1166                if $(MAKE) $(MAKEOPT) -j 1 $(@:binutils-autoconf-%=%) -f $(PWD)/config.gmk -C $$dir ; then \
    11691167                        true; \
    11701168                else \
    … …  
    13721370emx-build emx-install:
    13731371        mkdir -p $(PATH_OBJ)/emx
    1374         $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/emx -f $(MAKEFILE) $@-it
     1372        $(MAKE) $(MAKEOPT) -f $(PATH_TOP)/emx/Makefile.gmk -C $(PATH_TOP)/emx -f $(MAKEFILE) $@-it
    13751373
    13761374emx-build-it:
    1377         $(MAKE) $(MAKEOPT) -j 1 -C $(PATH_TOP)/emx $(EMX_DEFINES) tools
    1378         $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/emx $(EMX_DEFINES) all
     1375        $(MAKE) $(MAKEOPT) -j 1 -f $(PATH_TOP)/emx/Makefile.gmk -C $(PATH_TOP)/emx $(EMX_DEFINES) tools
     1376        $(MAKE) $(MAKEOPT) -f $(PATH_TOP)/emx/Makefile.gmk -C $(PATH_TOP)/emx $(EMX_DEFINES) all
    13791377
    13801378emx-install-it:
    1381         $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/emx $(EMX_DEFINES) INS=$(ALL_PREFIX)/ install
     1379        $(MAKE) $(MAKEOPT) -f $(PATH_TOP)/emx/Makefile.gmk -C $(PATH_TOP)/emx $(EMX_DEFINES) INS=$(ALL_PREFIX)/ install
    13821380
    13831381                                       
    … …  
    13881386# Install the compiled emx stuff to builtunix.
    13891387emx-builtunix-stage2:
    1390         $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/emx $(EMX_DEFINES) INS=$(PATH_BUILTTOOLS_TMP)/  install
     1388        $(MAKE) $(MAKEOPT)-f $(PATH_TOP)/emx/Makefile.gmk -C $(PATH_TOP)/emx $(EMX_DEFINES) INS=$(PATH_BUILTTOOLS_TMP)/  install
    13911389
    13921390# Quick bootstrap workers.                     
    13931391emx-quick:
    1394         GCCLOAD=3 $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/emx $(EMX_DEFINES) all
     1392        GCCLOAD=3 $(MAKE) $(MAKEOPT) -f $(PATH_TOP)/emx/Makefile.gmk -C $(PATH_TOP)/emx $(EMX_DEFINES) all
    13951393                       
    13961394emx-quick-install:
    1397         $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/emx $(EMX_DEFINES) INS=$(PATH_BUILTTOOLS)/ install
     1395        $(MAKE) $(MAKEOPT)-f $(PATH_TOP)/emx/Makefile.gmk -C $(PATH_TOP)/emx $(EMX_DEFINES) INS=$(PATH_BUILTTOOLS)/ install
    13981396                               
    13991397
    … …  
    14411439
    14421440libc-build-it:
    1443         $(MAKE) $(MAKEOPT) -j 1 -C $(PATH_TOP)/libc $(LIBC_DEFINES) tools
    1444         $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/libc $(LIBC_DEFINES) all
     1441        $(MAKE) $(MAKEOPT) -j 1 -f $(PATH_TOP)/libc/Makefile.gmk -C $(PATH_TOP)/libc $(LIBC_DEFINES) tools
     1442        $(MAKE) $(MAKEOPT) -f $(PATH_TOP)/libc/Makefile.gmk -C $(PATH_TOP)/libc $(LIBC_DEFINES) all
    14451443
    14461444libc-install-it:
    1447         $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/libc $(LIBC_DEFINES) INS=$(ALL_PREFIX)/ install
     1445        $(MAKE) $(MAKEOPT) -f $(PATH_TOP)/libc/Makefile.gmk -C $(PATH_TOP)/libc $(LIBC_DEFINES) INS=$(ALL_PREFIX)/ install
    14481446
    14491447                                       
    … …  
    14541452# Install the compiled libc stuff to builtunix.
    14551453libc-builtunix-stage2:
    1456         $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/libc $(LIBC_DEFINES) INS=$(PATH_BUILTTOOLS_TMP)/  install
     1454        $(MAKE) $(MAKEOPT) -f $(PATH_TOP)/libc/Makefile.gmk -C $(PATH_TOP)/libc $(LIBC_DEFINES) INS=$(PATH_BUILTTOOLS_TMP)/  install
    14571455
    14581456# Quick bootstrap workers.                     
    14591457libc-quick:
    1460         GCCLOAD=3 $(MAKE) $(MAKEOPT) -f $(PATH_TOP)/libc/libonly.gmk -C $(PATH_TOP)/libc $(LIBC_DEFINES) all
     1458        GCCLOAD=3 $(MAKE) $(MAKEOPT) -f $(PATH_TOP)/libc/Makefile.gmk -C $(PATH_TOP)/libc $(LIBC_DEFINES) all
    14611459
    14621460libc-quick-install:
    1463         $(MAKE) $(MAKEOPT) -f $(PATH_TOP)/libc/libonly.gmk -C $(PATH_TOP)/libc $(LIBC_DEFINES) INS=$(PATH_BUILTTOOLS)/ install
     1461        $(MAKE) $(MAKEOPT) -f $(PATH_TOP)/libc/Makefile.gmk -C $(PATH_TOP)/libc $(LIBC_DEFINES) INS=$(PATH_BUILTTOOLS)/ install
    14641462               
    14651463                               
    … …  
    15721570        cp $(PATH_TOP)/doc/COPYING.LIB              $(ALL_PREFIX)/doc/GCC-$(GCC_VERSION)
    15731571        cp $(PATH_TOP)/doc/COPYING                  $(ALL_PREFIX)/doc/GCC-$(GCC_VERSION)
    1574 #       cp $(PATH_TOP)/ChangeLog                    $(ALL_PREFIX)/doc/GCC-$(GCC_VERSION)/ChangeLog.os2
    15751572        cp $(PATH_TOP)/libc/ChangeLog.LIBC          $(ALL_PREFIX)/doc/GCC-$(GCC_VERSION)
    1576         cp $(PATH_TOP)/src/misc/MakeOmfLibs.cmd     $(ALL_PREFIX)/lib
    1577         cp $(PATH_TOP)/src/misc/dllar.cmd           $(ALL_PREFIX)/bin
    1578         cp $(PATH_TOP)/src/misc/gccenv.cmd          $(ALL_PREFIX)/bin
     1573        cp $(PATH_TOP)/emx/ChangeLog.emx            $(ALL_PREFIX)/doc/GCC-$(GCC_VERSION)
    15791574                       
    15801575
Note: See TracChangeset for help on using the changeset viewer.