Module separation

src/tools/pwre/src/os_linux/pwre.pl

@@ -171,6 +171,9 @@ sub build () # args: branch, subbranch, phase
 #
 sub build_all_modules ()
 {
+  _module("xtt");
+  build_all("copy");
+  merge();
   _module("kernel");
   build_all("copy");
   merge();
@@ -180,6 +183,9 @@ sub build_all_modules ()
   _module("kernel");
   build_all("lib");
   merge();
+  _module("xtt");
+  build_all("lib");
+  merge();
   _module("wb");
   build_all("lib");
   merge();
@@ -219,6 +225,9 @@ sub build_all_modules ()
   _module("telemecanique");
   build_all("copy");
   merge();
+  _module("xtt");
+  build_all("exe");
+  merge();
   _module("wb");
   build_all("exe");
   merge();
@@ -275,6 +284,8 @@ sub create_all_modules ()
 {
   _module("kernel");
   create();
+  _module("xtt");
+  create();
   _module("wb");
   create();
   _module("nmps");
@@ -360,12 +371,13 @@ sub build_all ()
       _build("lib", "co", "init copy");
       _build("lib", "dtt", "init copy");
 #      _build("exp", "wb", "init copy");
-      _build("lib", "flow", "all");
-      _build("lib", "glow", "all");
+#      _build("lib", "flow", "all");
+#      _build("lib", "glow", "all");
       _build("lib", "co", "all");
       _build("exe", "co*", "all");
       _build("wbl", "pwrs", "copy");
       _build("wbl", "pwrb", "copy");
+      _build("exe", "*", "copy");
     }
 
     if ( $lib == 1) {
@@ -422,6 +434,7 @@ sub build_all ()
       _build("lib", "*", "init copy");
       _build("exp", "*", "init copy");
       _build("mmi", "*", "copy");
+      _build("exe", "*", "copy");
     }
     if ( $lib == 1) {
       _build("lib", "*", "lib");

xtt/exe/rt_xtt/src/os_linux/hw_x86/makefile

 include $(pwre_dir_symbols)
 
--include $(pwre_sroot)/tools/bld/src/$(os_name)/$(hw_name)/$(type_name)_generic.mk
+-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/$(type_name)_generic.mk
 
 ifeq ($($(type_name)_generic_mk),)
- -include $(pwre_sroot)/tools/bld/src/$(os_name)/$(type_name)_generic.mk
+ -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(type_name)_generic.mk
 endif
 
 ifeq ($($(type_name)_generic_mk),)
- include $(pwre_sroot)/tools/bld/src/$(type_name)_generic.mk
+ include $(pwre_kroot)/tools/bld/src/$(type_name)_generic.mk
 endif
 
 -include ../../special.mk

xtt/exe/rt_xtt/src/os_linux/link_rule.mk

 ifndef link_rule_mk
 link_rule_mk := 1
 
-link = $(ldxx) $(linkflags) $(domap) -o $(export_exe) \
-	$(export_obj) $(objects) $(rt_msg_objs) \
-	$(pwr_obj)/rt_io_user.o -L/usr/X11R6/lib\
+link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
+	$(export_obj) $(objects) $(rt_msg_eobjs) \
+	$(pwr_eobj)/rt_io_user.o -L/usr/X11R6/lib\
 	-L/opt/gnome/lib \
-	-lpwr_ge -lpwr_rt -lpwr_co -lpwr_flow -lpwr_glow \
+	-lpwr_xtt -lpwr_ge -lpwr_rt -lpwr_co -lpwr_flow -lpwr_glow \
 	-lpwr_msg_dummy -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
         -lSM -lICE\
 	-ldb-4.0 -lrpcsvc -lpthread -lm -lrt -lasound

xtt/exp/ge/src/os_linux/hw_x86/makefile

 include $(pwre_dir_symbols)
 
 ifndef variables_mk
- -include $(pwre_sroot)/tools/bld/src/$(os_name)/$(hw_name)/variables.mk
+ -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/variables.mk
 endif
 ifndef variables_mk
- include $(pwre_sroot)/tools/bld/src/$(os_name)/variables.mk
+ include $(pwre_kroot)/tools/bld/src/$(os_name)/variables.mk
 endif
 
 
 ifndef rules_mk
- -include $(pwre_sroot)/tools/bld/src/$(os_name)/$(hw_name)/rules.mk
+ -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/rules.mk
 endif
 ifndef rules_mk
- include $(pwre_sroot)/tools/bld/src/$(os_name)/rules.mk
+ include $(pwre_kroot)/tools/bld/src/$(os_name)/rules.mk
 endif
 
 vpath %.pwg $(hw_source):$(os_source):$(co_source)

xtt/exp/inc/src/os_linux/hw_x86/makefile

@@ -41,7 +41,7 @@ all : init copy lib exe
 
 init :
 
-copy : $(export_includes) $(exe_dir)/pwrp_rules.mk
+copy : $(export_includes)
 
 lib :
 
@@ -54,9 +54,6 @@ realclean : $(clean_includes)
 $(clean_includes) : clean_%.h : %.h
 	@ $(rm) $(rmflags) $(inc_dir)/$*.h
 
-$(exe_dir)/pwrp_rules.mk : ../../pwrp_rules.mk
-	@ $(log_h_h)
-	@ $(cp) $(cpflags) $(source) $(target)
 
 
 

xtt/mmi/ge/src/os_linux/hw_x86/makefile

 include $(pwre_dir_symbols)
 
--include $(pwre_sroot)/tools/bld/src/$(os_name)/$(hw_name)/$(type_name)_generic.mk
+-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/$(type_name)_generic.mk
 
 ifeq ($($(type_name)_generic_mk),)
- -include $(pwre_sroot)/tools/bld/src/$(os_name)/$(type_name)_generic.mk
+ -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(type_name)_generic.mk
 endif
 
 ifeq ($($(type_name)_generic_mk),)
- include $(pwre_sroot)/tools/bld/src/$(type_name)_generic.mk
+ include $(pwre_kroot)/tools/bld/src/$(type_name)_generic.mk
 endif
 
 -include ../../special.mk

xtt/mmi/xtt/src/os_linux/hw_x86/makefile

 include $(pwre_dir_symbols)
 
-#-include $(pwre_sroot)/tools/bld/src/$(os_name)/$(hw_name)/$(type_name)_generic.mk
+#-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/$(type_name)_generic.mk
 
 ifeq ($($(type_name)_generic_mk),)
-# -include $(pwre_sroot)/tools/bld/src/$(os_name)/$(type_name)_generic.mk
+# -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(type_name)_generic.mk
 endif
 
 ifeq ($($(type_name)_generic_mk),)
-# include $(pwre_sroot)/tools/bld/src/$(type_name)_generic.mk
+# include $(pwre_kroot)/tools/bld/src/$(type_name)_generic.mk
 endif
 
 -include ../../special.mk

xtt/mmi/xtt/src/os_linux/hw_x86/special.mk

 
 ifndef variables_mk
- -include $(pwre_sroot)/tools/bld/src/$(os_name)/$(hw_name)/variables.mk
+ -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/variables.mk
 endif
 ifndef variables_mk
- include $(pwre_sroot)/tools/bld/src/$(os_name)/variables.mk
+ include $(pwre_kroot)/tools/bld/src/$(os_name)/variables.mk
 endif