.pwg files with component prefix handled

src/tools/bld/src/os_linux/mmi_generic.mk

@@ -41,7 +41,7 @@ uil_sources := $(sort \
              ) \
            )
 
-pwg_sources := $(sort \
+pwg_c_sources := $(sort \
              $(foreach file, \
                $(foreach dir, \
                  $(source_dirs), \
@@ -50,6 +50,15 @@ pwg_sources := $(sort \
              ) \
            )
 
+pwg_sources := $(sort \
+             $(foreach file, \
+               $(foreach dir, \
+                 $(source_dirs), \
+                 $(wildcard $(dir)/$(comp_name)*.pwg) \
+               ), $(notdir $(file)) \
+             ) \
+           )
+
 pwsg_sources := $(sort \
              $(foreach file, \
                $(foreach dir, \
@@ -60,6 +69,7 @@ pwsg_sources := $(sort \
            )
 
 export_uid := $(addprefix $(exe_dir)/, $(patsubst %.uil, %.uid, $(uil_sources)))
+export_c_pwg := $(addprefix $(exe_dir)/, $(pwg_c_sources))
 export_pwg := $(addprefix $(exe_dir)/, $(pwg_sources))
 export_pwsg := $(addprefix $(exe_dir)/, $(pwsg_sources))
 
@@ -68,6 +78,7 @@ $(exe_dir)/%.uid : %.uil
 	@ export -n LANG; uil -o $(target) $(source)
 
 clean_uid := $(patsubst %.uil,clean_%.uid,$(uil_sources))
+clean_c_pwg := $(patsubst %.pwg,clean_%.pwg,$(pwg_c_sources))
 clean_pwg := $(patsubst %.pwg,clean_%.pwg,$(pwg_sources))
 clean_pwsg := $(patsubst %.pwsg,clean_%.pwsg,$(pwsg_sources))
 
@@ -78,7 +89,7 @@ all : init copy
 
 init : dirs
 
-copy : $(export_uid) $(export_pwg) $(export_pwsg)
+copy : $(export_uid) $(export_c_pwg) $(export_pwg) $(export_pwsg)
 
 lib :
 
@@ -98,6 +109,10 @@ $(clean_pwg) : clean_%.pwg : %.pwg
 	@ echo "Removing pwg"
 	@ $(rm) $(rmflags) $(exe_dir)/$*.pwg  
 
+$(clean_c_pwg) : clean_%.pwg : %.pwg
+	@ echo "Removing pwg"
+	@ $(rm) $(rmflags) $(exe_dir)/$*.pwg  
+
 $(clean_pwsg) : clean_%.pwsg : %.pwsg
 	@ echo "Removing pwsg"
 	@ $(rm) $(rmflags) $(exe_dir)/$*.pwsg