Ticket #52: makdiff.txt

File makdiff.txt, 2.5 KB (added by abwillis, 12 years ago)

Makefile changes to show build environment difference also including the -Fc mentioned in the ticket

Line 
1Index: makefile
2===================================================================
3--- makefile (revision 757)
4+++ makefile (working copy)
5@@ -83,20 +83,20 @@
6 DOSINC = ..\..\..\dos\dosinc
7 INIT = ..\..\..\dos\init
8 TASK = ..\..\..\dos\task
9-INC = ..\..\..\..\inc
10-H = ..\..\..\..\h
11+INC = $(DDK)\base\inc
12+H = $(DDK)\base\h
13 USBH = ..\include
14 KEE16H = ..\kee16lib
15-LIB = ..\..\..\..\lib
16-TOOLSPATH = ..\..\..\..\tools
17-DISKH = ..\..\dasd\diskh
18-RMH = ..\..\resource\rsm_h
19-DHLIB = ..\..\dasd\devhelp
20-RMLIB = ..\..\resource\rmcalls
21+LIB = $(DDK)\base\lib
22+TOOLSPATH = $(DDK)\base\tools
23+DISKH = $(DDK)\base\src\dev\dasd\diskh
24+RMH = $(DDK)\base\src\dev\resource\rsm_h
25+DHLIB = $(DDK)\base\src\dev\dasd\devhelp
26+RMLIB = $(DDK)\base\src\dev\resource\rmcalls
27 USBLIB = ..\misc
28 KEE16LIB = ..\kee16lib
29-KEELIB = ..\..\..\..\..\base32\rel\os2c\lib\os2
30-TKTOOLS = \os2tk45\bin
31+KEELIB = $(DDK)\base32\rel\os2c\lib\os2
32+TKTOOLS = %TKMAIN%\bin
33
34 #
35 # Since the compiler/linker and other tools use environment
36@@ -130,7 +130,7 @@
37 #
38
39 AINC = -I. -I$(INC)
40-CINC = -I. -I$(H) -I$(USBH) -I$(KEE16H)
41+CINC = -I. -I$(H) -I$(USBH) -I$(KEE16H) -I$(DISKH)
42 # environment variable DEBUG is used to switch between release and debug builds.
43 # use SET DEBUG=1 to build debug version of module.
44 !ifndef DEBUG
45@@ -145,7 +145,8 @@
46 !endif
47 RFLAGS = -r
48
49-LIBS = $(USBLIB)\usbmisc.lib $(DHLIB)\dhcalls.lib $(RMLIB)\rmcalls.lib $(LIB)\addcalls.lib $(LIB)\os2286p.lib $(KEE16LIB)\kee16.lib $(KEELIB)\kee.lib
50+LIBS1 = $(USBLIB)\usbmisc.lib $(DHLIB)\dhcalls.lib $(RMLIB)\rmcalls.lib $(LIB)\addcalls.lib
51+LIBS2 = $(LIB)\os2286p.lib $(KEE16LIB)\kee16.lib $(KEELIB)\kee.lib
52 DEF = usbhcdd.def
53
54 #****************************************************************************
55@@ -193,7 +194,7 @@
56 $(AS) -l -n $(AFLAGS) $(AINC) $*.asm;
57
58 .c.obj:
59- $(CC) $(CFLAGS) $(CINC) -Fc $*.c
60+ $(CC) $(CFLAGS) $(CINC) $*.c
61
62 .c.lst:
63 $(CC) $(CFLAGS) $(CINC) -Fc$*.lst $*.c
64@@ -263,7 +264,7 @@
65 $(TRACE): usbehcd.tsf
66 $(TRCUST) $?
67
68-usbehcd.sys: $(OBJS) $(LIBS) makefile
69+usbehcd.sys: $(OBJS) $(LIBS1) $(LIBS2) makefile
70 Rem Create DEF file <<$(DEF)
71 PHYSICAL DEVICE USBEHCD
72 DESCRIPTION '$(FILEVER)OS/2 USB EHCI compliant Device Driver'
73@@ -291,7 +292,8 @@
74 $(OBJ4)
75 $*.sys
76 $*.map
77-$(LIBS)
78+$(LIBS1) +
79+$(LIBS2)
80 $(DEF)
81 <<keep
82 $(MAPSYM) -aln $*.map