ow-build: move ppfmttm.* source files to global directories bld/watcom

winspool · Jun 1, 2024 · ecddf25 · ecddf25
1 parent 5b6b5ef
commit ecddf25
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/bld/cc/master.mif b/bld/cc/master.mif
@@ -55,9 +55,9 @@ $(bin_subdir) : .EXPLICIT
 #
 # cflags
 #
-.c: ../../c;$(cli_asminline_c);$(fe_misc_dir)/c;$(cpp_dir)/c;$(watcom_dir)/c
+.c: ../../c;$(cli_asminline_c);$(fe_misc_dir)/c;$(watcom_dir)/c
 
-inc_dirs  = -I. -I.. -I"../../h" $(cli_cg_inc_dirs) $(cli_asminline_inc_dirs) $(cli_owl_inc_dirs) -I"$(cpp_dir)/h" $(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) $(cli_dwarfw_inc_dirs) -I"$(comp_cfg_dir)/h" -I"$(fe_misc_dir)/h"
 
 extra_cpp_flags = -DINCL_MSGTEXT
 !ifndef cc_dll

diff --git a/bld/cpp/master.mif b/bld/cpp/master.mif
@@ -14,9 +14,9 @@ wcpp_autodepends = .AUTODEPEND
 #
 # cflags
 #
-.c : ../c;$(posix_dir)/misc;$(watcom_dir)/c
+.c : $(cli_cpp_c_dirs);$(posix_dir)/misc;$(watcom_dir)/c
 
-inc_dirs = -I"../h" -I"$(posix_dir)/h"
+inc_dirs = $(cli_cpp_inc_dirs) -I"$(posix_dir)/h"
 
 # explicit rules
 #################

diff --git a/bld/parsedlg/master.mif b/bld/parsedlg/master.mif
@@ -11,7 +11,7 @@ parsedlg_autodepends = .AUTODEPEND
 #
 .c: ../c
 
-inc_dirs = -I"../h" -I"$(watcom_dir)/h"
+inc_dirs = -I"../h"
 
 # explicit rules
 #################

diff --git a/bld/plusplus/master.mif b/bld/plusplus/master.mif
@@ -42,9 +42,9 @@ intname     = wpp$(target_cpu)
 #
 # cflags
 #
-.c: ../../c;$(cli_asminline_c);$(fe_misc_dir)/c;$(brinfo_dir)/c;$(cpp_dir)/c;$(trmem_dir);$(watcom_dir)/c
+.c: ../../c;$(cli_asminline_c);$(fe_misc_dir)/c;$(brinfo_dir)/c;$(trmem_dir);$(watcom_dir)/c
 
-inc_dirs = -I. -I.. -I"../../h" $(cli_cg_inc_dirs) $(cli_asminline_inc_dirs) $(cli_owl_inc_dirs) -I"$(cpp_dir)/h" $(cli_dwarfw_inc_dirs) &
+inc_dirs = -I. -I.. -I"../../h" $(cli_cg_inc_dirs) $(cli_asminline_inc_dirs) $(cli_owl_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

diff --git a/bld/cpp/c/ppfmttm.c → bld/watcom/c/ppfmttm.c b/bld/cpp/c/ppfmttm.c → bld/watcom/c/ppfmttm.c
diff --git a/bld/cpp/h/ppfmttm.h → bld/watcom/h/ppfmttm.h b/bld/cpp/h/ppfmttm.h → bld/watcom/h/ppfmttm.h