Changeset 184 for trunk/src/os2ahci/Makefile

Timestamp:

Dec 15, 2016, 12:31:51 AM (9 years ago)

Author:

David Azarewicz

Message:

Reworked makefile
Fixed context hook logic.

File:

• trunk/src/os2ahci/Makefile (modified) (8 diffs)

trunk/src/os2ahci/Makefile

@@ -14 +14 @@
 BLD_MINOR=01 # must be 2 digits
 BLD_REV=0 # not used at this time
-FIXPACK=Test Build
 
 !ifndef %ROOT
-ROOT=$+$(%cwd)$-
-!else
+!error ROOT must be set in the environment.
+!endif
 ROOT=$(%ROOT)
-!endif
 
 !ifndef %WATCOM # if not defined in the environment
@@ -51 +49 @@
 !endif
 
+!ifdef %FIXPACK
+FIXPACK=$(%FIXPACK)
+!endif
+
 VERSION=$(BLD_MAJOR).$(BLD_MINOR)
 ZIPDIR=$(ROOT)\tmp
@@ -73 +75 @@
 
 !ifdef __LOADDLL__
-!loaddll wcc   $(WATCOM)\BINP\DLL\wccd.dll
+!loaddll wcc386   $(WATCOM)\BINP\DLL\wccd386.dll
 !loaddll wlink $(WATCOM)\BINP\DLL\wlinkd.dll
 !endif
@@ -80 +82 @@
 AFLAGS=-q -6p -bt=os2 -wx -d1
 CFLAGS =-q -bt=os2 -6s -olinar -s -ze -zl -zq -zfp -zgp -ms -wx -zp1 -ecs -ei -za99
-CFLAGS_DEBUG=-q -bt=os2 -6s -olinar -s -ze -zl -zq -zfp -zgp -ms -wx -zp1 -ecs -ei -za99
-!ifneq FIXPACK
-CFLAGS+= -DTESTVER
+
+!ifdef DEBUG
+CDEFS=-DDEBUG
+O=Debug
+!else
+CDEFS=
+O=Retail
 !endif
 
-###############################################################################
-# Main dependencies
+!ifneq FIXPACK
+CDEFS+= -DTESTVER
+!endif
 
 LIBS = $(DRV32KIT)\Drv32.lib $(DDK)\base32\lib\kee.lib
 
-OBJS = os2ahci.obj pci.obj ahci.obj ata.obj atapi.obj &
-       ctxhook.obj trace.obj ioctl.obj apm.obj thunk.obj
+OBJS = $(O)\os2ahci.obj $(O)\pci.obj $(O)\ahci.obj $(O)\ata.obj $(O)\atapi.obj &
+       $(O)\ctxhook.obj $(O)\trace.obj $(O)\ioctl.obj $(O)\apm.obj $(O)\thunk.obj
 
-INCS = os2ahci.h ahci.h
+.asm.obj: .autodepend
+  $(AS) $(AFLAGS) -fo=$^@ $[@
+  #wdis -l $^@
 
-all: os2ahci.add os2ahci.sym
+.c.obj: .autodepend
+  $(CC) $(CFLAGS) $(CDEFS) -fo=$^@ $[@
+  wdis -l $^@
 
-clean: .symbolic
-  rm -f $(OBJS) os2ahci.add *.cod *.lst *.def *.map *.sym *.err *.lnk version.h
+all: directory $(O)\os2ahci.add $(O)\os2ahci.sym
 
-###############################################################################
-# Object/source dependencies
-
-os2ahci.obj: os2ahci.c Makefile $(INCS) version.h ioctl.h
-
-pci.obj: pci.c Makefile $(INCS)
-
-ahci.obj: ahci.c Makefile $(INCS) ata.h atapi.h
-
-ata.obj: ata.c Makefile $(INCS) ata.h
-
-atapi.obj: atapi.c Makefile $(INCS) atapi.h ata.h
-
-ctxhook.obj: ctxhook.c Makefile $(INCS) ata.h atapi.h
-
-apm.obj: apm.c Makefile $(INCS)
-
-ioctl.obj: ioctl.c Makefile $(INCS) ioctl.h atapi.h
-
-trace.obj: trace.c Makefile $(INCS)
-
-###############################################################################
-# Action definitions (compile/link commands)
+directory: .symbolic
+  $(ROOT)\Tools\createpath.cmd $(O)
 
 version.h: Makefile .always
@@ -135 +124 @@
   @AddToFile $^@,$#define BLDLEVEL,BLDLEVEL2,$(VENDOR),$(VERSION),AHCI Driver (c) %Y $(VENDOR),$(FIXPACK)
 
-.asm.obj: .autodepend
-  $(AS) $(AFLAGS) $(AS_INCLUDE) $[@
-  #wdis -l $^@
-
-.c.obj: .autodepend
-  $(CC) $(CFLAGS) $[@
-  wdis -l $^@
-
-os2ahci.add: version.h $(OBJS) makefile
+$(O)\os2ahci.add: version.h $(OBJS) Makefile
   @%create $^&.lrf
   @%append $^&.lrf format os2 lx phys
@@ -168 +149 @@
   @%erase $^&.lrf
 
-os2ahci.sym: os2ahci.map
+$(O)\os2ahci.sym: $(O)\os2ahci.map
   wat2map.cmd $[@ $^*.ma1
-  $(MAPSYM) $^*.ma1
-  @%erase $^*.ma1
+  cd $(O)
+  $(MAPSYM) $^&.ma1
+  @%erase $^&.ma1
+  cd ..
 
-release: os2ahci.add os2ahci.sym .symbolic
+release: $(O)\os2ahci.add $(O)\os2ahci.sym .symbolic
   @if exist $(WPIFILE) @del $(WPIFILE)
   @!rm -rf $(ZIPDIR)
@@ -180 +163 @@
 
   @md $(ZIPDIR)\pkg1
-  @copy /b $(ROOT)\src\os2ahci\os2ahci.add $(ZIPDIR)\pkg1 >NUL
-  @copy /b $(ROOT)\src\os2ahci\os2ahci.sym $(ZIPDIR)\pkg1 >NUL
+  @copy /b $(ROOT)\src\os2ahci\$(O)\os2ahci.add $(ZIPDIR)\pkg1 >NUL
+  @copy /b $(ROOT)\src\os2ahci\$(O)\os2ahci.sym $(ZIPDIR)\pkg1 >NUL
 
   @md $(ZIPDIR)\pkg2
@@ -200 +183 @@
   @!rm -rf $(ZIPDIR)
 
+clean: .symbolic
+  rm -f *.def *.err *.lnk version.h
+  @if exist Debug @!rm -r Debug
+  @if exist Retail @!rm -r Retail
+
+