File tree Expand file tree Collapse file tree 20 files changed +60
-45
lines changed
Expand file tree Collapse file tree 20 files changed +60
-45
lines changed Original file line number Diff line number Diff line change @@ -207,7 +207,7 @@ asi_msg.grh : $(as_dir)/h/as.msg $(__MAKEFILES__)
207207wsplice_opts_axp = -kAS_ALPHA
208208wsplice_opts_mps = -kAS_MIPS
209209wsplice_opts_ppc = -kAS_PPC
210- wsplice_opts = $(wsplice_opts_$(target_cpu))
210+ wsplice_opts = -u $(wsplice_opts_$(target_cpu))
211211
212212as_in.y : $(yacc_src) $(yacc_driver) $(__MAKEFILES__)
213213 @%make echo_wsplice
Original file line number Diff line number Diff line change @@ -6,13 +6,13 @@ all: $(objs) .SYMBOLIC
66 @%null
77
88readme.txt : ../readme.sp
9- *wsplice -kC $[@ $@
9+ *wsplice -u - kC $[@ $@
1010
1111freadme.txt : ../readme.sp
12- *wsplice -kF77 $[@ $@
12+ *wsplice -u - kF77 $[@ $@
1313
1414areadme.txt : ../areadme.sp
15- *wsplice $[@ $@
15+ *wsplice -u $[@ $@
1616
1717clean: .SYMBOLIC .EXPLICIT
1818 rm -f *.txt
Original file line number Diff line number Diff line change @@ -271,11 +271,4 @@ wsplice_extra_opts =
271271wsplice_extra_opts = -d"depends.dep"
272272!endif
273273
274- wsplice_opts_dos = -kDOS
275- wsplice_opts_os2 = -kDOS
276- wsplice_opts_qnx = -kQNX -u
277- wsplice_opts_win = -kDOS
278-
279- wsplice_opts = $(wsplice_extra_opts) $(wsplice_opts_$(host_os))
280-
281274!include $(graphlib_dir)/headers.mif
Original file line number Diff line number Diff line change 11.EXTENSIONS : .gsp .sp
22
3+ wsplice_opts_dos = -kDOS
4+ wsplice_opts_os2 = -kDOS
5+ wsplice_opts_qnx = -kQNX
6+ wsplice_opts_win = -kDOS
7+
8+ wsplice_opts = -u $(wsplice_extra_opts) $(wsplice_opts_$(host_os))
9+
310crwat_sp = $(hdr_dir)/crwat.sp $(crwatpro_gsp) $(hdr_dir)/crwatwat.sp $(hdr_dir)/crwatepi.sp
411graph_deps = $(hdr_dir)/watcom/graph.mh $(crwat_sp) $(hdr_dir)/readonly.sp $(hdr_dir)/owrtlink.sp $(hdr_dir)/cpluspro.sp $(hdr_dir)/cplusepi.sp $(hdr_dir)/pshpackl.sp $(hdr_dir)/poppack.sp
512pgchart_deps = $(hdr_dir)/watcom/pgchart.mh $(crwat_sp) $(hdr_dir)/readonly.sp $(hdr_dir)/owrtlink.sp $(hdr_dir)/cpluspro.sp $(hdr_dir)/cplusepi.sp $(hdr_dir)/pshpackl.sp $(hdr_dir)/poppack.sp
Original file line number Diff line number Diff line change @@ -92,9 +92,4 @@ libtarg_name = chart2
9292#
9393# rc and others
9494#
95- wsplice_opts_dos = -kDOS
96- wsplice_opts_os2 = -kDOS
97- wsplice_opts_qnx = -kQNX -u
98- wsplice_opts_win = -kDOS
99-
10095!include $(graphlib_dir)/headers.mif
Original file line number Diff line number Diff line change @@ -8,8 +8,8 @@ additional_clean = $(crwatpro_gsp)
88!include ../hfiles.mif
99
1010dos_options = -kDOS
11- linux_options = -kLINUX -u
12- qnx_options = -kQNX -t8 -u
11+ linux_options = -kLINUX
12+ qnx_options = -kQNX -t8
1313rdos_options = -kRDOS
1414
1515!ifeq debug 0
@@ -18,9 +18,9 @@ wsplice_extra_opts =
1818wsplice_extra_opts = -d"depends.dep"
1919!endif
2020
21- wsplice_opts = $(wsplice_extra_opts) -i.. $($(system)_options) ../common.sp $[@ $@
22- wsplice_opts_p = $(wsplice_extra_opts) -i.. $($(system)_options) -kCNAME $(options_$^&) ../common.sp $[@ $@
23- wsplice_opts_c = $(wsplice_extra_opts) -i.. $($(system)_options) $(options_h_$^&) ../common.sp $[@ $@
21+ wsplice_opts = -u $(wsplice_extra_opts) -i.. $($(system)_options) ../common.sp $[@ $@
22+ wsplice_opts_p = -u $(wsplice_extra_opts) -i.. $($(system)_options) -kCNAME $(options_$^&) ../common.sp $[@ $@
23+ wsplice_opts_c = -u $(wsplice_extra_opts) -i.. $($(system)_options) $(options_h_$^&) ../common.sp $[@ $@
2424
2525wsplice_opts_i386 = $(wsplice_extra_opts) -i.. -kARCHI386 $($(system)_options) ../common.sp $[@ $@
2626wsplice_opts_mips = $(wsplice_extra_opts) -i.. -kARCHMIPS $($(system)_options) ../common.sp $[@ $@
Original file line number Diff line number Diff line change @@ -33,7 +33,7 @@ wsplice_opts_x64 = -k FOR_X64
3333
3434.sp.cfg:
3535 @%make echo_wsplice
36- $(noecho)*wsplice $(wsplice_opts_$(host_os)) $(wsplice_opts_$(host_cpu)) $[@ $@
36+ $(noecho)*wsplice -u $(wsplice_opts_$(host_os)) $(wsplice_opts_$(host_cpu)) $[@ $@
3737
3838clean : .SYMBOLIC
3939 rm -f *.cfg
Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ wsplice_extra_opts =
2929!else
3030wsplice_extra_opts = -d"depends.dep"
3131!endif
32- wsplice_opts = $(wsplice_extra_opts) -kIBMTOOLKIT -i"$(hdr_dir)" $[@ $@
32+ wsplice_opts = -u $(wsplice_extra_opts) -kIBMTOOLKIT -i"$(hdr_dir)" $[@ $@
3333
3434# dirs286 dirs386
3535#-------------------------------------------
Original file line number Diff line number Diff line change @@ -19,15 +19,15 @@ wsplice_opts_win = -k FOR_WIN -k C_FOR_PB
1919
2020.sp.cfg:
2121 @%make echo_wsplice
22- $(noecho)*wsplice $(wsplice_opts_$(host_os)) $[@ $@
22+ $(noecho)*wsplice -u $(wsplice_opts_$(host_os)) $[@ $@
2323
2424pbidex.cfg : idex.sp
2525 @%make echo_wsplice
26- $(noecho)*wsplice $(wsplice_opts_$(host_os)) $[@ $@
26+ $(noecho)*wsplice -u $(wsplice_opts_$(host_os)) $[@ $@
2727
2828pbide.cfg : ide.sp
2929 @%make echo_wsplice
30- $(noecho)*wsplice $(wsplice_opts_$(host_os)) $[@ $@
30+ $(noecho)*wsplice -u $(wsplice_opts_$(host_os)) $[@ $@
3131
3232clean : .SYMBOLIC
3333 rm -f *.cfg
Original file line number Diff line number Diff line change @@ -27,9 +27,13 @@ objs = &
2727
2828all: $(objs) .SYMBOLIC
2929
30- .sp.bat .sp.cmd :
30+ .sp.bat :
3131 @%make echo_wsplice
32- $(noecho)*wsplice -k $(host_os) -k $(host_cpu) $[@ $@
32+ $(noecho)*wsplice -u0 -k $(host_os) -k $(host_cpu) $[@ $@
33+
34+ .sp.cmd :
35+ @%make echo_wsplice
36+ $(noecho)*wsplice -u -k $(host_os) -k $(host_cpu) $[@ $@
3337
3438clean: .SYMBOLIC
3539 rm -f *.bat *.cmd
You can’t perform that action at this time.
0 commit comments