ow-build: correct build make files for qnx target

winspool · Jun 9, 2024 · fb47d32 · fb47d32
1 parent 0d868e5
commit fb47d32
Show file tree

Hide file tree

Showing 15 changed files with 56 additions and 76 deletions.
diff --git a/bld/as/master.mif b/bld/as/master.mif
@@ -254,15 +254,13 @@ $(asi_lex_out).c : scani_in.re $(__MAKEFILES__)
     $(noecho)re2c $(lex_flags) $[@ > $@
 
 # optencod options and targets for various hosts
-!ifdef exetarg_qnx_res
-optencod_opt_qnx    = -u=$(exetarg_qnx_res)
-!endif
 #optencod_enc_linux  = -utf8
+
 optencod_targets = $(target_cpu) $(host_os)
 !ifeq debug 2
 optencod_targets += dbg
 !endif
 
-cmdlnprs.gh cmdlnprs.gc usage.gh $(exetarg_$(host_os)_res) : ../../h/options.gml $(__MAKEFILES__)
+cmdlnprs.gh cmdlnprs.gc usage.gh : ../../h/options.gml $(__MAKEFILES__)
     @%make echo_optencod
-    $(noecho)*optencod -q -rc=MSG_USAGE_BASE -utf8 $(optencod_opt_$(host_os)) $[@ cmdlnprs.gh cmdlnprs.gc usage.gh . $(optencod_targets)
+    $(optencod) -rc=MSG_USAGE_BASE -utf8 $(optencod_opt_$(host_os)) $[@ cmdlnprs.gh cmdlnprs.gc usage.gh . $(optencod_targets)
diff --git a/bld/bdiff/master.mif b/bld/bdiff/master.mif
@@ -144,15 +144,15 @@ rc_inc_dirs = -I..
 
 ppusage.gh : ../gml/optionsp.gml $(__MAKEFILES__)
     @%make echo_optencod
-    $(noecho)*optencod -q -rc=MSG_USAGE_BASE -utf8 $(optencod_opt_$(host_os)) $[@ . . $@ .
+    $(optencod) -rc=MSG_USAGE_BASE -utf8 $(optencod_opt_$(host_os)) $[@ . . $@ .
 
 pdusage.gh : ../gml/optionsu.gml $(__MAKEFILES__)
     @%make echo_optencod
-    $(noecho)*optencod -q -rc=MSG_USAGE_BASE -utf8 $(optencod_opt_$(host_os)) $[@ . . $@ .
+    $(optencod) -rc=MSG_USAGE_BASE -utf8 $(optencod_opt_$(host_os)) $[@ . . $@ .
 
 dusage.gh : ../gml/optionsi.gml $(__MAKEFILES__)
     @%make echo_optencod
-    $(noecho)*optencod -q -rc=MSG_USAGE_BASE -utf8 $(optencod_opt_$(host_os)) $[@ . . $@ .
+    $(optencod) -rc=MSG_USAGE_BASE -utf8 $(optencod_opt_$(host_os)) $[@ . . $@ .
 
 bpatch.res : ../h/bpatch.rc ../h/bpatch.h ppusage.gh
     @%make echo_rc

diff --git a/bld/cc/master.mif b/bld/cc/master.mif
@@ -6,6 +6,8 @@ cc_autodepends = .AUTODEPEND
 
 cc_ntverrc = ..
 
+cc_qnx_usage = 1
+
 #
 # names
 #
@@ -144,7 +146,6 @@ exetarg_prebuild_objs = $(prebuild_objs)
 exetarg_objs          = $(comp_objs_exe)
 exetarg_libs          = $(cli_asminline_libs) $(cli_cg_libs)
 !endif
-exetarg_qnx_res       = usage.u
 exetarg_name          = $(exetarg_name)
 !include exetarg.mif
 
@@ -217,15 +218,13 @@ weights.gh keywords.gh : $(key_objs)
     $(noecho)findhash -q -e ",OPR_NOP,-1" $(key_objs)
 
 # optencod options and targets for various hosts
-!ifdef exetarg_qnx_res
-optencod_opt_qnx    = -u=$(exetarg_qnx_res)
-!endif
 #optencod_enc_linux  = -utf8
+
 optencod_targets = $(target_cpu) $(host_os)
 !ifeq debug 2
 optencod_targets += dbg
 !endif
 
-cmdlnprs.gh cmdlnprs.gc usage.gh usage01.int $(exetarg_$(host_os)_res): ../../gml/options.gml
+cmdlnprs.gh cmdlnprs.gc usage.gh usage01.int $(qnx_usage): ../../gml/options.gml
     @%make echo_optencod
-    $(noecho)*optencod -q -i -n $(optencod_opt_$(host_os)) $(optencod_enc_$(host_os)) $]@ cmdlnprs.gh cmdlnprs.gc usage.gh . $(optencod_targets)
+    $(optencod) -i -n $(optencod_opt_$(host_os)) $(optencod_enc_$(host_os)) $]@ cmdlnprs.gh cmdlnprs.gc usage.gh . $(optencod_targets)
diff --git a/bld/f77/wfc/master.mif b/bld/f77/wfc/master.mif
@@ -12,6 +12,8 @@ wfc_trmem = 1
 
 wfc_wreslib_cli = text
 
+wfc_qnx_usage = 1
+
 additional_clean = *.gh *.grh *.grc
 
 exename_i86 = wfc
@@ -122,15 +124,13 @@ wfcmsgs.gh wfcmsgs.grh wfcgrps.gh wfcattrs.gh : $(f77wfc_dir)/gml/wfcmsgs.gml
     $(noecho)*msgencod -q -s -ip -rc=MSG_LANG_BASE -utf8 $(msgencod_enc_$(host_os)) $[@ wfcmsgs.gh wfcmsgs.grh wfcgrps.gh wfcattrs.gh
 
 # .gh options and targets for various hosts
-!ifdef exetarg_qnx_res
-optencod_opt_qnx    = -u=$(exetarg_qnx_res)
-!endif
 #optencod_enc_linux  = -utf8
+
 optencod_targets = $(target_cpu) $(host_os)
 !ifeq debug 2
 optencod_targets += dbg
 !endif
 
-usage.gh $(exetarg_$(host_os)_res) : $(f77_dir)/gml/options.gml $(__MAKEFILES__)
+usage.gh $(qnx_usage) : $(f77_dir)/gml/options.gml $(__MAKEFILES__)
     @%make echo_optencod
-    $(noecho)*optencod -q -rc=MSG_USAGE_BASE -utf8 $(optencod_opt_$(host_os)) $[@ . . $@ . $(optencod_targets)
+    $(optencod) -rc=MSG_USAGE_BASE -utf8 $(optencod_opt_$(host_os)) $[@ . . $@ . $(optencod_targets)
diff --git a/bld/f77/wfl/master.mif b/bld/f77/wfl/master.mif
@@ -75,16 +75,14 @@ wflmsgs.gh wflmsgs.grh : $(f77wfl_dir)/gml/wflmsgs.gml
 
 
 # optencod options and targets for various hosts
-!ifdef exetarg_qnx_res
-optencod_opt_qnx    = -u=$(exetarg_qnx_res)
-!endif
 #optencod_enc_linux  = -utf8
+
 optencod_targets_i86 = targ2
 optencod_targets = $(target_cpu) $(host_os) targ1 $(optencod_targets_$(target_cpu))
 !ifeq debug 2
 optencod_targets += dbg
 !endif
 
-usage.gh $(exetarg_$(host_os)_res) : $(f77_dir)/gml/options.gml $(__MAKEFILES__)
+usage.gh : $(f77_dir)/gml/options.gml $(__MAKEFILES__)
     @%make echo_optencod
-    $(noecho)*optencod -q -rc=MSG_USAGE_BASE -utf8 $(optencod_opt_$(host_os)) $[@ . . $@ . $(optencod_targets)
+    $(optencod) -rc=MSG_USAGE_BASE -utf8 $(optencod_opt_$(host_os)) $[@ . . $@ . $(optencod_targets)
diff --git a/bld/mstools/master.mif b/bld/mstools/master.mif
@@ -62,4 +62,4 @@ optencod_targets += dbg
 
 cmdlnprs.gc cmdlnprs.gh usagemsg.gh : ../../gml/options.gml .EXPLICIT
     @%make echo_optencod
-    $(noecho)*optencod -q -n $(optencod_enc_$(host_os)) $]@ cmdlnprs.gh cmdlnprs.gc usagemsg.gh . $(optencod_targets)
+    $(optencod) -n $(optencod_enc_$(host_os)) $]@ cmdlnprs.gh cmdlnprs.gc usagemsg.gh . $(optencod_targets)
diff --git a/bld/ndisasm/master.mif b/bld/ndisasm/master.mif
@@ -10,6 +10,8 @@ wdis_trmem = 1
 
 wdis_wreslib_cli = text
 
+wdis_qnx_usage = 1
+
 additional_clean = *.gh *.grh *.grc
 
 !include cproj.mif
@@ -77,7 +79,6 @@ exetarg_objs = &
     $(trmem_objs)
 exetarg_libs          = $(cli_orl_libs)
 exetarg_res           = $(proj_name).res
-exetarg_qnx_res       = usage.u
 !include exetarg.mif
 
 #
@@ -101,14 +102,11 @@ msg.grh : ../stand/wdis.msg $(__MAKEFILES__)
     @%make echo_awk
     $(noecho)*awk -v base=WDIS_LITERAL_BASE -f $(build_dir)/makemsg.awk -v OUTFILE=$^. $[@
 
-!ifdef exetarg_qnx_res
-optencod_opt_qnx = -u=$(exetarg_qnx_res)
-!endif
 optencod_targets = $(host_os)
 !ifeq debug 2
 optencod_targets += dbg
 !endif
 
-usage.gh $(exetarg_$(host_os)_res): ../stand/options.gml $(__MAKEFILES__)
+usage.gh $(qnx_usage): ../stand/options.gml $(__MAKEFILES__)
     @%make echo_optencod
-    $(noecho)*optencod -q -rc=MSG_USAGE_BASE -utf8 $(optencod_opt_$(host_os)) $[@ . . $@ . $(optencod_targets)
+    $(optencod) -rc=MSG_USAGE_BASE -utf8 $(optencod_opt_$(host_os)) $[@ . . $@ . $(optencod_targets)
diff --git a/bld/nwlib/master.mif b/bld/nwlib/master.mif
@@ -13,6 +13,8 @@ wlib_trmem = 1
 wlib_wreslib_cli = text
 !endif
 
+wlib_qnx_usage = 1
+
 # Base DLL name needs to be 8 chars or less on OS/2, argh! Additionally,
 # internal module name may be required to match file name on some platforms.
 !ifdef bootstrap
@@ -180,19 +182,16 @@ msg.grh :  ../h/wlib.msg $(__MAKEFILES__)
     @%make echo_awk
     $(noecho)*awk -v base=MSG_RC_BASE -f $(build_dir)/makemsg.awk -v OUTFILE=$^. $[@
 
-!ifdef exetarg_qnx_res
-optencod_opt_qnx    = -u=$(exetarg_qnx_res)
-!endif
 optencod_targets = $(host_os)
 !ifeq debug 2
 optencod_targets += dbg
 !endif
 
-usagew.gh $(exetarg_qnx_res) : ../optionsw.gml $(__MAKEFILES__)
+usagew.gh $(qnx_usage) : ../optionsw.gml $(__MAKEFILES__)
     @%make echo_optencod
-    $(noecho)*optencod -q -rc=MSG_USAGE_WLIB_BASE -x=_W -utf8 $(optencod_opt_$(host_os)) $[@ cmdlprsw.gh cmdlprsw.gc $@ cmdlnprs.gh $(optencod_targets)
+    $(optencod) -rc=MSG_USAGE_WLIB_BASE -x=_W -utf8 $(optencod_opt_$(host_os)) $[@ cmdlprsw.gh cmdlprsw.gc $@ cmdlnprs.gh $(optencod_targets)
 
 usagea.gh : ../optionsa.gml $(__MAKEFILES__)
     @%make echo_optencod
-    $(noecho)*optencod -q -p -x=_B -utf8 $[@ cmdlprsb.gh cmdlprsb.gc . . $(optencod_targets)
-    $(noecho)*optencod -q -rc=MSG_USAGE_AR_BASE -x=_A -utf8 $[@ cmdlprsa.gh cmdlprsa.gc $@ cmdlnprs.gh targ1 $(optencod_targets)
+    $(optencod) -p -x=_B -utf8 $[@ cmdlprsb.gh cmdlprsb.gc . . $(optencod_targets)
+    $(optencod) -rc=MSG_USAGE_AR_BASE -x=_A -utf8 $[@ cmdlprsa.gh cmdlprsa.gc $@ cmdlnprs.gh targ1 $(optencod_targets)
diff --git a/bld/plusplus/master.mif b/bld/plusplus/master.mif
@@ -6,6 +6,8 @@ plusplus_autodepends = .AUTODEPEND
 
 plusplus_ntverrc = ..
 
+plusplus_qnx_usage = 1
+
 # Important! The C++ compiler modifies string literals
 #suppress_zc = 1
 
@@ -155,7 +157,6 @@ exetarg_prebuild_objs = $(prebuild_objs)
 exetarg_objs          = $(comp_objs_exe)
 exetarg_libs          = $(cli_asminline_libs) $(cli_cg_libs)
 !endif
-exetarg_qnx_res       = usage.u
 !include exetarg.mif
 
 #
@@ -213,18 +214,16 @@ ytab.c ytab.h : ../../y/plusplus.y ../../c/yydriver.c
     diff y.out ../../y/plusplus.chk
 
 # optencod options and targets for various hosts
-!ifdef exetarg_qnx_res
-optencod_opt_qnx    = -u=$(exetarg_qnx_res)
-!endif
 #optencod_enc_linux  = -utf8
+
 optencod_targets = $(target_cpu) $(host_os)
 !ifeq debug 2
 optencod_targets += dbg
 !endif
 
-cmdlnprs.gh cmdlnprs.gc cmdlnusg.gh usage01.int $(exetarg_qnx_res) : ../../gml/options.gml
+cmdlnprs.gh cmdlnprs.gc cmdlnusg.gh usage01.int $(qnx_usage) : ../../gml/options.gml
     @%make echo_optencod
-    $(noecho)*optencod -q -i -n $(optencod_opt_$(host_os)) $(optencod_enc_$(host_os)) $[@ cmdlnprs.gh cmdlnprs.gc cmdlnusg.gh . $(optencod_targets)
+    $(optencod) -i -n $(optencod_opt_$(host_os)) $(optencod_enc_$(host_os)) $[@ cmdlnprs.gh cmdlnprs.gc cmdlnusg.gh . $(optencod_targets)
 
 ./icmask.exe : ../../c/icmask.c
     @%make echo_bldccl

diff --git a/bld/rc/rc/master.mif b/bld/rc/rc/master.mif
@@ -184,7 +184,6 @@ exetarg_libs          = $(dlltarg_name).lib
 exetarg_prebuild_objs = $(misc_objs) $(prebuild_objs)
 exetarg_objs          = $(objs_exe)
 !ifndef bootstrap
-exetarg_qnx_res       = usage.u
 exetarg_res           = wresexe.res
 !endif
 !endif
@@ -239,17 +238,14 @@ rcmsg.grh : ../h/rc.msg
 $(misc_objs):
     cat ../$@ >$@
 
-!ifdef exetarg_qnx_res
-optencod_opt_qnx = -u=$(exetarg_qnx_res)
-!endif
 optencod_targets = $(host_os)
 !ifeq debug 2
 optencod_targets += dbg
 !endif
 
-cmdlnprs.gh cmdlnprs.gc usage.gh $(exetarg_$(host_os)_res) : ../h/options.gml $(__MAKEFILES__)
+cmdlnprs.gh cmdlnprs.gc usage.gh : ../h/options.gml $(__MAKEFILES__)
     @%make echo_optencod
-    $(noecho)*optencod -q -rc=MSG_USAGE_BASE -utf8 $(optencod_opt_$(host_os)) $[@ cmdlnprs.gh cmdlnprs.gc $@ . $(optencod_targets)
+    $(optencod) -rc=MSG_USAGE_BASE -utf8 $(optencod_opt_$(host_os)) $[@ cmdlnprs.gh cmdlnprs.gc $@ . $(optencod_targets)
 
 ./cvttable.exe: ../c/cvttable.c $(__MAKEFILES__)
     @%make echo_bldccl

diff --git a/bld/wasm/master.mif b/bld/wasm/master.mif
@@ -12,6 +12,8 @@ wasm_trmem = 1
 
 wasm_wreslib_cli = text
 
+wasm_qnx_usage = 1
+
 # Extra files to delete on clean
 additional_clean = *.gh *.grh *.grc *.gc
 
@@ -103,7 +105,6 @@ exetarg_name       = bwasm
 !else
 exetarg_name       = wasm
 !endif
-exetarg_qnx_res    = usage.u
 exetarg_res        = $(proj_name).res
 !include exetarg.mif
 
@@ -120,14 +121,11 @@ wasmsmsg.grh : ../h/wasms.msg $(__MAKEFILES__)
     @%make echo_awk
     $(noecho)*awk -v base=MSG_WASM_BASE -f "$(build_dir)/makemsg.awk" -v OUTFILE=$^. $[@
 
-!ifdef exetarg_qnx_res
-optencod_opt_qnx    = -u=$(exetarg_qnx_res)
-!endif
 optencod_targets = $(host_os)
 !ifeq debug 2
 optencod_targets += dbg
 !endif
 
-cmdlnprs.gh cmdlnprs.gc usage.gh $(exetarg_$(host_os)_res) : ../h/options.gml $(__MAKEFILES__)
+cmdlnprs.gh cmdlnprs.gc usage.gh $(qnx_usage) : ../h/options.gml $(__MAKEFILES__)
     @%make echo_optencod
-    $(noecho)*optencod -q -rc=MSG_USAGE_BASE -utf8 $(optencod_opt_$(host_os)) $[@ cmdlnprs.gh cmdlnprs.gc $@ . $(optencod_targets)
+    $(optencod) -rc=MSG_USAGE_BASE -utf8 $(optencod_opt_$(host_os)) $[@ cmdlnprs.gh cmdlnprs.gc $@ . $(optencod_targets)
diff --git a/bld/wcl/master.mif b/bld/wcl/master.mif
@@ -77,15 +77,14 @@ optencod_opt = -n
 optencod_src = $(wcl_dir)/h/optionso.gml
 optencod_opt = -c
 !endif
-!ifdef exetarg_qnx_res
-optencod_opt_qnx = -u=$(exetarg_qnx_res)
-!endif
+
 #optencod_enc_linux  = -utf8
+
 optencod_targets = $(target_cpu) $(host_os)
 !ifeq debug 2
 optencod_targets += dbg
 !endif
 
 usage.gh : $(optencod_src) $(__MAKEFILES__)
     @%make echo_optencod
-    $(noecho)*optencod -q $(optencod_opt) $(optencod_opt_$(host_os)) $[@ . . $@ . $(optencod_targets)
+    $(optencod) $(optencod_opt) $(optencod_opt_$(host_os)) $[@ . . $@ . $(optencod_targets)
diff --git a/bld/wsample/master.mif b/bld/wsample/master.mif
@@ -8,6 +8,8 @@ wsample_ntverrc = ../h
 
 wsample_wreslib_cli = text
 
+wsample_qnx_usage = 1
+
 !ifndef target
 target = $(host_os)
 !endif
@@ -207,14 +209,11 @@ nversion.tmp: ./mknver.exe $(__MAKEFILES__)
     @%make echo_execute
     $(noecho)$[@ $@
 
-!ifdef exetarg_qnx_res
-optencod_opt_qnx    = -u=$(exetarg_qnx_res)
-!endif
 optencod_targets = $(target)
 !ifeq debug 2
 optencod_targets += dbg
 !endif
 
-usage.gh $(exetarg_$(host_os)_res) : ../h/options.gml $(__MAKEFILES__)
+usage.gh $(qnx_usage) : ../h/options.gml $(__MAKEFILES__)
     @%make echo_optencod
-    $(noecho)*optencod -q -rc=MSG_USAGE_BASE -utf8 $(optencod_opt_$(host_os)) $[@ . . $@ . $(optencod_targets)
+    $(optencod) -rc=MSG_USAGE_BASE -utf8 $(optencod_opt_$(host_os)) $[@ . . $@ . $(optencod_targets)
diff --git a/bld/wstrip/master.mif b/bld/wstrip/master.mif
@@ -8,6 +8,8 @@ wstrip_ntverrc = ../h
 wstrip_wreslib_cli = text
 !endif
 
+wstrip_qnx_usage = 1
+
 additional_clean = *.gh *.grh *.grc
 
 !ifdef bootstrap
@@ -59,14 +61,11 @@ msg.grh : ../h/wstrip.msg $(__MAKEFILES__)
     @%make echo_awk
     $(noecho)*awk -v base=MSG_RC_BASE -f $(build_dir)/makemsg.awk -v OUTFILE=$^. $[@
 
-!ifdef exetarg_qnx_res
-optencod_opt_qnx = -u=$(exetarg_qnx_res)
-!endif
 optencod_targets = $(host_os)
 !ifeq debug 2
 optencod_targets += dbg
 !endif
 
-usage.gh $(exetarg_$(host_os)_res) : ../h/options.gml $(__MAKEFILES__)
+usage.gh $(qnx_usage) : ../h/options.gml $(__MAKEFILES__)
     @%make echo_optencod
-    $(noecho)*optencod -q -rc=MSG_USAGE_BASE -utf8 $(optencod_opt_$(host_os)) $[@ . . $@ . $(optencod_targets)
+    $(optencod) -rc=MSG_USAGE_BASE -utf8 $(optencod_opt_$(host_os)) $[@ . . $@ . $(optencod_targets)