Ticket #379: makefilepatches-20090507-1403.diff

File makefilepatches-20090507-1403.diff, 19.1 KB (added by stevenhl, 6 years ago)

Build to separate retail and debug directories

  • header.mak

     
    2323!         if "$(BLD_TYPE)"!="debugsrc"
    2424!         error Unsupported build type!  We only differentiate between retail and debug
    2525!         else
     26# BLD_TYPE == debugsrc (internal debug logic and source debugging)
    2627# _ACPI_DEBUG - Turn on output to comport
    2728# ACPI_DEBUG  - Turn on output Intel ACPI CA message
    2829DBG_CFLAGS= /Ti+  /DACPI_DEBUG /DACPI_FULL_DEBUG
     
    3233DBG_LFLAGS= /de
    3334!         endif
    3435!      else
     36# BLD_TYPE == debug (internal debug logic only)
    3537DBG_CFLAGS=  /DACPI_DEBUG /DACPI_FULL_DEBUG
    3638DBG_AFLAGS=
    3739LFLAGS = /map /nod /exepack
     
    3941DBG_LFLAGS= /de
    4042!      endif
    4143!   else
     44# BLD_TYPE == retail
    4245DBG_CFLAGS=
    4346DBG_AFLAGS=
    4447LFLAGS = /map /nod /exepack
    4548!   endif
     49!else
     50!         error BLD_TYPE must be defined
    4651!endif
    4752
    4853DBG_C16FLAGS=
     
    6671LEX          =  flex
    6772LEXFLAGS     = -i
    6873
    69 
    7074#
    7175# Assembler - ALP
    7276#
     
    7478#AINC = -I:$(SBASE)\$(SUBSYS_RELATIVE)\..\include -I:$(R_OS2_HDR)\inc -I:$(SBASE)\common\include
    7579AS          = alp
    7680
    77 
    7881#
    7982# Linker - ilink from VAC 3.6.5
    8083#
    8184LINK        = ilink /nofree
    8285#LINK        = link386
    8386
    84 
    8587#
    8688# Librarian - ilib from VAC 3.6.5
    8789#
    8890LIBUTIL     = ilib
    8991
    90 
    9192#
    9293# Import Librarian - implib from VAC 3.6.5
    9394#
    9495IMPLIB      = implib
    9596
    96 
    9797#
    9898# Object directory
    9999#
     100!ifdef SUBSYS
    100101OBASE       = $(ROOT)\obj\$(SUBSYS)
    101 O           = $(OBASE)\$(SUBSYS_RELATIVE)
     102O           = $(OBASE)\$(SUBSYS_RELATIVE)\$(BLD_TYPE)
     103!endif
    102104
    103 
    104105#
    105 # Div stubs
     106# Imported libraries
    106107#
    107108R_OS2_LIB   = $(ROOT)\lib
    108109
     110#
     111# Generated libraries
     112#
     113ACPILIBDIR   = $(ROOT)\lib\$(BLD_TYPE)
    109114
    110115#
    111116# Output paths. (OS2 system tree root dir is '$(ROOT)\bin')
    112117#
    113 OS2         = $(ROOT)\bin\os2
    114 DLL         = $(OS2)\dll
     118OS2         = $(ROOT)\bin\os2\$(BLD_TYPE)
     119# DLL         = $(OS2)\dll
    115120
    116 
    117121#
    118122# Create-path tool.
    119123#
    120124CREATE_PATH = $(ROOT)\createpath.cmd $(@D)
    121125
    122 
    123126#
    124127# Create object path.
    125128#
     129!ifdef O
    126130!if [$(ROOT)\createpath.cmd $(O)]
    127131!endif
    128 
     132!endif
  • src/acpi/test/makefile

     
    147147LIBDDE  = cpprss36.lib libcssi.lib
    148148KEELIB  = $(R_OS2_LIB)\kee.lib
    149149FSHELP  = $(R_OS2_LIB)\fshelper.lib
    150 ACPILIB = $(R_OS2_LIB)\acpi.lib
     150ACPILIB = $(ACPILIBDIR)\acpi.lib
    151151LIBS    = $(LIB386) $(ACPILIB) $(LIBDDE)
    152152# $(LIBP)
    153153# $(LIBDDE)
  • src/acpi/vpic/makefile

     
    190190LIBDDE  = cpprns36.lib
    191191KEELIB  = $(R_OS2_LIB)\kee.lib
    192192FSHELP  = $(R_OS2_LIB)\fshelper.lib
    193 ACPIDEV = $(R_OS2_LIB)\AcpiDrv.lib
    194 LIBS    = dhcalls.lib vdh.lib $(KEELIB) $(LIBP) $(ACPIDEV)
     193ACPIDRVLIB = $(ACPILIBDIR)\AcpiDrv.lib
     194LIBS    = dhcalls.lib vdh.lib $(KEELIB) $(LIBP) $(ACPIDRVLIB)
    195195# $(LIBDDE)
    196196
    197197OBJASM = $(O)\start.obj
  • src/acpi/DrvLib/makefile

     
    150150
    151151LIBS    =  libconv.lib+cpprss36.lib+os2386.lib
    152152
    153 OBJS = $(OBASE)\DrvLib\acpi.obj $(OBASE)\DrvLib\FindAddress.obj $(OBASE)\DrvLib\misc.obj $(OBASE)\DrvLib\debug.obj
     153OBJS = $(O)\acpi.obj $(O)\FindAddress.obj $(O)\misc.obj $(O)\debug.obj
    154154
    155155#--------------------------------------------------------------------------
    156156# The all target is used to specify a list of targets that need to be built
     
    159159# Please look at the example for more details.
    160160#-------------------------------------------------------------------------
    161161
    162 all: $(R_OS2_LIB)\AcpiDrv.lib
     162all: $(ACPILIBDIR)\AcpiDrv.lib
    163163
    164 $(R_OS2_LIB)\AcpiDrv.lib: makefile $(OBJS)
    165         if exist $(R_OS2_LIB)\$(@B).lib del $(R_OS2_LIB)\$(@B).lib
     164$(ACPILIBDIR)\AcpiDrv.lib: makefile $(OBJS)
     165        if exist $(ACPILIBDIR)\$(@B).lib del $(ACPILIBDIR)\$(@B).lib
    166166        $(CREATE_PATH)
    167167        -4$(LIBUTIL) /NOFREE @<<$(O)\$(@B).def
    168 $(R_OS2_LIB)\$(@B).lib
     168$(ACPILIBDIR)\$(@B).lib
    169169y
    170170$(OBJS: =&^
    171171)
     
    178178# Include Footer.mak at this point.
    179179#***************************************************************************
    180180
    181 
    182 
    183 
    184181!include $(ROOT)\footer.mak
  • src/acpi/Daemon/makefile

     
    160160LIBDDE  = cpprss36.lib libcssi.lib
    161161KEELIB  = $(R_OS2_LIB)\kee.lib
    162162FSHELP  = $(R_OS2_LIB)\fshelper.lib
    163 ACPILIB = $(R_OS2_LIB)\acpi32.lib
     163ACPILIB = $(ACPILIBDIR)\acpi32.lib
    164164# $(R_OS2_LIB)\videopmi.lib
    165165LIBS    = $(LIB386) $(ACPILIB) $(LIBDDE)
    166166# $(LIBP)
  • src/acpi/psd/makefile

     
    177177LIBDDE  = cpprns36.lib
    178178KEELIB  = $(R_OS2_LIB)\kee.lib
    179179FSHELP  = $(R_OS2_LIB)\fshelper.lib
    180 ACPILIB = $(R_OS2_LIB)\acpi.lib
    181 ACPIDEV = $(R_OS2_LIB)\AcpiDrv.lib
     180ACPILIB = $(ACPILIBDIR)\acpi.lib
     181ACPIDRVLIB = $(ACPILIBDIR)\AcpiDrv.lib
    182182VDHLIB  = $(R_OS2_LIB)\vdh.lib
    183 LIBS    = $(LIBP) $(ACPILIB) $(KEELIB) $(LIBDDE) $(VDHLIB) $(ACPIDEV)
     183LIBS    = $(LIBP) $(ACPILIB) $(KEELIB) $(LIBDDE) $(VDHLIB) $(ACPIDRVLIB)
    184184# $(LIBP)
    185185# $(LIBDDE)
    186186#          $(R_OS2_LIB)\doscalls.lib
  • src/acpi/iasl/makefile

     
    185185LIBDDE  = cpprss36.lib libcssi.lib
    186186KEELIB  = $(R_OS2_LIB)\kee.lib
    187187FSHELP  = $(R_OS2_LIB)\fshelper.lib
    188 ACPILIB = $(R_OS2_LIB)\acpi.lib
     188ACPILIB = $(ACPILIBDIR)\acpi.lib
    189189LIBS    = $(LIB386) $(LIBDDE)
    190190# $(LIBP)
    191191# $(LIBDDE)
  • src/acpi/dll/makefile

     
    174174LIBDDE  = cpprss36.lib
    175175KEELIB  = $(R_OS2_LIB)\resources.lib
    176176FSHELP  = $(R_OS2_LIB)\fshelper.lib
    177 # ACPILIB = $(R_OS2_LIB)\acpi.lib
     177# ACPILIB = $(ACPILIBDIR)\acpi.lib
    178178LIBS    = $(LIB386) $(LIBDDE)
    179179# $(LIBP)
    180180# $(LIBDDE)
     
    191191# Please look at the example for more details.
    192192#-------------------------------------------------------------------------
    193193
    194 all: dep $(OS2)\acpi32.dll $(R_OS2_LIB)\acpi32.lib
     194all: dep $(OS2)\acpi32.dll $(ACPILIBDIR)\acpi32.lib
    195195
    196196#32 bit IFS
    197197$(OS2)\acpi32.dll: $(OBJS) $(O)\$(@B).def makefile
     
    207207<<keep
    208208        cd $(@D)
    209209        mapsym $(O)\$(@B).map
    210         implib $(R_OS2_LIB)\acpi32.lib $(OS2)\acpi32.dll
     210        implib $(ACPILIBDIR)\acpi32.lib $(OS2)\acpi32.dll
    211211        cd $(MAKEDIR)
    212212       
    213213
     
    298298#        @del trc012F.tff
    299299#        cd $(MAKEDIR)
    300300
    301 $(R_OS2_LIB)\acpi32.lib:
    302             implib $(R_OS2_LIB)\acpi32.lib $(OS2)\acpi32.dll
     301$(ACPILIBDIR)\acpi32.lib:
     302            implib $(ACPILIBDIR)\acpi32.lib $(OS2)\acpi32.dll
    303303#***************************************************************************
    304304# Include Footer.mak at this point.
    305305#***************************************************************************
  • src/acpi/intel/makefile

     
    1 # $Id: 1$
     1# $Id: $
    22# @makefile
    33# Main for build Intel source
    44#
     
    117117
    118118LIBS    =  libconv.lib+cpprss36.lib+os2386.lib
    119119
    120 OBJS = $(OBASE)\intel\interpreter\dispatcher\dswstate.obj $(OBASE)\intel\interpreter\dispatcher\dsfield.obj \
    121        $(OBASE)\intel\interpreter\dispatcher\dsinit.obj $(OBASE)\intel\interpreter\dispatcher\dsmethod.obj \
    122        $(OBASE)\intel\interpreter\dispatcher\dsmthdat.obj $(OBASE)\intel\interpreter\dispatcher\dsobject.obj \
    123        $(OBASE)\intel\interpreter\dispatcher\dsopcode.obj $(OBASE)\intel\interpreter\dispatcher\dsutils.obj \
    124        $(OBASE)\intel\interpreter\dispatcher\dswexec.obj $(OBASE)\intel\interpreter\dispatcher\dswload.obj \
    125        $(OBASE)\intel\interpreter\dispatcher\dswscope.obj \
    126        $(OBASE)\intel\interpreter\executer\exoparg1.obj $(OBASE)\intel\interpreter\executer\exstorob.obj \
    127        $(OBASE)\intel\interpreter\executer\exoparg2.obj $(OBASE)\intel\interpreter\executer\exsystem.obj \
    128        $(OBASE)\intel\interpreter\executer\exconfig.obj $(OBASE)\intel\interpreter\executer\exoparg3.obj \
    129        $(OBASE)\intel\interpreter\executer\exutils.obj $(OBASE)\intel\interpreter\executer\exconvrt.obj \
    130        $(OBASE)\intel\interpreter\executer\exoparg6.obj $(OBASE)\intel\interpreter\executer\excreate.obj \
    131        $(OBASE)\intel\interpreter\executer\exprep.obj $(OBASE)\intel\interpreter\executer\exdump.obj \
    132        $(OBASE)\intel\interpreter\executer\exregion.obj $(OBASE)\intel\interpreter\executer\exfield.obj \
    133        $(OBASE)\intel\interpreter\executer\exresnte.obj $(OBASE)\intel\interpreter\executer\exfldio.obj \
    134        $(OBASE)\intel\interpreter\executer\exresolv.obj $(OBASE)\intel\interpreter\executer\exmisc.obj \
    135        $(OBASE)\intel\interpreter\executer\exresop.obj $(OBASE)\intel\interpreter\executer\exmutex.obj \
    136        $(OBASE)\intel\interpreter\executer\exstore.obj $(OBASE)\intel\interpreter\executer\exnames.obj \
    137        $(OBASE)\intel\interpreter\executer\exstoren.obj \
    138        $(OBASE)\intel\interpreter\parser\psargs.obj $(OBASE)\intel\interpreter\parser\psopcode.obj \
    139        $(OBASE)\intel\interpreter\parser\psparse.obj $(OBASE)\intel\interpreter\parser\psscope.obj \
    140        $(OBASE)\intel\interpreter\parser\pstree.obj $(OBASE)\intel\interpreter\parser\psutils.obj \
    141        $(OBASE)\intel\interpreter\parser\pswalk.obj $(OBASE)\intel\interpreter\parser\psxface.obj \
    142        $(OBASE)\intel\interpreter\parser\psloop.obj \
    143        $(OBASE)\intel\namespace\nssearch.obj $(OBASE)\intel\namespace\nsaccess.obj $(OBASE)\intel\namespace\nsutils.obj \
    144        $(OBASE)\intel\namespace\nsalloc.obj $(OBASE)\intel\namespace\nswalk.obj $(OBASE)\intel\namespace\nsdump.obj \
    145        $(OBASE)\intel\namespace\nsxfeval.obj $(OBASE)\intel\namespace\nsxfname.obj \
    146        $(OBASE)\intel\namespace\nseval.obj $(OBASE)\intel\namespace\nsxfobj.obj $(OBASE)\intel\namespace\nsinit.obj \
    147        $(OBASE)\intel\namespace\nsload.obj $(OBASE)\intel\namespace\nsnames.obj $(OBASE)\intel\namespace\nsobject.obj \
    148        $(OBASE)\intel\namespace\nsparse.obj $(OBASE)\intel\namespace\nspredef.obj \
    149        $(OBASE)\intel\utilities\utobject.obj $(OBASE)\intel\utilities\utalloc.obj $(OBASE)\intel\utilities\utxface.obj \
    150        $(OBASE)\intel\utilities\utclib.obj $(OBASE)\intel\utilities\utcopy.obj $(OBASE)\intel\utilities\utdebug.obj \
    151        $(OBASE)\intel\utilities\utdelete.obj $(OBASE)\intel\utilities\uteval.obj $(OBASE)\intel\utilities\utglobal.obj \
    152        $(OBASE)\intel\utilities\utinit.obj $(OBASE)\intel\utilities\utmath.obj $(OBASE)\intel\utilities\utmisc.obj \
    153        $(OBASE)\intel\utilities\utcache.obj $(OBASE)\intel\utilities\utmutex.obj $(OBASE)\intel\utilities\utstate.obj\
    154        $(OBASE)\intel\utilities\utresrc.obj \
    155        $(OBASE)\intel\tables\tbfadt.obj $(OBASE)\intel\tables\tbfind.obj \
    156        $(OBASE)\intel\tables\tbinstal.obj $(OBASE)\intel\tables\tbutils.obj \
    157        $(OBASE)\intel\tables\tbxface.obj $(OBASE)\intel\tables\tbxfroot.obj \
    158        $(OBASE)\intel\events\evevent.obj $(OBASE)\intel\events\evgpe.obj $(OBASE)\intel\events\evgpeblk.obj \
    159        $(OBASE)\intel\events\evmisc.obj $(OBASE)\intel\events\evregion.obj $(OBASE)\intel\events\evrgnini.obj \
    160        $(OBASE)\intel\events\evsci.obj $(OBASE)\intel\events\evxface.obj $(OBASE)\intel\events\evxfevnt.obj \
    161        $(OBASE)\intel\events\evxfregn.obj \
    162        $(OBASE)\intel\hardware\hwacpi.obj $(OBASE)\intel\hardware\hwgpe.obj $(OBASE)\intel\hardware\hwregs.obj \
    163        $(OBASE)\intel\hardware\hwsleep.obj $(OBASE)\intel\hardware\hwtimer.obj $(OBASE)\intel\hardware\hwxface.obj \
    164        $(OBASE)\intel\resources\rsutils.obj $(OBASE)\intel\resources\rsxface.obj $(OBASE)\intel\resources\rsaddr.obj \
    165        $(OBASE)\intel\resources\rscalc.obj $(OBASE)\intel\resources\rscreate.obj $(OBASE)\intel\resources\rsdump.obj \
    166        $(OBASE)\intel\resources\rsio.obj $(OBASE)\intel\resources\rsirq.obj $(OBASE)\intel\resources\rslist.obj \
    167        $(OBASE)\intel\resources\rsmemory.obj $(OBASE)\intel\resources\rsmisc.obj $(OBASE)\intel\resources\rsinfo.obj
     120DISPATCHERDIR = $(OBASE)\intel\interpreter\dispatcher\$(BLD_TYPE)
     121EVENTSDIR = $(OBASE)\intel\events\$(BLD_TYPE)
     122EXECUTERDIR = $(OBASE)\intel\interpreter\executer\$(BLD_TYPE)
     123HARDWAREDIR = $(OBASE)\intel\hardware\$(BLD_TYPE)
     124NAMESPACEDIR = $(OBASE)\intel\namespace\$(BLD_TYPE)
     125PARSERDIR = $(OBASE)\intel\interpreter\parser\$(BLD_TYPE)
     126RESOURCESDIR = $(OBASE)\intel\resources\$(BLD_TYPE)
     127TABLESDIR = $(OBASE)\intel\tables\$(BLD_TYPE)
     128UTILITIESDIR = $(OBASE)\intel\utilities\$(BLD_TYPE)
    168129
     130OBJS = $(DISPATCHERDIR)\dswstate.obj $(DISPATCHERDIR)\dsfield.obj \
     131       $(DISPATCHERDIR)\dsinit.obj $(DISPATCHERDIR)\dsmethod.obj \
     132       $(DISPATCHERDIR)\dsmthdat.obj $(DISPATCHERDIR)\dsobject.obj \
     133       $(DISPATCHERDIR)\dsopcode.obj $(DISPATCHERDIR)\dsutils.obj \
     134       $(DISPATCHERDIR)\dswexec.obj $(DISPATCHERDIR)\dswload.obj \
     135       $(DISPATCHERDIR)\dswscope.obj \
     136       $(EXECUTERDIR)\exoparg1.obj $(EXECUTERDIR)\exstorob.obj \
     137       $(EXECUTERDIR)\exoparg2.obj $(EXECUTERDIR)\exsystem.obj \
     138       $(EXECUTERDIR)\exconfig.obj $(EXECUTERDIR)\exoparg3.obj \
     139       $(EXECUTERDIR)\exutils.obj $(EXECUTERDIR)\exconvrt.obj \
     140       $(EXECUTERDIR)\exoparg6.obj $(EXECUTERDIR)\excreate.obj \
     141       $(EXECUTERDIR)\exprep.obj $(EXECUTERDIR)\exdump.obj \
     142       $(EXECUTERDIR)\exregion.obj $(EXECUTERDIR)\exfield.obj \
     143       $(EXECUTERDIR)\exresnte.obj $(EXECUTERDIR)\exfldio.obj \
     144       $(EXECUTERDIR)\exresolv.obj $(EXECUTERDIR)\exmisc.obj \
     145       $(EXECUTERDIR)\exresop.obj $(EXECUTERDIR)\exmutex.obj \
     146       $(EXECUTERDIR)\exstore.obj $(EXECUTERDIR)\exnames.obj \
     147       $(EXECUTERDIR)\exstoren.obj \
     148       $(PARSERDIR)\psargs.obj $(PARSERDIR)\psopcode.obj \
     149       $(PARSERDIR)\psparse.obj $(PARSERDIR)\psscope.obj \
     150       $(PARSERDIR)\pstree.obj $(PARSERDIR)\psutils.obj \
     151       $(PARSERDIR)\pswalk.obj $(PARSERDIR)\psxface.obj \
     152       $(PARSERDIR)\psloop.obj \
     153       $(NAMESPACEDIR)\nssearch.obj $(NAMESPACEDIR)\nsaccess.obj $(NAMESPACEDIR)\nsutils.obj \
     154       $(NAMESPACEDIR)\nsalloc.obj $(NAMESPACEDIR)\nswalk.obj $(NAMESPACEDIR)\nsdump.obj \
     155       $(NAMESPACEDIR)\nsxfeval.obj $(NAMESPACEDIR)\nsxfname.obj \
     156       $(NAMESPACEDIR)\nseval.obj $(NAMESPACEDIR)\nsxfobj.obj $(NAMESPACEDIR)\nsinit.obj \
     157       $(NAMESPACEDIR)\nsload.obj $(NAMESPACEDIR)\nsnames.obj $(NAMESPACEDIR)\nsobject.obj \
     158       $(NAMESPACEDIR)\nsparse.obj $(NAMESPACEDIR)\nspredef.obj \
     159       $(UTILITIESDIR)\utobject.obj $(UTILITIESDIR)\utalloc.obj $(UTILITIESDIR)\utxface.obj \
     160       $(UTILITIESDIR)\utclib.obj $(UTILITIESDIR)\utcopy.obj $(UTILITIESDIR)\utdebug.obj \
     161       $(UTILITIESDIR)\utdelete.obj $(UTILITIESDIR)\uteval.obj $(UTILITIESDIR)\utglobal.obj \
     162       $(UTILITIESDIR)\utinit.obj $(UTILITIESDIR)\utmath.obj $(UTILITIESDIR)\utmisc.obj \
     163       $(UTILITIESDIR)\utcache.obj $(UTILITIESDIR)\utmutex.obj $(UTILITIESDIR)\utstate.obj\
     164       $(UTILITIESDIR)\utresrc.obj \
     165       $(TABLESDIR)\tbfadt.obj $(TABLESDIR)\tbfind.obj \
     166       $(TABLESDIR)\tbinstal.obj $(TABLESDIR)\tbutils.obj \
     167       $(TABLESDIR)\tbxface.obj $(TABLESDIR)\tbxfroot.obj \
     168       $(EVENTSDIR)\evevent.obj $(EVENTSDIR)\evgpe.obj $(EVENTSDIR)\evgpeblk.obj \
     169       $(EVENTSDIR)\evmisc.obj $(EVENTSDIR)\evregion.obj $(EVENTSDIR)\evrgnini.obj \
     170       $(EVENTSDIR)\evsci.obj $(EVENTSDIR)\evxface.obj $(EVENTSDIR)\evxfevnt.obj \
     171       $(EVENTSDIR)\evxfregn.obj \
     172       $(HARDWAREDIR)\hwacpi.obj $(HARDWAREDIR)\hwgpe.obj $(HARDWAREDIR)\hwregs.obj \
     173       $(HARDWAREDIR)\hwsleep.obj $(HARDWAREDIR)\hwtimer.obj $(HARDWAREDIR)\hwxface.obj \
     174       $(RESOURCESDIR)\rsutils.obj $(RESOURCESDIR)\rsxface.obj $(RESOURCESDIR)\rsaddr.obj \
     175       $(RESOURCESDIR)\rscalc.obj $(RESOURCESDIR)\rscreate.obj $(RESOURCESDIR)\rsdump.obj \
     176       $(RESOURCESDIR)\rsio.obj $(RESOURCESDIR)\rsirq.obj $(RESOURCESDIR)\rslist.obj \
     177       $(RESOURCESDIR)\rsmemory.obj $(RESOURCESDIR)\rsmisc.obj $(RESOURCESDIR)\rsinfo.obj
     178
    169179#--------------------------------------------------------------------------
    170180# The all target is used to specify a list of targets that need to be built
    171181# Please don't delete "dep" from the target list.  It is used to generate the
     
    173183# Please look at the example for more details.
    174184#-------------------------------------------------------------------------
    175185
    176 all: intel $(R_OS2_LIB)\acpi.lib
     186all: intel $(ACPILIBDIR)\acpi.lib
    177187
    178188intel:
    179189      @cd interpreter
     
    198208      @$(MAKE) -$(MAKEFLAGS) $(OPT)
    199209      @CD ..\
    200210
    201 $(R_OS2_LIB)\acpi.lib: makefile $(OBJS)
    202         if exist $(R_OS2_LIB)\$(@B).lib del $(R_OS2_LIB)\$(@B).lib
     211$(ACPILIBDIR)\acpi.lib: makefile $(OBJS)
     212        if exist $@ del $@
    203213        $(CREATE_PATH)
    204214        -4$(LIBUTIL) /NOFREE @<<$(O)\$(@B).def
    205 $(R_OS2_LIB)\$(@B).lib
     215$@
    206216y
    207217$(OBJS: =&^
    208218)
  • src/acpi/apm/makefile

     
    191191LIBDDE  = cpprns36.lib
    192192KEELIB  = $(R_OS2_LIB)\kee.lib
    193193FSHELP  = $(R_OS2_LIB)\fshelper.lib
    194 ACPIDEV = $(R_OS2_LIB)\AcpiDrv.lib
    195 LIBS    = dhcalls.lib rmcalls.lib $(KEELIB) $(LIBP) $(ACPIDEV)
     194ACPIDRVLIB = $(ACPILIBDIR)\AcpiDrv.lib
     195LIBS    = dhcalls.lib rmcalls.lib $(KEELIB) $(LIBP) $(ACPIDRVLIB)
    196196# $(LIBDDE)
    197197
    198198OBJASM = $(O)\dmsegs.obj $(O)\dmheader.obj $(O)\strat1.obj $(O)\thunk.obj \
     
    239239# dminit.obj, causing the code to be discarded when the initialization
    240240# code is discarded (bad).
    241241#
    242 #$(OBJOBJ): $(R_OS2_LIB)\libh.lib
     242#$(OBJOBJ): $(ACPILIBDIR)\libh.lib
    243243#        cd $(O)
    244 #        lib $(R_OS2_LIB)\libh.lib *$@;
     244#        lib $(ACPILIBDIR)\libh.lib *$@;
    245245#        cd $(MAKEDIR)
    246246
    247247# Link
  • makefile

     
    1313#------------------------------------------------------------------------------
    1414#
    1515
     16ROOT            = $(MAKEDIR)
     17
     18# Do no define SUBSYS here
     19
     20!include $(ROOT)\header.mak
     21
     22#
     23# Ensure directory for generated libraries exists
     24#
     25!if [$(ROOT)\createpath.cmd $(ACPILIBDIR)]
     26!endif
     27
     28#
     29# Ensure output directory for generated binaries exists
     30#
     31!if [$(ROOT)\createpath.cmd $(ACPILIBDIR)]
     32!endif
     33
     34#
     35# Ensure binary executables output directory exists
     36#
     37!if [$(ROOT)\createpath.cmd $(OS2)]
     38!endif
     39
    1640allall: all
    1741
    1842all dep clean: