Changeset 9174 for trunk/make


Ignore:
Timestamp:
Aug 30, 2002, 8:27:28 PM (23 years ago)
Author:
bird
Message:

Fixing and restructuring.

Location:
trunk/make
Files:
4 added
12 deleted
20 edited

Legend:

Unmodified
Added
Removed
  • trunk/make/setup.mak

    r9165 r9174  
    1 # $Id: setup.mak,v 1.16 2002-08-29 10:01:40 bird Exp $
     1# $Id: setup.mak,v 1.17 2002-08-30 18:27:21 bird Exp $
    22
    33#
     
    223223# shell environment.
    224224# TODO   Should these be overridable by setup.[w]xyz.mak ? (kso)
    225 BUILD_ENVS_BASE_POST    = toolkit40
     225BUILD_ENVS_BASE_POST    = toolkit452
    226226BUILD_ENVS_BASE_POST_16 =
    227227BUILD_ENVS_BASE_PRE     = buildsetup emx cvs
    228 BUILD_ENVS_BASE_PRE_16  = buildsetup emx cvs toolkit40 ddkbase
     228BUILD_ENVS_BASE_PRE_16  = buildsetup emx cvs toolkit452 ddkbase
    229229
    230230
  • trunk/make/setup.os2as.mk

    r9165 r9174  
    1 # $Id: setup.os2as.mk,v 1.1 2002-08-29 10:01:41 bird Exp $
     1# $Id: setup.os2as.mk,v 1.2 2002-08-30 18:27:22 bird Exp $
    22
    33#
     
    66!ifdef AS_USE_MASM5
    77# Alternate assembler: MASM v5.10
    8 ! include $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)$(SHT_BLDMD)masm510.mk
     8! include $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)allmasm510.mk
    99!else
    1010# Default assembler:   ALP
    11 ! include $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)$(SHT_BLDMD)alp.mk
     11! include $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)allalp.mk
    1212!endif
    1313
  • trunk/make/setup.os2debemx.mk

    r9165 r9174  
    1 # $Id: setup.os2debemx.mk,v 1.10 2002-08-29 10:01:42 bird Exp $
     1# $Id: setup.os2debemx.mk,v 1.11 2002-08-30 18:27:23 bird Exp $
    22
    33# ---OS2, DEBUG, EMX----------------------------
     
    2424#
    2525!include $(PATH_MAKE)\setup.os2as.mk
    26 !include $(PATH_MAKE)\setup.os2debrc.mk
    27 !include $(PATH_MAKE)\setup.os2debwrc.mk
     26!include $(PATH_MAKE)\setup.os2allrc.mk
     27!include $(PATH_MAKE)\setup.os2allwrc.mk
    2828_LD_LAST_LIB = end.$(EXT_LIB)
    2929!include $(PATH_MAKE)\setup.os2ld.mk
  • trunk/make/setup.os2debmscv6-16.mk

    r9165 r9174  
    1 # $Id: setup.os2debmscv6-16.mk,v 1.12 2002-08-29 10:01:42 bird Exp $
     1# $Id: setup.os2debmscv6-16.mk,v 1.13 2002-08-30 18:27:23 bird Exp $
    22
    33# ---OS2, DEBUG, MSCV6-------------------------
     
    1717#
    1818!include $(PATH_MAKE)\setup.os2as.mk
    19 !include $(PATH_MAKE)\setup.os2prfrc.mk
    20 !include $(PATH_MAKE)\setup.os2prfwrc.mk
     19!include $(PATH_MAKE)\setup.os2allrc.mk
     20!include $(PATH_MAKE)\setup.os2allwrc.mk
    2121!include $(PATH_MAKE)\setup.os2ld.mk
    2222!include $(PATH_MAKE)\setup.os2ar.mk
  • trunk/make/setup.os2debmscv6.mk

    r9165 r9174  
    1 # $Id: setup.os2debmscv6.mk,v 1.15 2002-08-29 10:01:42 bird Exp $
     1# $Id: setup.os2debmscv6.mk,v 1.16 2002-08-30 18:27:23 bird Exp $
    22
    33# ---OS2, DEBUG, MSCV6-------------------------
     
    1616#
    1717!include $(PATH_MAKE)\setup.os2as.mk
    18 !include $(PATH_MAKE)\setup.os2debrc.mk
    19 !include $(PATH_MAKE)\setup.os2debwrc.mk
     18!include $(PATH_MAKE)\setup.os2allrc.mk
     19!include $(PATH_MAKE)\setup.os2allwrc.mk
    2020!include $(PATH_MAKE)\setup.os2ld.mk
    2121!include $(PATH_MAKE)\setup.os2ar.mk
  • trunk/make/setup.os2debvac308.mk

    r9165 r9174  
    1 # $Id: setup.os2debvac308.mk,v 1.19 2002-08-29 10:01:43 bird Exp $
     1# $Id: setup.os2debvac308.mk,v 1.20 2002-08-30 18:27:24 bird Exp $
    22
    33# ---OS2, DEBUG, VAC308-------------------------
     
    1616#
    1717!include $(PATH_MAKE)\setup.os2as.mk
    18 !include $(PATH_MAKE)\setup.os2debrc.mk
    19 !include $(PATH_MAKE)\setup.os2debwrc.mk
     18!include $(PATH_MAKE)\setup.os2allrc.mk
     19!include $(PATH_MAKE)\setup.os2allwrc.mk
    2020!include $(PATH_MAKE)\setup.os2ld.mk
    2121!include $(PATH_MAKE)\setup.os2ar.mk
  • trunk/make/setup.os2debvac365.mk

    r9165 r9174  
    1 # $Id: setup.os2debvac365.mk,v 1.18 2002-08-29 10:01:43 bird Exp $
     1# $Id: setup.os2debvac365.mk,v 1.19 2002-08-30 18:27:24 bird Exp $
    22
    33# ---OS2, DEBUG, VAC365-------------------------
     
    1616#
    1717!include $(PATH_MAKE)\setup.os2as.mk
    18 !include $(PATH_MAKE)\setup.os2prfrc.mk
    19 !include $(PATH_MAKE)\setup.os2prfwrc.mk
     18!include $(PATH_MAKE)\setup.os2allrc.mk
     19!include $(PATH_MAKE)\setup.os2allwrc.mk
    2020!include $(PATH_MAKE)\setup.os2ld.mk
    2121_AR_NOFREE      = 1
  • trunk/make/setup.os2debwat11-16.mk

    r9169 r9174  
    1 # $Id: setup.os2debwat11-16.mk,v 1.16 2002-08-29 12:06:17 bird Exp $
     1# $Id: setup.os2debwat11-16.mk,v 1.17 2002-08-30 18:27:24 bird Exp $
    22
    33# ---OS2, DEBUG, WAT11-------------------------
     
    1717AS_DEBUG_TYPE   = Codeview
    1818!include $(PATH_MAKE)\setup.os2as.mk
    19 !include $(PATH_MAKE)\setup.os2debrc.mk
    20 !include $(PATH_MAKE)\setup.os2debwrc.mk
     19!include $(PATH_MAKE)\setup.os2allrc.mk
     20!include $(PATH_MAKE)\setup.os2allwrc.mk
    2121LD_OLDCPP       = 1
    2222_LD_LIBPATH     = $(PATH_WATCOM)\lib286\os2;$(PATH_WATCOM)\lib286;
  • trunk/make/setup.os2debwat11.mk

    r9169 r9174  
    1 # $Id: setup.os2debwat11.mk,v 1.18 2002-08-29 12:06:18 bird Exp $
     1# $Id: setup.os2debwat11.mk,v 1.19 2002-08-30 18:27:24 bird Exp $
    22
    33# ---OS2, DEBUG, WAT11-------------------------
     
    1717AS_DEBUG_TYPE   = Codeview
    1818!include $(PATH_MAKE)\setup.os2as.mk
    19 !include $(PATH_MAKE)\setup.os2debrc.mk
    20 !include $(PATH_MAKE)\setup.os2debwrc.mk
     19!include $(PATH_MAKE)\setup.os2allrc.mk
     20!include $(PATH_MAKE)\setup.os2allwrc.mk
    2121_LD_LIBPATH     = $(PATH_WATCOM)\lib386\os2;$(PATH_WATCOM)\lib386;
    2222LD_OLDCPP       = 1
  • trunk/make/setup.os2prfemx.mk

    r9165 r9174  
    1 # $Id: setup.os2prfemx.mk,v 1.10 2002-08-29 10:01:44 bird Exp $
     1# $Id: setup.os2prfemx.mk,v 1.11 2002-08-30 18:27:25 bird Exp $
    22
    33# ---OS2, PROFILE, EMX----------------------------
     
    2424#
    2525!include $(PATH_MAKE)\setup.os2as.mk
    26 !include $(PATH_MAKE)\setup.os2prfrc.mk
    27 !include $(PATH_MAKE)\setup.os2prfwrc.mk
     26!include $(PATH_MAKE)\setup.os2allrc.mk
     27!include $(PATH_MAKE)\setup.os2allwrc.mk
    2828_LD_LAST_LIB = end.$(EXT_LIB)
    2929!include $(PATH_MAKE)\setup.os2ld.mk
  • trunk/make/setup.os2prfvac308.mk

    r9165 r9174  
    1 # $Id: setup.os2prfvac308.mk,v 1.18 2002-08-29 10:01:44 bird Exp $
     1# $Id: setup.os2prfvac308.mk,v 1.19 2002-08-30 18:27:25 bird Exp $
    22
    33# ---OS2, PROFILE, VAC308-------------------------
     
    1616#
    1717!include $(PATH_MAKE)\setup.os2as.mk
    18 !include $(PATH_MAKE)\setup.os2prfrc.mk
    19 !include $(PATH_MAKE)\setup.os2prfwrc.mk
     18!include $(PATH_MAKE)\setup.os2allrc.mk
     19!include $(PATH_MAKE)\setup.os2allwrc.mk
    2020!include $(PATH_MAKE)\setup.os2ld.mk
    2121!include $(PATH_MAKE)\setup.os2ar.mk
  • trunk/make/setup.os2prfvac365.mk

    r9165 r9174  
    1 # $Id: setup.os2prfvac365.mk,v 1.18 2002-08-29 10:01:44 bird Exp $
     1# $Id: setup.os2prfvac365.mk,v 1.19 2002-08-30 18:27:26 bird Exp $
    22
    33# ---OS2, PROFILE, VAC365-------------------------
     
    1616#
    1717!include $(PATH_MAKE)\setup.os2as.mk
    18 !include $(PATH_MAKE)\setup.os2prfrc.mk
    19 !include $(PATH_MAKE)\setup.os2prfwrc.mk
     18!include $(PATH_MAKE)\setup.os2allrc.mk
     19!include $(PATH_MAKE)\setup.os2allwrc.mk
    2020!include $(PATH_MAKE)\setup.os2ld.mk
    2121_AR_NOFREE      = 1
  • trunk/make/setup.os2relemx.mk

    r9165 r9174  
    1 # $Id: setup.os2relemx.mk,v 1.10 2002-08-29 10:01:45 bird Exp $
     1# $Id: setup.os2relemx.mk,v 1.11 2002-08-30 18:27:26 bird Exp $
    22
    33# ---OS2, DEBUG, EMX----------------------------
     
    2424#
    2525!include $(PATH_MAKE)\setup.os2as.mk
    26 !include $(PATH_MAKE)\setup.os2relrc.mk
    27 !include $(PATH_MAKE)\setup.os2relwrc.mk
     26!include $(PATH_MAKE)\setup.os2allrc.mk
     27!include $(PATH_MAKE)\setup.os2allwrc.mk
    2828_LD_LAST_LIB = end.$(EXT_LIB)
    2929!include $(PATH_MAKE)\setup.os2ld.mk
  • trunk/make/setup.os2relmscv6-16.mk

    r9165 r9174  
    1 # $Id: setup.os2relmscv6-16.mk,v 1.12 2002-08-29 10:01:45 bird Exp $
     1# $Id: setup.os2relmscv6-16.mk,v 1.13 2002-08-30 18:27:27 bird Exp $
    22
    33# ---OS2, RELEASE, MSCV6-------------------------
     
    1616#
    1717!include $(PATH_MAKE)\setup.os2as.mk
    18 !include $(PATH_MAKE)\setup.os2relrc.mk
    19 !include $(PATH_MAKE)\setup.os2relwrc.mk
     18!include $(PATH_MAKE)\setup.os2allrc.mk
     19!include $(PATH_MAKE)\setup.os2allwrc.mk
    2020!include $(PATH_MAKE)\setup.os2ld.mk
    2121!include $(PATH_MAKE)\setup.os2ar.mk
  • trunk/make/setup.os2relmscv6.mk

    r9165 r9174  
    1 # $Id: setup.os2relmscv6.mk,v 1.15 2002-08-29 10:01:45 bird Exp $
     1# $Id: setup.os2relmscv6.mk,v 1.16 2002-08-30 18:27:27 bird Exp $
    22
    33# ---OS2, RELEASE, MSCV6-------------------------
     
    1616#
    1717!include $(PATH_MAKE)\setup.os2as.mk
    18 !include $(PATH_MAKE)\setup.os2relrc.mk
    19 !include $(PATH_MAKE)\setup.os2relwrc.mk
     18!include $(PATH_MAKE)\setup.os2allrc.mk
     19!include $(PATH_MAKE)\setup.os2allwrc.mk
    2020!include $(PATH_MAKE)\setup.os2ld.mk
    2121!include $(PATH_MAKE)\setup.os2ar.mk
  • trunk/make/setup.os2relvac308.mk

    r9165 r9174  
    1 # $Id: setup.os2relvac308.mk,v 1.18 2002-08-29 10:01:46 bird Exp $
     1# $Id: setup.os2relvac308.mk,v 1.19 2002-08-30 18:27:27 bird Exp $
    22
    33# ---OS2, RELEASE, VAC308-------------------------
     
    1616#
    1717!include $(PATH_MAKE)\setup.os2as.mk
    18 !include $(PATH_MAKE)\setup.os2relrc.mk
    19 !include $(PATH_MAKE)\setup.os2relwrc.mk
     18!include $(PATH_MAKE)\setup.os2allrc.mk
     19!include $(PATH_MAKE)\setup.os2allwrc.mk
    2020!include $(PATH_MAKE)\setup.os2ld.mk
    2121!include $(PATH_MAKE)\setup.os2ar.mk
  • trunk/make/setup.os2relvac365.mk

    r9165 r9174  
    1 # $Id: setup.os2relvac365.mk,v 1.18 2002-08-29 10:01:46 bird Exp $
     1# $Id: setup.os2relvac365.mk,v 1.19 2002-08-30 18:27:27 bird Exp $
    22
    33# ---OS2, RELEASE, VAC365-------------------------
     
    1616#
    1717!include $(PATH_MAKE)\setup.os2as.mk
    18 !include $(PATH_MAKE)\setup.os2relrc.mk
    19 !include $(PATH_MAKE)\setup.os2relwrc.mk
     18!include $(PATH_MAKE)\setup.os2allrc.mk
     19!include $(PATH_MAKE)\setup.os2allwrc.mk
    2020!include $(PATH_MAKE)\setup.os2ld.mk
    2121_AR_NOFREE      = 1
  • trunk/make/setup.os2relwat11-16.mk

    r9165 r9174  
    1 # $Id: setup.os2relwat11-16.mk,v 1.13 2002-08-29 10:01:46 bird Exp $
     1# $Id: setup.os2relwat11-16.mk,v 1.14 2002-08-30 18:27:28 bird Exp $
    22
    33#
     
    2424AS_DEBUG_TYPE   = Codeview
    2525!include $(PATH_MAKE)\setup.os2as.mk
    26 !include $(PATH_MAKE)\setup.os2relrc.mk
    27 !include $(PATH_MAKE)\setup.os2relwrc.mk
     26!include $(PATH_MAKE)\setup.os2allrc.mk
     27!include $(PATH_MAKE)\setup.os2allwrc.mk
    2828_LD_LIBPATH     = $(PATH_WATCOM)\lib286\os2;$(PATH_WATCOM)\lib286;
    2929LD_OLDCPP       = 1
  • trunk/make/setup.os2relwat11.mk

    r9169 r9174  
    1 # $Id: setup.os2relwat11.mk,v 1.11 2002-08-29 12:06:18 bird Exp $
     1# $Id: setup.os2relwat11.mk,v 1.12 2002-08-30 18:27:28 bird Exp $
    22
    33#
     
    2424AS_DEBUG_TYPE   = Codeview
    2525!include $(PATH_MAKE)\setup.os2as.mk
    26 !include $(PATH_MAKE)\setup.os2relrc.mk
    27 !include $(PATH_MAKE)\setup.os2relwrc.mk
     26!include $(PATH_MAKE)\setup.os2allrc.mk
     27!include $(PATH_MAKE)\setup.os2allwrc.mk
    2828LD_OLDCPP       = 1
    2929_LD_LIBPATH     = $(PATH_WATCOM)\lib386\os2;$(PATH_WATCOM)\lib386;
  • trunk/make/setup.win32debwat11.mk

    r9169 r9174  
    1 # $Id: setup.win32debwat11.mk,v 1.11 2002-08-29 12:06:19 bird Exp $
     1# $Id: setup.win32debwat11.mk,v 1.12 2002-08-30 18:27:28 bird Exp $
    22
    33# ---WIN32, DEBUG, WAT11-------------------------
     
    1515#
    1616AS_DEBUG_TYPE = Codeview
    17 !include $(PATH_MAKE)\setup.os2debalp.mk
    18 !include $(PATH_MAKE)\setup.os2debrc.mk
    19 !include $(PATH_MAKE)\setup.os2debwrc.mk
     17!include $(PATH_MAKE)\setup.os2as.mk
     18!include $(PATH_MAKE)\setup.os2allrc.mk
     19!include $(PATH_MAKE)\setup.os2allwrc.mk
    2020!ifdef LD_USE_ILINK
    2121! error error: LD_USE_ILINK isn't supported by the win32 watcom setup.
     
    3434CC=wcc386.exe
    3535CXX=wpp386.exe
    36 LINK=wlink.exe
    3736IMPLIB=implib.exe
    3837
Note: See TracChangeset for help on using the changeset viewer.