Build fix for xtt/lib/ge

xtt/lib/ge/src/os_linux/hw_x86/lib_local.mk

-ifndef lib_local_mk
-lib_local_mk := 1
-
-vpath %.pwsg $(hw_source):$(os_source):$(co_source)
-vpath %.dat $(hw_source):$(os_source):$(co_source)
-
-pwsg_sources := $(sort \
-             $(foreach file, \
-               $(foreach dir, \
-                 $(source_dirs), \
-                 $(wildcard $(dir)/pwr_*.pwsg) \
-               ), $(notdir $(file)) \
-             ) \
-           )
-
-export_pwsg := $(addprefix $(exe_dir)/,$(pwsg_sources))
-clean_pwsg := $(patsubst %.pwsg, clean_%.pwsg, $(pwsg_sources))
-
-l_copy := $(export_pwsg) $(exe_dir)/pwr_ge_setup.dat $(src_dir)/ge_colors.dat
-l_clean_copy := $(clean_pwsg) clean_dat
-
-clean_dat :
-	@ $(rm) $(rmflags) $(exe_dir)/pwr_ge_setup.dat
-	@ $(rm) $(rmflags) $(src_dir)/ge_colors.dat
-	
-$(exe_dir)/pwr_ge_setup.dat : pwr_ge_setup.dat
-	@ $(log_export)
-	@ copy/nolog $(source) $(target)
-
-$(src_dir)/ge_colors.dat : ge_colors.dat
-	@ $(log_export)
-	@ $(cp) $(source) $(target)
-
-$(exe_dir)/%.pwsg : %.pwsg
-	@ $(log_export)
-	@ $(cp) $(source) $(target)
-
-$(clean_pwsg) : clean_%.pwsg : %.pwsg
-	@ $(rm) $(rmflags) $(exe_dir)/$(notdir $<)
-
-endif

xtt/lib/ge/src/os_linux/lib_local.mk → xtt/lib/ge/src/os_linux/hw_x86/special.mk

-ifndef lib_local_mk
-lib_local_mk := 1
+ifndef variables_mk
+ -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/variables.mk
+endif
+ifndef variables_mk
+ include $(pwre_kroot)/tools/bld/src/$(os_name)/variables.mk
+endif
 
-vpath %.dat $(hw_source):$(os_source):$(co_source)
+export_copy_local := $(exe_dir)/pwr_ge_setup.dat $(src_dir)/ge_colors.dat
 
-l_copy := $(exe_dir)/pwr_ge_setup.dat $(src_dir)/ge_colors.dat
-l_clean_copy :=
+copy : $(export_includes) $(l_copy) $(export_pwsg) $(export_meth) $(export_copy_local)
 
-clean_dat :
-	@ if [ -e $(exe_dir)/pwr_ge_setup.dat ]; then $(rm) $(rmflags) $(exe_dir)/pwr_ge_setup.dat; fi
-	@ if [ -e $(src_dir)/ge_colors.dat ]; then $(rm) $(rmflags) $(src_dir)/ge_colors.dat; fi
 
 $(exe_dir)/pwr_ge_setup.dat : ../../pwr_ge_setup.dat
 	@ echo "Copy $(source)"
 	@ $(cp) $(cpflags) $(source) $(target)
 
-$(src_dir)/ge_colors.dat : ge_colors.dat
+$(src_dir)/ge_colors.dat : ../../ge_colors.dat
 	@ echo "Copy $(source)"
 	@ $(cp) $(cpflags) $(source) $(target)
-
-endif

xtt/lib/ge/src/os_macos/lib_local.mk → xtt/lib/ge/src/os_linux/hw_x86_64/special.mk

-ifndef lib_local_mk
-lib_local_mk := 1
+ifndef variables_mk
+ -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/variables.mk
+endif
+ifndef variables_mk
+ include $(pwre_kroot)/tools/bld/src/$(os_name)/variables.mk
+endif
 
-vpath %.dat $(hw_source):$(os_source):$(co_source)
+export_copy_local := $(exe_dir)/pwr_ge_setup.dat $(src_dir)/ge_colors.dat
 
-l_copy := $(exe_dir)/pwr_ge_setup.dat $(src_dir)/ge_colors.dat
-l_clean_copy :=
+copy : $(export_includes) $(l_copy) $(export_pwsg) $(export_meth) $(export_copy_local)
 
-clean_dat :
-	@ if [ -e $(exe_dir)/pwr_ge_setup.dat ]; then $(rm) $(rmflags) $(exe_dir)/pwr_ge_setup.dat; fi
-	@ if [ -e $(src_dir)/ge_colors.dat ]; then $(rm) $(rmflags) $(src_dir)/ge_colors.dat; fi
 
 $(exe_dir)/pwr_ge_setup.dat : ../../pwr_ge_setup.dat
 	@ echo "Copy $(source)"
 	@ $(cp) $(cpflags) $(source) $(target)
 
-$(src_dir)/ge_colors.dat : ge_colors.dat
+$(src_dir)/ge_colors.dat : ../../ge_colors.dat
 	@ echo "Copy $(source)"
 	@ $(cp) $(cpflags) $(source) $(target)
-
-endif

xtt/lib/ge/src/os_macos/hw_x86_64/lib_local.mk

-ifndef lib_local_mk
-lib_local_mk := 1
-
-vpath %.pwsg $(hw_source):$(os_source):$(co_source)
-vpath %.dat $(hw_source):$(os_source):$(co_source)
-
-pwsg_sources := $(sort \
-             $(foreach file, \
-               $(foreach dir, \
-                 $(source_dirs), \
-                 $(wildcard $(dir)/pwr_*.pwsg) \
-               ), $(notdir $(file)) \
-             ) \
-           )
-
-export_pwsg := $(addprefix $(exe_dir)/,$(pwsg_sources))
-clean_pwsg := $(patsubst %.pwsg, clean_%.pwsg, $(pwsg_sources))
-
-l_copy := $(export_pwsg) $(exe_dir)/pwr_ge_setup.dat $(src_dir)/ge_colors.dat
-l_clean_copy := $(clean_pwsg) clean_dat
-
-clean_dat :
-	@ $(rm) $(rmflags) $(exe_dir)/pwr_ge_setup.dat
-	@ $(rm) $(rmflags) $(src_dir)/ge_colors.dat
-	
-$(exe_dir)/pwr_ge_setup.dat : pwr_ge_setup.dat
-	@ $(log_export)
-	@ copy/nolog $(source) $(target)
-
-$(src_dir)/ge_colors.dat : ge_colors.dat
-	@ $(log_export)
-	@ $(cp) $(source) $(target)
-
-$(exe_dir)/%.pwsg : %.pwsg
-	@ $(log_export)
-	@ $(cp) $(source) $(target)
-
-$(clean_pwsg) : clean_%.pwsg : %.pwsg
-	@ $(rm) $(rmflags) $(exe_dir)/$(notdir $<)
-
-endif

xtt/lib/ge/src/os_macos/hw_x86_64/special.mk

+ifndef variables_mk
+ -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/variables.mk
+endif
+ifndef variables_mk
+ include $(pwre_kroot)/tools/bld/src/$(os_name)/variables.mk
+endif
+
+export_copy_local := $(exe_dir)/pwr_ge_setup.dat $(src_dir)/ge_colors.dat
+
+copy : $(export_includes) $(l_copy) $(export_pwsg) $(export_meth) $(export_copy_local)
+
+
+$(exe_dir)/pwr_ge_setup.dat : ../../pwr_ge_setup.dat
+	@ echo "Copy $(source)"
+	@ $(cp) $(cpflags) $(source) $(target)
+
+$(src_dir)/ge_colors.dat : ../../ge_colors.dat
+	@ echo "Copy $(source)"
+	@ $(cp) $(cpflags) $(source) $(target)