'pwre ebuild rt' works again

src/tools/bld/src/variables.mk

@@ -91,8 +91,13 @@ ifeq ($(pwre_conf_qt),1)
   csetos 	:= -DPWRE_CONF_QT $(pwre_conf_cc_define)
   cinc          := -I$(inc_dir) -I$(einc_dir) -I$(co_source) $(pwre_conf_incdir) $(pwre_conf_incdirqt)
 else
-  csetos 	:= -DPWRE_CONF_GTK $(pwre_conf_cc_define)
-  cinc          := -I$(inc_dir) -I$(einc_dir) -I$(co_source) $(pwre_conf_incdir) $(pwre_conf_incdirgtk) $(pwre_conf_incdirgst)
+  ifeq ($(pwre_conf_gtk),1)
+    csetos 	:= -DPWRE_CONF_GTK $(pwre_conf_cc_define)
+    cinc          := -I$(inc_dir) -I$(einc_dir) -I$(co_source) $(pwre_conf_incdir) $(pwre_conf_incdirgtk) $(pwre_conf_incdirgst)
+  else
+    csetos 	:= $(pwre_conf_cc_define)
+    cinc          := -I$(inc_dir) -I$(einc_dir) -I$(co_source) $(pwre_conf_incdir) $(pwre_conf_incdirgtk) $(pwre_conf_incdirgst)
+  endif
 endif
 rm		:= rm
 cp		:= cp

src/tools/pwre/src/import_files.mk

@@ -40,6 +40,8 @@ rt_modules = \
 		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/otherio/inc/pwr_otherioclasses.hpp \
 		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/remote/inc/pwr_remoteclasses.h \
 		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/remote/inc/pwr_remoteclasses.hpp \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/sev/inc/pwr_sevclasses.h \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/sev/inc/pwr_sevclasses.hpp \
 		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/abb/inc/pwr_abbclasses.h \
 		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/abb/inc/pwr_abbclasses.hpp \
 		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/inor/inc/pwr_inorclasses.h \
@@ -79,7 +81,7 @@ op_motif_modules = \
 java_modules = \
 		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/lib/pwr_rt.jar \
 		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/lib/pwr_jop.jar \
-		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/lib/pwr_jopc.jar \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/lib/pwr_jopg.jar \
 		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/lib/pwr_rt_client.jar
 
 
@@ -171,6 +173,14 @@ $(pwre_broot)/$(pwre_os)/$(pwre_hw)/remote/inc/%.hpp : $(pwre_vmsinc)/exp/inc/%.
 	@ echo Import ${target}
 	@ cp $(source) $(target)
 
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/sev/inc/%.h : $(pwre_vmsinc)/exp/inc/%.h
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/sev/inc/%.hpp : $(pwre_vmsinc)/exp/inc/%.hpp
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
 $(pwre_broot)/$(pwre_os)/$(pwre_hw)/abb/inc/%.h : $(pwre_vmsinc)/exp/inc/%.h
 	@ echo Import ${target}
 	@ cp $(source) $(target)

src/tools/pwre/src/pwre.pl

@@ -153,6 +153,7 @@ sub configure()
 
 sub set_flavour # args: flavour
 {
+  printf("Set flavour %s\n", $_[0]);
   if ($_[0] eq "qt") {
     $ENV{pwre_conf_qt} = "1";
   }
@@ -330,6 +331,7 @@ sub ebuild # args: pass flavour
   printf("\n");
   close FILE;
 
+  set_flavour("");
   my $pass = $_[0];
   my $flavour = $_[1];
 
@@ -348,16 +350,16 @@ sub ebuild # args: pass flavour
     _build("msg", "*", "src", "all");
     _build("lib", "rt", "src", "init");
     _build("lib", "rt", "src", "copy");
-    _build("lib", "rt", $flavour, "copy");
+#    _build("lib", "rt", $flavour, "copy");
     _build("lib", "co", "src", "init");
     _build("lib", "co", "src", "copy");
-    _build("lib", "co", $flavour, "copy");
+#    _build("lib", "co", $flavour, "copy");
     _build("lib", "dtt", "src", "init");
     _build("lib", "dtt", "src", "copy");
     _build("lib", "statussrv", "src", "init");
     _build("lib", "statussrv", "src", "copy");
     _build("lib", "co", "src", "all");
-    _build("lib", "co", $flavour, "all");
+#    _build("lib", "co", $flavour, "all");
     _build("exe", "co*", "src", "all");
     _build("exe", "*", "src", "copy");
     _build("exp", "stdsoap2", "src", "copy");
@@ -380,9 +382,11 @@ sub ebuild # args: pass flavour
     _build("lib","epl_dummy","src","init lib");
     _build("lib","piface_dummy","src","init lib");
     merge();
+    _module("sev");
+    merge();
     _module("rt");
     _build("exe", "rt*", "src", "all");
-    _build("exe", "co*", $flavour, "all");
+#    _build("exe", "co*", $flavour, "all");
     _build("exe", "pwr_user", "src", "all");
     if ($to_build{"nmps"}) {
       merge();

src/tools/pwre/src/pwre_configure.sh

@@ -17,7 +17,8 @@ Arguments
 --lock-dbs       Lock dbs-files. Dbs-files will not be rebuilt.
 --unlock-dbs     Unlock dbs-files
 --parallel       Build with parallel execution.
---not-parallel   Don't build with parallel execution
+--not-parallel   Don't build with parallel execution.
+--ebuild         Build with cross compilation.
 
 EOF
 }