ow-build: make files rename client macros to use cli_ prefix

bld/as/client.mif

@@ -3,26 +3,28 @@
 #
 
 !ifdef bootstrap
-asminline_lib = $(as_dir)/$(target_cpu)/$(objs_subdir)/asinline.lib
+cli_asminline_lib = $(as_dir)/$(target_cpu)/$(objs_subdir)/asinline.lib
 !else ifdef $(proj_name)_rtdll
 #
 # AS in-line run-time DLL used
 #
-asminline_lib = $(as_dir)/$(target_cpu)/$(objs_subdir).rtd/asinline.lib
+cli_asminline_lib = $(as_dir)/$(target_cpu)/$(objs_subdir).rtd/asinline.lib
 !else ifdef $(proj_name)_dll
 #
 # AS in-line DLL used
 #
-asminline_lib = $(as_dir)/$(target_cpu)/$(objs_subdir).dll/asinline.lib
+cli_asminline_lib = $(as_dir)/$(target_cpu)/$(objs_subdir).dll/asinline.lib
 !else
 #
 # AS in-line library used
 #
-asminline_lib = $(as_dir)/$(target_cpu)/$(objs_subdir)/asinline.lib
+cli_asminline_lib = $(as_dir)/$(target_cpu)/$(objs_subdir)/asinline.lib
 !endif
 
 #
-asminline_c =
-asminline_inc_dirs = -I"$(as_dir)/h" -I"$(owl_dir)/h"
-asminline_deps =
-asminline_objs =
+cli_asminline_c =
+cli_asminline_inc_dirs = -I"$(as_dir)/h"
+cli_asminline_deps =
+cli_asminline_objs =
+cli_asminline_rc_inc_dirs =
+cli_asminline_rc_depends =

bld/as/master.mif

@@ -57,7 +57,7 @@ asi_lex_out     = asilexyy
 
 .c: $(as_dir)/$(target_cpu)/c;$(as_dir)/c;$(trmem_dir);$(cpp_c_dirs);$(watcom_dir)/c
 
-inc_dirs = -I. -I"$(as_dir)/$(target_cpu)/h" -I"$(as_dir)/h" -I"$(owl_dir)/h" $(cpp_inc_dirs) -I"$(fe_misc_dir)/h"
+inc_dirs = -I. -I"$(as_dir)/$(target_cpu)/h" -I"$(as_dir)/h" $(cli_owl_inc_dirs) $(cpp_inc_dirs) -I"$(fe_misc_dir)/h"
 
 extra_cppflags_axp = -DAS_ALPHA
 extra_cppflags_mps = -DAS_MIPS
@@ -151,8 +151,8 @@ asi_test_objs = asitest.obj trmemcvr.obj $+$(trmem_objs)$-
 #
 !ifdef test_inline_as
 
-asinline.exe : $(asi_test_objs) $(asminline_lib) $(__MAKEFILES__)
-    $(cl) $(clflags) $(asi_test_objs) $(asminline_lib) $(ldflags)
+asinline.exe : $(asi_test_objs) $(cli_asminline_lib) $(cli_owl_lib) $(__MAKEFILES__)
+    $(cl) $(clflags) $(asi_test_objs) $(cli_asminline_lib) $(cli_owl_lib) $(ldflags)
 
 !endif
 
@@ -171,7 +171,7 @@ all : $(all_as) .symbolic
 #
 exetarg_prebuild_objs = $(subdir_stand) msg.grh usage.gh
 exetarg_objs = $(as_objs)
-exetarg_libs = $(owl_lib)
+exetarg_libs = $(cli_owl_lib)
 exetarg_res = $(proj_name).res
 !include exetarg.mif
 

bld/cc/ccobjs.mif

@@ -102,7 +102,7 @@ cc_objs_ppc   = $(_subdir_)cmdlnrsc.obj $(_subdir_)cpragppc.obj $(_subdir_)pragp
 cc_objs_mps   = $(_subdir_)cmdlnrsc.obj $(_subdir_)cpragmps.obj $(_subdir_)pragmips.obj
 cc_objs_sparc = $(_subdir_)cmdlnrsc.obj $(_subdir_)cpragspc.obj $(_subdir_)pragspc.obj $(_subdir_)stubspc.obj
 
-cc_template = $(common_objs) $(cc_debug_objs) $(asminline_objs) $(cg_objs) $(cc_objs_$(target_cpu))
+cc_template = $(common_objs) $(cc_debug_objs) $(cli_asminline_objs) $(cli_cg_objs) $(cc_objs_$(target_cpu))
 
 comp_objs_drv = $(drv_objs)
 _subdir_ = $(dll_subdir)/

bld/cc/master.mif

@@ -56,9 +56,9 @@ $(bin_subdir) : .EXPLICIT
 #
 # cflags
 #
-.c: ../../c;$(asminline_c);$(fe_misc_dir)/c;$(cpp_c_dirs);$(watcom_dir)/c
+.c: ../../c;$(cli_asminline_c);$(fe_misc_dir)/c;$(cpp_c_dirs);$(watcom_dir)/c
 
-inc_dirs  = -I. -I.. -I"../../h" $(cg_inc_dirs) $(asminline_inc_dirs) $(cpp_inc_dirs) $(cli_dwarfw_inc_dirs) -I"$(comp_cfg_dir)/h" -I"$(fe_misc_dir)/h"
+inc_dirs  = -I. -I.. -I"../../h" $(cli_cg_inc_dirs) $(cli_asminline_inc_dirs) $(cli_owl_inc_dirs) $(cpp_inc_dirs) $(cli_dwarfw_inc_dirs) -I"$(comp_cfg_dir)/h" -I"$(fe_misc_dir)/h"
 
 extra_cpp_flags = -DINCL_MSGTEXT
 !ifndef cc_dll
@@ -120,7 +120,7 @@ prebuild_objs = &
     weights.gh &
     keywords.gh &
     cmdlnprs.gh &
-    $(asminline_deps) &
+    $(cli_asminline_deps) &
     code$(target_cpu).gh &
     $(bin_intname)01.int
 
@@ -139,7 +139,7 @@ exetarg_libs          = $(dlltarg_name).lib $(exetarg_libs_$(host_os))
 !else
 exetarg_prebuild_objs = $(prebuild_objs)
 exetarg_objs          = $(comp_objs_exe)
-exetarg_libs          = $(asminline_lib) $(cg_libs)
+exetarg_libs          = $(cli_asminline_lib) $(cli_cg_libs)
 !endif
 exetarg_qnx_res       = usage.u
 !ifdef ntverrc_exe_out
@@ -153,7 +153,7 @@ exetarg_name          = $(exetarg_name)
 #
 dlltarg_prebuild_objs = $(dll_subdir) $(prebuild_objs)
 dlltarg_objs          = $(comp_objs_dll)
-dlltarg_libs          = $(asminline_lib) $(cg_libs)
+dlltarg_libs          = $(cli_asminline_lib) $(cli_cg_libs)
 !ifdef ntverrc_dll_out
 dlltarg_res           = $(ntverrc_dll_out)
 !endif

bld/cfloat/client.mif

@@ -3,22 +3,22 @@
 #
 
 !ifdef bootstrap
-cfloat_lib = $(cfloat_dir)/$(objs_subdir)/cf.lib
+cli_cfloat_lib = $(cfloat_dir)/$(objs_subdir)/cf.lib
 !else ifdef $(proj_name)_rtdll
 #
 # CFLOAT run-time DLL used
 #
-cfloat_lib = $(cfloat_dir)/$(objs_subdir).rtd/cf.lib
+cli_cfloat_lib = $(cfloat_dir)/$(objs_subdir).rtd/cf.lib
 !else ifdef $(proj_name)_dll
 #
 # CFLOAT DLL used
 #
-cfloat_lib = $(cfloat_dir)/$(objs_subdir).dll/cf.lib
+cli_cfloat_lib = $(cfloat_dir)/$(objs_subdir).dll/cf.lib
 !else
 #
 # CFLOAT library used
 #
-cfloat_lib = $(cfloat_dir)/$(objs_subdir)/cf.lib
+cli_cfloat_lib = $(cfloat_dir)/$(objs_subdir)/cf.lib
 !endif
 
-cfloat_inc_dirs = -I"$(cfloat_dir)/h"
+cli_cfloat_inc_dirs = -I"$(cfloat_dir)/h"

bld/cfloat/master.mif

@@ -6,12 +6,14 @@ cf_autodepends = .autodepend
 !include defrule.mif
 !include deftarg.mif
 
+!include $(cfloat_dir)/client.mif
+
 #
 # cflags
 #
 .c: $(cfloat_dir)/c
 
-inc_dirs = -I"../h"
+inc_dirs = $(cli_cfloat_inc_dirs)
 
 # explicit rules
 #################

bld/cg/client.mif

@@ -48,27 +48,27 @@ use_owl_lib_mps   = 1
 use_owl_lib_386   = 0
 use_owl_lib_i86   = 0
 
-cg_inc_dirs = $(i_path)
+cli_cg_inc_dirs = $(i_path)
 
-cg_objs =
+cli_cg_objs =
 !ifdef dll_cg
-cg_libs = &
+cli_cg_libs = &
     $(o_dir)/cgdllcli.lib &
     $(cli_dwarfw_lib)
 !else ifeq use_owl_lib_$(target_cpu) 1
 ! ifeq debug_cg 1
-cg_objs = $(owl_debug_objs)
+cli_cg_objs = $(owl_debug_objs)
 ! endif
-cg_libs = &
+cli_cg_libs = &
     $(o_dir)/cg$(target_cpu).lib &
     $(o_dir)/$(cg_target_host_name).lib &
-    $(owl_lib) &
-    $(cfloat_lib) &
+    $(cli_owl_lib) &
+    $(cli_cfloat_lib) &
     $(cli_dwarfw_lib)
 !else
-cg_libs = &
+cli_cg_libs = &
     $(o_dir)/cg$(target_cpu).lib &
     $(o_dir)/$(cg_target_host_name).lib &
-    $(cfloat_lib) &
+    $(cli_cfloat_lib) &
     $(cli_dwarfw_lib)
 !endif

bld/cg/mif/rules.mif

@@ -12,7 +12,7 @@ extra_c_flags_memmgt    = $(track_flags_$(host_cpu))
 extra_c_flags_trmem     = $(track_flags_$(host_cpu))
 !endif
 
-inc_dirs = -I. $(inc_dirs_targ) -I"$(cg_dir)/h" $(cfloat_inc_dirs) $(cli_dwarfw_inc_dirs) -I"$(comp_cfg_dir)/h"
+inc_dirs = -I. $(inc_dirs_targ) -I"$(cg_dir)/h" $(cli_cfloat_inc_dirs) $(cli_dwarfw_inc_dirs) -I"$(comp_cfg_dir)/h"
 
 .c: $(src_path);$(watcom_dir)/c;$(trmem_dir)
 .asm: $(asm_path)

bld/cg/mif/target.mif

@@ -2,7 +2,7 @@ target_objs = $($(target_cpu)_objs) $($(target_cls)_objs) $(cg_objs)
 
 !ifdef dll_cg
 
-libs = cg$(target_cpu).lib $(cg_target_host_name).lib $(cli_dwarfw_lib) $(owl_lib) $(cfloat_lib)
+libs = cg$(target_cpu).lib $(cg_target_host_name).lib $(cli_dwarfw_lib) $(cli_owl_lib) $(cli_cfloat_lib)
 
 target : $(pre_obj_deps) cg$(target_cpu).dll cgdllcli.lib .SYMBOLIC
     @%null

bld/cg/risc/master.mif

@@ -20,6 +20,6 @@ risc_objs = &
         rscqueue.obj
 
 src_path        = $(cg_dir)/$(target_cls)/$(target_cpu)/c;$(cg_dir)/$(target_cls)/c
-inc_dirs_targ   = -I"$(cg_dir)/$(target_cls)/$(target_cpu)/h" -I"$(cg_dir)/$(target_cls)/h" -I"$(owl_dir)/h"
+inc_dirs_targ   = -I"$(cg_dir)/$(target_cls)/$(target_cpu)/h" -I"$(cg_dir)/$(target_cls)/h" $(cli_owl_inc_dirs)
 
 !include $(cg_dir)/mif/master.mif

bld/f77/f77lib/master.mif

@@ -71,8 +71,8 @@ errmsg.grc errgrp.gc errcod.gh: $(f77_dir)/h/error.msg
 jerrmsg.grc:  $(f77_dir)/h/error.msg
     errsrc $[@ jo r
 
-rc_inc_dirs = -I. -I.. -I"$(f77lib_dir)/h" -I"$(f77_dir)/h" $(asminline_inc_dirs) -I"$(comp_cfg_dir)/h" -I"$(fe_misc_dir)/h"
+rc_inc_dirs = -I. -I.. -I"$(f77lib_dir)/h" -I"$(f77_dir)/h" $(cli_asminline_rc_inc_dirs) -I"$(comp_cfg_dir)/h" -I"$(fe_misc_dir)/h"
 
-errmsg.res : $(f77lib_dir)/h/errmsg.rc errmsg.grc jerrmsg.grc $(f77_dir)/h/errcod.h errcod.gh
+errmsg.res : $(f77lib_dir)/h/errmsg.rc errmsg.grc jerrmsg.grc $(f77_dir)/h/errcod.h errcod.gh $(cli_asminline_rc_depends)
     @%make echo_rc
     $(rcu8j) $(ppflags_common) $(rc_cppflags) $(rc_flags) $(rc_inc_path) $[@ -fo=$@

bld/f77/wfc/files.mif

@@ -186,7 +186,7 @@ tdovl1 += &
     wf77aux.obj &
     asmalloc.obj &
     asmmsg.obj &
-    $(asminline_objs)
+    $(cli_asminline_objs)
 
 tdovl2 = &
     fccall.obj &
@@ -247,7 +247,7 @@ dbfiles = &
 
 # code generator extra files
 
-dbfiles += $(cg_objs)
+dbfiles += $(cli_cg_objs)
 
 # platform specific files
 

bld/f77/wfc/master.mif

@@ -32,11 +32,11 @@ exetarg_name = $(exename_$(target_cpu))
 #
 # cflags
 #
-.c: $(f77wfc_dir)/c;$(asminline_c);$(trmem_dir);$(watcom_dir)/c;$(fe_misc_dir)/h
+.c: $(f77wfc_dir)/c;$(cli_asminline_c);$(trmem_dir);$(watcom_dir)/c;$(fe_misc_dir)/h
 
 inc_dirs= -I. -I.. -I"$(f77wfc_dir)/h" -I"$(f77_dir)/h" &
-    $(cg_inc_dirs) $(cli_dwarfw_inc_dirs) $(cfloat_inc_dirs) -I"$(comp_cfg_dir)/h" -I"$(fe_misc_dir)/h" &
-    $(asminline_inc_dirs) -I"$(clib_dir)/h" -I"$(lib_misc_dir)/h"
+    $(cli_cg_inc_dirs) $(cli_dwarfw_inc_dirs) $(cli_cfloat_inc_dirs) -I"$(comp_cfg_dir)/h" -I"$(fe_misc_dir)/h" &
+    $(cli_asminline_inc_dirs) $(cli_owl_inc_dirs) -I"$(clib_dir)/h" -I"$(lib_misc_dir)/h"
 
 extra_cpp_flags =
 !ifdef dll_cg
@@ -59,9 +59,9 @@ extra_a_flags_axp = -oc
 #
 # EXE
 #
-exetarg_prebuild_objs = $(asminline_deps) usage.gh wfcmsgs.gh code$(target_cpu).gh
+exetarg_prebuild_objs = $(cli_asminline_deps) usage.gh wfcmsgs.gh code$(target_cpu).gh
 exetarg_objs          = $(fobjs) $(trmem_objs) $(trmemcvr_objs)
-exetarg_libs          = $(asminline_lib) $(cg_libs)
+exetarg_libs          = $(cli_asminline_lib) $(cli_cg_libs)
 exetarg_res           = $(proj_name).res
 !include exetarg.mif
 
@@ -72,11 +72,11 @@ ntverrc_exe = $(exetarg_name)
 !include ntverrc.mif
 
 rc_inc_dirs = -I. -I.. -I"$(f77wfc_dir)/h" -I"$(f77_dir)/h" &
-    $(asminline_inc_dirs) -I"$(comp_cfg_dir)/h" -I"$(fe_misc_dir)/h"
+    $(cli_asminline_rc_inc_dirs) -I"$(comp_cfg_dir)/h" -I"$(fe_misc_dir)/h"
 
 extra_rc_flags_nt = $(ntverrc_dep) $(ntverrc_inc_dirs)
 
-$(proj_name).res : $(f77wfc_dir)/h/wfc.rc $(ntverrc_exe_dep) $(f77wfc_dir)/h/wfc.rh
+$(proj_name).res : $(f77wfc_dir)/h/wfc.rc $(ntverrc_exe_dep) $(f77wfc_dir)/h/wfc.rh $(cli_asminline_rc_depends)
     @%make echo_rc
     $(rcu8j) $(ppflags_common) $(rc_cppflags) $(rc_flags) $(rc_inc_path) $[@ -fo=$@
 

bld/owl/client.mif

@@ -3,22 +3,22 @@
 #
 
 !ifdef bootstrap
-owl_lib = $(owl_dir)/$(objs_subdir)/owl.lib
+cli_owl_lib = $(owl_dir)/$(objs_subdir)/owl.lib
 !else ifdef $(proj_name)_rtdll
 #
 # OWL run-time DLL used
 #
-owl_lib = $(owl_dir)/$(objs_subdir).rtd/owl.lib
+cli_owl_lib = $(owl_dir)/$(objs_subdir).rtd/owl.lib
 !else ifdef $(proj_name)_dll
 #
 # OWL DLL used
 #
-owl_lib = $(owl_dir)/$(objs_subdir).dll/owl.lib
+cli_owl_lib = $(owl_dir)/$(objs_subdir).dll/owl.lib
 !else
 #
 # OWL library used
 #
-owl_lib = $(owl_dir)/$(objs_subdir)/owl.lib
+cli_owl_lib = $(owl_dir)/$(objs_subdir)/owl.lib
 !endif
 
-owl_inc_dirs = -I"$(owl_dir)/h"
+cli_owl_inc_dirs = -I"$(owl_dir)/h"

bld/owl/master.mif

@@ -5,12 +5,14 @@ owl_autodepends = .autodepend
 !include defrule.mif
 !include deftarg.mif
 
+!include $(owl_dir)/client.mif
+
 #
 # cflags
 #
 .c: $(owl_dir)/c
 
-inc_dirs = -I"../h"
+inc_dirs = $(cli_owl_inc_dirs)
 
 # explicit rules
 #################

bld/plusplus/master.mif

@@ -44,10 +44,10 @@ intname     = wpp$(target_cpu)
 #
 # cflags
 #
-.c: ../../c;$(asminline_c);$(fe_misc_dir)/c;$(brinfo_dir)/c;$(cpp_c_dirs);$(trmem_dir);$(watcom_dir)/c
+.c: ../../c;$(cli_asminline_c);$(fe_misc_dir)/c;$(brinfo_dir)/c;$(cpp_c_dirs);$(trmem_dir);$(watcom_dir)/c
 
-inc_dirs = -I. -I.. -I"../../h" $(cg_inc_dirs) $(asminline_inc_dirs) $(cpp_inc_dirs) $(cli_dwarfw_inc_dirs) &
-    $(cfloat_inc_dirs) -I"$(cc_dir)/h" -I"$(comp_cfg_dir)/h" -I"$(fe_misc_dir)/h" -I"$(brinfo_dir)/h"
+inc_dirs = -I. -I.. -I"../../h" $(cli_cg_inc_dirs) $(cli_asminline_inc_dirs) $(cli_owl_inc_dirs) $(cpp_inc_dirs) $(cli_dwarfw_inc_dirs) &
+    $(cli_cfloat_inc_dirs) -I"$(cc_dir)/h" -I"$(comp_cfg_dir)/h" -I"$(fe_misc_dir)/h" -I"$(brinfo_dir)/h"
 
 extra_cpp_flags = -DINCL_MSGTEXT
 !ifndef plusplus_dll
@@ -140,7 +140,7 @@ prebuild_objs = &
     keywords.gh &
     yylex.gh &
     cmdlnprs.gh &
-    $(asminline_deps) &
+    $(cli_asminline_deps) &
     code$(target_cpu).gh &
     $(intname)01.int        # international data files
 !ifdef plusplus_dll
@@ -151,7 +151,7 @@ exetarg_libs          = $(dlltarg_name).lib $(exetarg_libs_$(host_os))
 !else
 exetarg_prebuild_objs = $(prebuild_objs)
 exetarg_objs          = $(comp_objs_exe)
-exetarg_libs          = $(asminline_lib) $(cg_libs)
+exetarg_libs          = $(cli_asminline_lib) $(cli_cg_libs)
 !endif
 exetarg_qnx_res       = usage.u
 !ifdef ntverrc_exe_out
@@ -164,7 +164,7 @@ exetarg_res           = $(ntverrc_exe_out)
 #
 dlltarg_prebuild_objs = $(dll_subdir) $(prebuild_objs)
 dlltarg_objs          = $(comp_objs_dll)
-dlltarg_libs          = $(asminline_lib) $(cg_libs)
+dlltarg_libs          = $(cli_asminline_lib) $(cli_cg_libs)
 !ifdef ntverrc_dll_out
 dlltarg_res           = $(ntverrc_dll_out)
 !endif

bld/plusplus/ppobjs.mif

@@ -247,7 +247,7 @@ plusplus_objs_axp = $(_subdir_)cmdlnrsc.obj $(_subdir_)cpragrsc.obj $(_subdir_)p
 plusplus_objs_ppc = $(_subdir_)cmdlnrsc.obj $(_subdir_)cpragrsc.obj $(_subdir_)pragppc.obj
 plusplus_objs_mps = $(_subdir_)cmdlnrsc.obj $(_subdir_)cpragrsc.obj $(_subdir_)pragmps.obj
 
-plusplus_template = $(common_objs) $(plusplus_matherr_objs) $(debug_objs) $(asminline_objs) $(cg_objs) $(plusplus_objs_$(target_cpu)) $(plusplus_trmem_objs)
+plusplus_template = $(common_objs) $(plusplus_matherr_objs) $(debug_objs) $(cli_asminline_objs) $(cli_cg_objs) $(plusplus_objs_$(target_cpu)) $(plusplus_trmem_objs)
 
 comp_objs_drv = $(drv_objs)
 _subdir_ = $(dll_subdir)/