Index: makefile
===================================================================
--- makefile	(revision 757)
+++ makefile	(working copy)
@@ -83,20 +83,20 @@
 DOSINC = ..\..\..\dos\dosinc
 INIT   = ..\..\..\dos\init
 TASK   = ..\..\..\dos\task
-INC    = ..\..\..\..\inc
-H      = ..\..\..\..\h
+INC    = $(DDK)\base\inc
+H      = $(DDK)\base\h
 USBH   = ..\include
 KEE16H = ..\kee16lib
-LIB    = ..\..\..\..\lib
-TOOLSPATH = ..\..\..\..\tools
-DISKH  = ..\..\dasd\diskh
-RMH    = ..\..\resource\rsm_h
-DHLIB  = ..\..\dasd\devhelp
-RMLIB  = ..\..\resource\rmcalls
+LIB    = $(DDK)\base\lib
+TOOLSPATH = $(DDK)\base\tools
+DISKH  = $(DDK)\base\src\dev\dasd\diskh
+RMH    = $(DDK)\base\src\dev\resource\rsm_h
+DHLIB  = $(DDK)\base\src\dev\dasd\devhelp
+RMLIB  = $(DDK)\base\src\dev\resource\rmcalls
 USBLIB  = ..\misc
 KEE16LIB = ..\kee16lib
-KEELIB   = ..\..\..\..\..\base32\rel\os2c\lib\os2
-TKTOOLS  = \os2tk45\bin
+KEELIB   = $(DDK)\base32\rel\os2c\lib\os2
+TKTOOLS  = %TKMAIN%\bin
 
 #
 # Since the compiler/linker and other tools use environment
@@ -130,7 +130,7 @@
 #
 
 AINC   = -I. -I$(INC)
-CINC   = -I. -I$(H) -I$(USBH) -I$(KEE16H)
+CINC   = -I. -I$(H) -I$(USBH) -I$(KEE16H) -I$(DISKH)
 # environment variable DEBUG is used to switch between release and debug builds.
 # use SET DEBUG=1 to build debug version of module.
 !ifndef DEBUG
@@ -145,7 +145,8 @@
 !endif
 RFLAGS = -r
 
-LIBS  =  $(USBLIB)\usbmisc.lib $(DHLIB)\dhcalls.lib $(RMLIB)\rmcalls.lib $(LIB)\addcalls.lib $(LIB)\os2286p.lib $(KEE16LIB)\kee16.lib $(KEELIB)\kee.lib
+LIBS1  =  $(USBLIB)\usbmisc.lib $(DHLIB)\dhcalls.lib $(RMLIB)\rmcalls.lib $(LIB)\addcalls.lib 
+LIBS2  =  $(LIB)\os2286p.lib $(KEE16LIB)\kee16.lib $(KEELIB)\kee.lib
 DEF   = usbhcdd.def
 
 #****************************************************************************
@@ -193,7 +194,7 @@
         $(AS) -l -n $(AFLAGS) $(AINC) $*.asm;
 
 .c.obj:
-        $(CC) $(CFLAGS) $(CINC) -Fc $*.c
+        $(CC) $(CFLAGS) $(CINC) $*.c
 
 .c.lst:
         $(CC) $(CFLAGS) $(CINC) -Fc$*.lst $*.c
@@ -263,7 +264,7 @@
 $(TRACE): usbehcd.tsf
    $(TRCUST) $?
 
-usbehcd.sys:  $(OBJS) $(LIBS)  makefile
+usbehcd.sys:  $(OBJS) $(LIBS1) $(LIBS2)  makefile
         Rem Create DEF file <<$(DEF)
 PHYSICAL DEVICE USBEHCD
 DESCRIPTION '$(FILEVER)OS/2 USB EHCI compliant Device Driver'
@@ -291,7 +292,8 @@
 $(OBJ4)
 $*.sys
 $*.map
-$(LIBS)
+$(LIBS1) +
+$(LIBS2)
 $(DEF)
 <<keep
              $(MAPSYM) -aln $*.map
