libpwr_co_gtk, libpwr_co_motif, libpwr_co_gtk and libpwr_co_motif replaced by libpwr_cow

build-howto.info

@@ -230,6 +230,7 @@ x11proto-print-dev
 libxmu-dev
 libxmp-dev
 libxp-dev
+imlib11-dev
 
 build with 
 

java/exe/jpwr_rt_gdh/src/os_linux/link_rule.mk

@@ -4,7 +4,6 @@ link_rule_mk := 1
 link =	g++ -shared -DHW_X86 -DOS_LINUX \
 	-L${pwr_elib} \
 	-L${pwr_lib} \
-	-L/usr/X11R6/lib \
 	${pwre_broot}/${pwre_target}/bld/lib/co/*.o \
 	$(rt_msg_eobjs) \
 	${pwre_broot}/${pwre_target}/bld/lib/msg_dummy/msg_dummy_qcom.o \
@@ -14,7 +13,6 @@ link =	g++ -shared -DHW_X86 -DOS_LINUX \
 	${pwre_broot}/${pwre_target}/bld/lib/msg_dummy/msg_dummy_flow.o \
 	${pwre_broot}/${pwre_target}/bld/lib/msg_dummy/msg_dummy_pwrp.o \
 	${pwre_broot}/${pwre_target}/bld/lib/rt/*.o \
-	${pwre_broot}/${pwre_target}/bld/lib/flow/*.o \
 	${pwre_broot}/${pwre_target}/exp/obj/rt_io_user.o \
 	${pwre_broot}/${pwre_target}/exp/obj/dtt_rttsys.o \
 	${pwre_broot}/${pwre_target}/bld/exe/jpwr_rt_gdh/io_ssab_dummy.o \
@@ -28,10 +26,13 @@ link =	g++ -shared -DHW_X86 -DOS_LINUX \
 	${pwre_broot}/${pwre_target}/bld/lib/statussrv/*.o \
 	${pwre_broot}/${pwre_target}/exp/obj/stdsoap2.o \
 	-o ${pwr_exe}/libjpwr_rt_gdh.so -lm -lpthread -lrt -lcrypt -lpwr_dtt -lpwr_usbio_dummy \
-	`pkg-config --libs gtk+-2.0` \
 	-ldb
 
 #	-lSM -lICE -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
+#	${pwre_broot}/${pwre_target}/bld/lib/flow/*.o \
+#	${pwre_broot}/${pwre_target}/bld/lib/cow/*.o \
+#	`pkg-config --libs gtk+-2.0` \
+#	-L/usr/X11R6/lib \
 
 endif
 

profibus/exe/profinet_viewer/gtk/os_linux/link_rule.mk

 ifndef link_rule_mk
 link_rule_mk := 1
 
-link = $(ldxx) $(elinkflags) $(domap) -o $(pwr_exe)/profinet_viewer_gtk \
+link = $(ldxx)  -L$(elib_dir) $(elinkflags) $(domap) -o $(pwr_exe)/profinet_viewer_gtk \
 	$(bld_dir)/profinet_viewer_gtk.o \
 	$(bld_dir)/pn_viewer_gtk.o $(bld_dir)/pn_viewernav_gtk.o \
 	$(bld_dir)/pn_viewer.o $(bld_dir)/pn_viewernav.o $(bld_dir)/pn_viewer_pnac.o\
 	$(wb_msg_eobjs) $(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o -L/usr/X11R6/lib \
 	-L/opt/gnome/lib \
-	-lpwr_flow_gtk -lpwr_flow -lpwr_rt_gtk -lpwr_rt \
+	-lpwr_flow_gtk -lpwr_flow -lpwr_rt \
 	-lpwr_cow_gtk -lpwr_cow -lpwr_co -lpwr_flow_gtk -lpwr_flow \
 	`pkg-config --libs gtk+-2.0` \
 	-lpwr_msg_dummy -lantlr \

profibus/lib/rt/gtk/rt_pb_gsd_attr_gtk.cpp → profibus/lib/cow/gtk/cow_pb_gsd_attr_gtk.cpp

 /* 
- * Proview   $Id: rt_pb_gsd_attr_gtk.cpp,v 1.3 2008-10-31 12:51:29 claes Exp $
+ * Proview   $Id$
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -17,7 +17,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  **/
 
-/* rt_pb_gsd_attr_gtk.cpp -- Display gsd attributes */
+/* cow_pb_gsd_attr_gtk.cpp -- Display gsd attributes */
 
 #include "glow_std.h"
 
@@ -37,8 +37,8 @@
 #include "glow_growapi.h"
 #include "flow_msg.h"
 #include "rt_pb_msg.h"
-#include "rt_pb_gsd_attr_gtk.h"
-#include "rt_pb_gsd_attrnav_gtk.h"
+#include "cow_pb_gsd_attr_gtk.h"
+#include "cow_pb_gsd_attrnav_gtk.h"
 
 
 void GsdAttrGtk::message( char severity, const char *message)

profibus/lib/rt/gtk/rt_pb_gsd_attr_gtk.h → profibus/lib/cow/gtk/cow_pb_gsd_attr_gtk.h

 /* 
- * Proview   $Id: rt_pb_gsd_attr_gtk.h,v 1.3 2008-10-31 12:51:29 claes Exp $
+ * Proview   $Id$
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -17,12 +17,12 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  **/
 
-#ifndef rt_pb_gsd_attr_gtk_h
-#define rt_pb_gsd_attr_gtk_h
+#ifndef cow_pb_gsd_attr_gtk_h
+#define cow_pb_gsd_attr_gtk_h
 
-/* rt_pb_gsd_attr_gtk.h -- Profibus gsd attribute editor */
+/* cow_pb_gsd_attr_gtk.h -- Profibus gsd attribute editor */
 
-#include "rt_pb_gsd_attr.h"
+#include "cow_pb_gsd_attr.h"
 #include "cow_wow_gtk.h"
 
 class GsdAttrGtk : public GsdAttr {

profibus/lib/rt/gtk/rt_pb_gsd_attrnav_gtk.cpp → profibus/lib/cow/gtk/cow_pb_gsd_attrnav_gtk.cpp

 /* 
- * Proview   $Id: rt_pb_gsd_attrnav_gtk.cpp,v 1.3 2008-10-31 12:51:29 claes Exp $
+ * Proview   $Id$
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -17,7 +17,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  **/
 
-/* rt_pb_gsd_attrnav_gtk.cpp -- Display gsd attributes */
+/* cow_pb_gsd_attrnav_gtk.cpp -- Display gsd attributes */
 
 #include "glow_std.h"
 
@@ -37,9 +37,9 @@
 #include "glow_growctx.h"
 #include "glow_growapi.h"
 #include "glow_growwidget_gtk.h"
-#include "rt_pb_gsd.h"
-#include "rt_pb_gsd_attr_gtk.h"
-#include "rt_pb_gsd_attrnav_gtk.h"
+#include "cow_pb_gsd.h"
+#include "cow_pb_gsd_attr_gtk.h"
+#include "cow_pb_gsd_attrnav_gtk.h"
 #include "rt_pb_msg.h"
 
 

profibus/lib/rt/gtk/rt_pb_gsd_attrnav_gtk.h → profibus/lib/cow/gtk/cow_pb_gsd_attrnav_gtk.h

 /* 
- * Proview   $Id: rt_pb_gsd_attrnav_gtk.h,v 1.2 2008-10-31 12:51:29 claes Exp $
+ * Proview   $Id$
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -17,13 +17,13 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  **/
 
-#ifndef rt_pb_gsd_attrnav_gtk_h
-#define rt_pb_gsd_attrnav_gtk_h
+#ifndef cow_pb_gsd_attrnav_gtk_h
+#define cow_pb_gsd_attrnav_gtk_h
 
-/* rt_pb_gsd_attrnav_gtk.h -- Profibus gsd configurator navigator */
+/* cow_pb_gsd_attrnav_gtk.h -- Profibus gsd configurator navigator */
 
-#ifndef rt_pb_gsd_attrnav_h
-# include "rt_pb_gsd_attrnav.h"
+#ifndef cow_pb_gsd_attrnav_h
+# include "cow_pb_gsd_attrnav.h"
 #endif
 
 //! The navigation area of the attribute editor.

profibus/lib/rt/gtk/rt_pn_gsdml_attr_gtk.cpp → profibus/lib/cow/gtk/cow_pn_gsdml_attr_gtk.cpp

 /* 
- * Proview   $Id: rt_pn_gsdml_attr_gtk.cpp,v 1.3 2008-10-31 12:51:29 claes Exp $
+ * Proview   $Id$
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -17,7 +17,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  **/
 
-/* rt_pn_gsdml_attr_gtk.cpp -- Display gsd attributes */
+/* cow_pn_gsdml_attr_gtk.cpp -- Display gsd attributes */
 
 #include "glow_std.h"
 
@@ -38,8 +38,8 @@
 #include "glow_growapi.h"
 #include "flow_msg.h"
 #include "rt_pb_msg.h"
-#include "rt_pn_gsdml_attr_gtk.h"
-#include "rt_pn_gsdml_attrnav_gtk.h"
+#include "cow_pn_gsdml_attr_gtk.h"
+#include "cow_pn_gsdml_attrnav_gtk.h"
 
 
 void GsdmlAttrGtk::message( char severity, const char *message)

profibus/lib/rt/gtk/rt_pn_gsdml_attr_gtk.h → profibus/lib/cow/gtk/cow_pn_gsdml_attr_gtk.h

 /* 
- * Proview   $Id: rt_pn_gsdml_attr_gtk.h,v 1.3 2008-10-31 12:51:29 claes Exp $
+ * Proview   $Id$
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -17,12 +17,12 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  **/
 
-#ifndef rt_pn_gsdml_attr_gtk_h
-#define rt_pn_gsdml_attr_gtk_h
+#ifndef cow_pn_gsdml_attr_gtk_h
+#define cow_pn_gsdml_attr_gtk_h
 
-/* rt_pn_gsdml_attr_gtk.h -- Profibus gsd attribute editor */
+/* cow_pn_gsdml_attr_gtk.h -- Profibus gsd attribute editor */
 
-#include "rt_pn_gsdml_attr.h"
+#include "cow_pn_gsdml_attr.h"
 #include "cow_wow_gtk.h"
 
 class GsdmlAttrGtk : public GsdmlAttr {

profibus/lib/rt/gtk/rt_pn_gsdml_attrnav_gtk.cpp → profibus/lib/cow/gtk/cow_pn_gsdml_attrnav_gtk.cpp

 /* 
- * Proview   $Id: rt_pn_gsdml_attrnav_gtk.cpp,v 1.3 2008-10-31 12:51:29 claes Exp $
+ * Proview   $Id$
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -17,7 +17,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  **/
 
-/* rt_pn_gsdml_attrnav_gtk.cpp -- Display gsd attributes */
+/* cow_pn_gsdml_attrnav_gtk.cpp -- Display gsd attributes */
 
 #include "glow_std.h"
 
@@ -38,9 +38,9 @@
 #include "glow_growctx.h"
 #include "glow_growapi.h"
 #include "glow_growwidget_gtk.h"
-#include "rt_pn_gsdml.h"
-#include "rt_pn_gsdml_attr_gtk.h"
-#include "rt_pn_gsdml_attrnav_gtk.h"
+#include "cow_pn_gsdml.h"
+#include "cow_pn_gsdml_attr_gtk.h"
+#include "cow_pn_gsdml_attrnav_gtk.h"
 #include "rt_pb_msg.h"
 
 

profibus/lib/rt/gtk/rt_pn_gsdml_attrnav_gtk.h → profibus/lib/cow/gtk/cow_pn_gsdml_attrnav_gtk.h

 /* 
- * Proview   $Id: rt_pn_gsdml_attrnav_gtk.h,v 1.2 2008-10-31 12:51:29 claes Exp $
+ * Proview   $Id$
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -17,13 +17,13 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  **/
 
-#ifndef rt_pn_gsdml_attrnav_gtk_h
-#define rt_pn_gsdml_attrnav_gtk_h
+#ifndef cow_pn_gsdml_attrnav_gtk_h
+#define cow_pn_gsdml_attrnav_gtk_h
 
-/* rt_pn_gsdml_attrnav_gtk.h -- Profibus gsd configurator navigator */
+/* cow_pn_gsdml_attrnav_gtk.h -- Profibus gsd configurator navigator */
 
-#ifndef rt_pn_gsdml_attrnav_h
-# include "rt_pn_gsdml_attrnav.h"
+#ifndef cow_pn_gsdml_attrnav_h
+# include "cow_pn_gsdml_attrnav.h"
 #endif
 
 //! The navigation area of the attribute editor.

profibus/lib/rt/motif/rt_pb_gsd_attr_motif.cpp → profibus/lib/cow/motif/cow_pb_gsd_attr_motif.cpp

 /* 
- * Proview   $Id: rt_pb_gsd_attr_motif.cpp,v 1.2 2008-10-31 12:51:29 claes Exp $
+ * Proview   $Id$
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -17,7 +17,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  **/
 
-/* rt_pb_gsd_attr_motif.cpp -- Display gsd attributes */
+/* cow_pb_gsd_attr_motif.cpp -- Display gsd attributes */
 
 #include "glow_std.h"
 
@@ -50,8 +50,8 @@ extern "C" {
 #include "flow_msg.h"
 
 #include "rt_pb_msg.h"
-#include "rt_pb_gsd_attr_motif.h"
-#include "rt_pb_gsd_attrnav_motif.h"
+#include "cow_pb_gsd_attr_motif.h"
+#include "cow_pb_gsd_attrnav_motif.h"
 
 
 void GsdAttrMotif::message( char severity, const char *message)

profibus/lib/rt/motif/rt_pb_gsd_attr_motif.h → profibus/lib/cow/motif/cow_pb_gsd_attr_motif.h

 /* 
- * Proview   $Id: rt_pb_gsd_attr_motif.h,v 1.2 2008-10-31 12:51:29 claes Exp $
+ * Proview   $Id$
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -17,12 +17,12 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  **/
 
-#ifndef rt_pb_gsd_attr_motif_h
-#define rt_pb_gsd_attr_motif_h
+#ifndef cow_pb_gsd_attr_motif_h
+#define cow_pb_gsd_attr_motif_h
 
-/* rt_pb_gsd_attr_motif.h -- Profibus gsd attribute editor */
+/* cow_pb_gsd_attr_motif.h -- Profibus gsd attribute editor */
 
-#include "rt_pb_gsd_attr.h"
+#include "cow_pb_gsd_attr.h"
 
 class GsdAttrMotif : public GsdAttr {
  public:

profibus/lib/rt/motif/rt_pb_gsd_attrnav_motif.cpp → profibus/lib/cow/motif/cow_pb_gsd_attrnav_motif.cpp

 /* 
- * Proview   $Id: rt_pb_gsd_attrnav_motif.cpp,v 1.1 2007-01-04 08:43:47 claes Exp $
+ * Proview   $Id$
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -17,7 +17,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  **/
 
-/* rt_pb_gsd_attrnav.cpp -- Display gsd attributes */
+/* cow_pb_gsd_attrnav.cpp -- Display gsd attributes */
 
 #include "glow_std.h"
 
@@ -48,9 +48,9 @@
 #include "glow_growwidget_motif.h"
 
 
-#include "rt_pb_gsd.h"
-#include "rt_pb_gsd_attr_motif.h"
-#include "rt_pb_gsd_attrnav_motif.h"
+#include "cow_pb_gsd.h"
+#include "cow_pb_gsd_attr_motif.h"
+#include "cow_pb_gsd_attrnav_motif.h"
 #include "rt_pb_msg.h"
 
 

profibus/lib/rt/motif/rt_pb_gsd_attrnav_motif.h → profibus/lib/cow/motif/cow_pb_gsd_attrnav_motif.h

 /* 
- * Proview   $Id: rt_pb_gsd_attrnav_motif.h,v 1.1 2007-01-04 08:43:47 claes Exp $
+ * Proview   $Id$
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -17,13 +17,13 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  **/
 
-#ifndef rt_pb_gsd_attrnav_motif_h
-#define rt_pb_gsd_attrnav_motif_h
+#ifndef cow_pb_gsd_attrnav_motif_h
+#define cow_pb_gsd_attrnav_motif_h
 
-/* rt_pb_gsd_attrnav_motif.h -- Profibus gsd configurator navigator */
+/* cow_pb_gsd_attrnav_motif.h -- Profibus gsd configurator navigator */
 
-#ifndef rt_pb_gsd_attrnav_h
-# include "rt_pb_gsd_attrnav.h"
+#ifndef cow_pb_gsd_attrnav_h
+# include "cow_pb_gsd_attrnav.h"
 #endif
 
 //! The navigation area of the attribute editor.

profibus/lib/rt/src/rt_pb_gsd.cpp → profibus/lib/cow/src/cow_pb_gsd.cpp

 /* 
- * Proview   $Id: rt_pb_gsd.cpp,v 1.13 2008-10-31 12:51:29 claes Exp $
+ * Proview   $Id$
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -17,7 +17,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-/* pb_gsd.cpp -- Parse gsd file */
+/* cow_pb_gsd.cpp -- Parse gsd file */
 
 #include "flow_std.h"
 
@@ -27,7 +27,7 @@
 
 #include "pwr_baseclasses.h"
 #include "rt_pb_msg.h"
-#include "rt_pb_gsd.h"
+#include "cow_pb_gsd.h"
 #include "co_dcli.h"
 #include "co_cdh.h"
 

profibus/lib/rt/src/rt_pb_gsd.h → profibus/lib/cow/src/cow_pb_gsd.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef rt_pb_gsd_h
-#define rt_pb_gsd_h
+#ifndef cow_pb_gsd_h
+#define cow_pb_gsd_h
 
 #ifndef pwr_h
 # include "pwr.h"

profibus/lib/rt/src/rt_pb_gsd_attr.cpp → profibus/lib/cow/src/cow_pb_gsd_attr.cpp

 /* 
- * Proview   $Id: rt_pb_gsd_attr.cpp,v 1.6 2008-10-31 12:51:29 claes Exp $
+ * Proview   $Id$
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -17,7 +17,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  **/
 
-/* rt_pb_gsd_attr.cpp -- Display gsd attributes */
+/* cow_pb_gsd_attr.cpp -- Display gsd attributes */
 
 #include "glow_std.h"
 
@@ -36,8 +36,8 @@
 #include "glow_growapi.h"
 #include "flow_msg.h"
 #include "rt_pb_msg.h"
-#include "rt_pb_gsd_attr.h"
-#include "rt_pb_gsd_attrnav.h"
+#include "cow_pb_gsd_attr.h"
+#include "cow_pb_gsd_attrnav.h"
 
 
 // Static member variables

profibus/lib/rt/src/rt_pb_gsd_attr.h → profibus/lib/cow/src/cow_pb_gsd_attr.h

 /* 
- * Proview   $Id: rt_pb_gsd_attr.h,v 1.5 2008-10-31 12:51:30 claes Exp $
+ * Proview   $Id$
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -17,12 +17,12 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  **/
 
-#ifndef rt_pb_gsd_attr_h
-#define rt_pb_gsd_attr_h
+#ifndef cow_pb_gsd_attr_h
+#define cow_pb_gsd_attr_h
 
-/* rt_pb_gsd_attr.h -- Profibus gsd attribute editor */
+/* cow_pb_gsd_attr.h -- Profibus gsd attribute editor */
 
-#include "rt_pb_gsd.h"
+#include "cow_pb_gsd.h"
 
 typedef struct {
 	void	*value;

profibus/lib/rt/src/rt_pb_gsd_attrnav.cpp → profibus/lib/cow/src/cow_pb_gsd_attrnav.cpp

 /* 
- * Proview   $Id: rt_pb_gsd_attrnav.cpp,v 1.7 2008-12-03 12:00:38 claes Exp $
+ * Proview   $Id$
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -17,7 +17,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  **/
 
-/* rt_pb_gsd_attrnav.cpp -- Display gsd attributes */
+/* cow_pb_gsd_attrnav.cpp -- Display gsd attributes */
 
 #include "glow_std.h"
 
@@ -37,9 +37,9 @@
 #include "glow_growapi.h"
 
 
-#include "rt_pb_gsd.h"
-#include "rt_pb_gsd_attr.h"
-#include "rt_pb_gsd_attrnav.h"
+#include "cow_pb_gsd.h"
+#include "cow_pb_gsd_attr.h"
+#include "cow_pb_gsd_attrnav.h"
 #include "rt_pb_msg.h"
 
 #include "xnav_bitmap_leaf8.h"

profibus/lib/rt/src/rt_pb_gsd_attrnav.h → profibus/lib/cow/src/cow_pb_gsd_attrnav.h

 /* 
- * Proview   $Id: rt_pb_gsd_attrnav.h,v 1.5 2008-10-31 12:51:30 claes Exp $
+ * Proview   $Id$
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -17,10 +17,10 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  **/
 
-#ifndef rt_pb_gsd_attrnav_h
-#define rt_pb_gsd_attrnav_h
+#ifndef cow_pb_gsd_attrnav_h
+#define cow_pb_gsd_attrnav_h
 
-/* rt_pb_gsd_attrnav.h -- Profibus gsd configurator navigator */
+/* cow_pb_gsd_attrnav.h -- Profibus gsd configurator navigator */
 
 #if defined __cplusplus
 extern "C" {
@@ -50,8 +50,8 @@ extern "C" {
 #include "glow_growapi.h"
 #endif
 
-#ifndef rt_pb_gsd_atttr_h
-#include "rt_pb_gsd_attr.h"
+#ifndef cow_pb_gsd_atttr_h
+#include "cow_pb_gsd_attr.h"
 #endif
 
 typedef enum {

profibus/lib/rt/src/rt_pn_gsdml.cpp → profibus/lib/cow/src/cow_pn_gsdml.cpp

@@ -17,14 +17,14 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-/* rt_pn_gsdml.cpp -- Parse gsdml file */
+/* cow_pn_gsdml.cpp -- Parse gsdml file */
 
 #include <stdlib.h>
 #include <string.h>
 #include <float.h>
 
 #include "co_dcli.h"
-#include "rt_pn_gsdml.h"
+#include "cow_pn_gsdml.h"
 #include "rt_pb_msg.h"
 #include "pwr_baseclasses.h"
 

profibus/lib/rt/src/rt_pn_gsdml.h → profibus/lib/cow/src/cow_pn_gsdml.h

 /* 
- * Proview   $Id: rt_pb_gsd.h,v 1.8 2008-10-31 12:51:29 claes Exp $
+ * Proview   $Id$
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -17,8 +17,8 @@
  * Foundation, Inc., 675 Mass ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef rt_pn_gsdml_h
-#define rt_pn_gsdml_h
+#ifndef cow_pn_gsdml_h
+#define cow_pn_gsdml_h
 
 #include <iostream>
 #include <fstream>

profibus/lib/rt/src/rt_pn_gsdml_attr.cpp → profibus/lib/cow/src/cow_pn_gsdml_attr.cpp

 /* 
- * Proview   $Id: rt_pn_gsdml_attr.cpp,v 1.6 2008-10-31 12:51:29 claes Exp $
+ * Proview   $Id$
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -17,7 +17,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  **/
 
-/* rt_pn_gsdml_attr.cpp -- Display gsd attributes */
+/* cow_pn_gsdml_attr.cpp -- Display gsd attributes */
 
 #include "glow_std.h"
 
@@ -37,8 +37,8 @@
 #include "glow_growapi.h"
 #include "flow_msg.h"
 #include "rt_pb_msg.h"
-#include "rt_pn_gsdml_attr.h"
-#include "rt_pn_gsdml_attrnav.h"
+#include "cow_pn_gsdml_attr.h"
+#include "cow_pn_gsdml_attrnav.h"
 
 
 // Static member variables

profibus/lib/rt/src/rt_pn_gsdml_attr.h → profibus/lib/cow/src/cow_pn_gsdml_attr.h

@@ -17,13 +17,13 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  **/
 
-#ifndef rt_pn_gsdml_attr_h
-#define rt_pn_gsdml_attr_h
+#ifndef cow_pn_gsdml_attr_h
+#define cow_pn_gsdml_attr_h
 
-/* rt_pn_gsdml_attr.h -- Profinet gsdml attribute editor */
+/* cow_pn_gsdml_attr.h -- Profinet gsdml attribute editor */
 
-#include "rt_pn_gsdml.h"
-#include "rt_pn_gsdml_data.h"
+#include "cow_pn_gsdml.h"
+#include "cow_pn_gsdml_data.h"
 
 typedef struct {
 	void	*value;

profibus/lib/rt/src/rt_pn_gsdml_attrnav.cpp → profibus/lib/cow/src/cow_pn_gsdml_attrnav.cpp

@@ -17,7 +17,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  **/
 
-/* rt_pn_gsdml_attrnav.cpp -- Display gsd attributes */
+/* cow_pn_gsdml_attrnav.cpp -- Display gsd attributes */
 
 #include "glow_std.h"
 
@@ -38,9 +38,9 @@
 #include "glow_growapi.h"
 
 
-#include "rt_pn_gsdml.h"
-#include "rt_pn_gsdml_attr.h"
-#include "rt_pn_gsdml_attrnav.h"
+#include "cow_pn_gsdml.h"
+#include "cow_pn_gsdml_attr.h"
+#include "cow_pn_gsdml_attrnav.h"
 #include "rt_pb_msg.h"
 
 #include "xnav_bitmap_leaf8.h"

profibus/lib/rt/src/rt_pn_gsdml_attrnav.h → profibus/lib/cow/src/cow_pn_gsdml_attrnav.h

 /* 
- * Proview   $Id: rt_pn_gsdml_attrnav.h,v 1.5 2008-10-31 12:51:30 claes Exp $
+ * Proview   $Id$
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -17,10 +17,10 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  **/
 
-#ifndef rt_pn_gsdml_attrnav_h
-#define rt_pn_gsdml_attrnav_h
+#ifndef cow_pn_gsdml_attrnav_h
+#define cow_pn_gsdml_attrnav_h
 
-/* rt_pn_gsdml_attrnav.h -- Profibus gsd configurator navigator */
+/* cow_pn_gsdml_attrnav.h -- Profibus gsd configurator navigator */
 
 #if defined __cplusplus
 extern "C" {
@@ -50,12 +50,12 @@ extern "C" {
 #include "glow_growapi.h"
 #endif
 
-#ifndef rt_pn_gsdml_atttr_h
-#include "rt_pn_gsdml_attr.h"
+#ifndef cow_pn_gsdml_atttr_h
+#include "cow_pn_gsdml_attr.h"
 #endif
 
-#ifndef rt_pn_gsdml_data_h
-#include "rt_pn_gsdml_data.h"
+#ifndef cow_pn_gsdml_data_h
+#include "cow_pn_gsdml_data.h"
 #endif
 
 typedef enum {

profibus/lib/rt/src/rt_pn_gsdml_data.cpp → profibus/lib/cow/src/cow_pn_gsdml_data.cpp

@@ -17,7 +17,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  **/
 
-/* rt_pn_gsdml_data.cpp -- Profinet configurator data file */
+/* cow_pn_gsdml_data.cpp -- Profinet configurator data file */
 
 #include "glow_std.h"
 
@@ -30,7 +30,7 @@
 #include "co_dcli.h"
 #include "co_xml_parser.h"
 #include "rt_pb_msg.h"
-#include "rt_pn_gsdml_data.h"
+#include "cow_pn_gsdml_data.h"
 
 typedef enum {
   gsdmldata_eTag_,

profibus/lib/rt/src/rt_pn_gsdml_data.h → profibus/lib/cow/src/cow_pn_gsdml_data.h

@@ -17,10 +17,10 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  **/
 
-#ifndef rt_pn_gsdml_data_h
-#define rt_pn_gsdml_data_h
+#ifndef cow_pn_gsdml_data_h
+#define cow_pn_gsdml_data_h
 
-/* rt_pn_gsdml_data.h -- Profinet configurator data file. */
+/* cow_pn_gsdml_data.h -- Profinet configurator data file. */
 
 #include "co_xml_parser.h"
 

profibus/lib/cow/src/os_linux/hw_x86/makefile

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

profibus/lib/wb/gtk/wb_c_pb_dp_slave_gtk.cpp

@@ -43,8 +43,8 @@
 #include "co_dcli.h"
 #include "cow_wow.h"
 #include "cow_xhelp_gtk.h"
-#include "rt_pb_gsd.h"
-#include "rt_pb_gsd_attr_gtk.h"
+#include "cow_pb_gsd.h"
+#include "cow_pb_gsd_attr_gtk.h"
 #include "wb_c_pb_dp_slave.h"
 
 

profibus/lib/wb/gtk/wb_c_pndevice_gtk.cpp

@@ -43,8 +43,8 @@
 #include "co_dcli.h"
 #include "cow_wow.h"
 #include "cow_xhelp_gtk.h"
-#include "rt_pn_gsdml.h"
-#include "rt_pn_gsdml_attr_gtk.h"
+#include "cow_pn_gsdml.h"
+#include "cow_pn_gsdml_attr_gtk.h"
 #include "wb_c_pndevice.h"
 
 

profibus/lib/wb/motif/wb_c_pb_dp_slave_motif.cpp

@@ -48,8 +48,8 @@
 #include "co_dcli.h"
 #include "cow_wow.h"
 #include "cow_xhelp_motif.h"
-#include "rt_pb_gsd.h"
-#include "rt_pb_gsd_attr_motif.h"
+#include "cow_pb_gsd.h"
+#include "cow_pb_gsd_attr_motif.h"
 #include "wb_c_pb_dp_slave.h"
 
 

profibus/lib/wb/src/wb_c_pb_dp_slave.cpp

@@ -41,8 +41,8 @@
 #include "co_dcli.h"
 #include "cow_wow.h"
 #include "cow_xhelp.h"
-#include "rt_pb_gsd.h"
-#include "rt_pb_gsd_attr.h"
+#include "cow_pb_gsd.h"
+#include "cow_pb_gsd_attr.h"
 #include "wb_c_pb_dp_slave.h"
 
 #include "wb_pwrs.h"

profibus/lib/wb/src/wb_c_pndevice.cpp

@@ -42,9 +42,9 @@
 #include "cow_wow.h"
 #include "cow_msgwindow.h"
 #include "cow_xhelp.h"
-#include "rt_pn_gsdml.h"
-#include "rt_pn_gsdml_attr.h"
-#include "rt_pn_gsdml_attrnav.h"
+#include "cow_pn_gsdml.h"
+#include "cow_pn_gsdml_attr.h"
+#include "cow_pn_gsdml_attrnav.h"
 #include "wb_c_pndevice.h"
 
 #include "wb_pwrs.h"

profibus/lib/xtt/gtk/xtt_c_pb_dp_slave_gtk.cpp

@@ -31,9 +31,9 @@
 #include "rt_xnav_msg.h"
 #include "pwr_privilege.h"
 
-#include "rt_pb_gsd.h"
+#include "cow_pb_gsd.h"
 #include "cow_xhelp_gtk.h"
-#include "rt_pb_gsd_attr_gtk.h"
+#include "cow_pb_gsd_attr_gtk.h"
 #include "xtt_c_pb_dp_slave.h"
 
 

profibus/lib/xtt/motif/xtt_c_pb_dp_slave_motif.cpp

@@ -37,9 +37,9 @@
 #include "rt_xnav_msg.h"
 #include "pwr_privilege.h"
 
-#include "rt_pb_gsd.h"
+#include "cow_pb_gsd.h"
 #include "cow_xhelp_motif.h"
-#include "rt_pb_gsd_attr_motif.h"
+#include "cow_pb_gsd_attr_motif.h"
 #include "xtt_c_pb_dp_slave.h"
 
 

profibus/lib/xtt/src/xtt_c_pb_dp_slave.cpp

@@ -29,8 +29,8 @@
 #include "rt_xnav_msg.h"
 #include "pwr_privilege.h"
 
-#include "rt_pb_gsd.h"
-#include "rt_pb_gsd_attr.h"
+#include "cow_pb_gsd.h"
+#include "cow_pb_gsd_attr.h"
 #include "xtt_c_pb_dp_slave.h"
 #include "rt_pb_msg.h"
 

sev/exe/sev_xtt/gtk/os_linux/link_rule.mk

@@ -8,7 +8,7 @@ link_rule_mk := 1
 	$(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o -L/usr/X11R6/lib\
 	-L/opt/gnome/lib \
-	-lpwr_xtt_gtk -lpwr_xtt -lpwr_xtt_gtk -lpwr_xtt -lpwr_ge_gtk -lpwr_ge -lpwr_rt_gtk -lpwr_rt \
+	-lpwr_xtt_gtk -lpwr_xtt -lpwr_xtt_gtk -lpwr_xtt -lpwr_ge_gtk -lpwr_ge -lpwr_rt \
 	-lpwr_cow_gtk -lpwr_cow -lpwr_co -lpwr_flow_gtk -lpwr_flow -lpwr_glow_gtk -lpwr_glow \
 	`pkg-config --libs gtk+-2.0` \
 	-lpwr_msg_dummy \

src/lib/co/gtk/os_linux/hw_x86/makefile

-include $(pwre_dir_symbols)
-
--include $(pwre_sroot)/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
-endif
-
-ifeq ($($(type_name)_generic_mk),)
- include $(pwre_sroot)/tools/bld/src/$(type_name)_generic.mk
-endif
-
--include ../../special.mk
--include ../special.mk
--include special.mk

src/lib/co/gtk/os_linux/hw_x86_64/makefile

-include $(pwre_dir_symbols)
-
--include $(pwre_sroot)/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
-endif
-
-ifeq ($($(type_name)_generic_mk),)
- include $(pwre_sroot)/tools/bld/src/$(type_name)_generic.mk
-endif
-
--include ../../special.mk
--include ../special.mk
--include special.mk

src/lib/rt/gtk/os_linux/hw_x86/makefile

-include $(pwre_dir_symbols)
-
--include $(pwre_sroot)/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
-endif
-
-ifeq ($($(type_name)_generic_mk),)
- include $(pwre_sroot)/tools/bld/src/$(type_name)_generic.mk
-endif
-
--include ../../special.mk
--include ../special.mk
--include special.mk

src/lib/rt/gtk/os_linux/hw_x86_64/makefile

-include $(pwre_dir_symbols)
-
--include $(pwre_sroot)/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
-endif
-
-ifeq ($($(type_name)_generic_mk),)
- include $(pwre_sroot)/tools/bld/src/$(type_name)_generic.mk
-endif
-
--include ../../special.mk
--include ../special.mk
--include special.mk

src/lib/rt/motif/os_linux/hw_x86/makefile

-include $(pwre_dir_symbols)
-
--include $(pwre_sroot)/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
-endif
-
-ifeq ($($(type_name)_generic_mk),)
- include $(pwre_sroot)/tools/bld/src/$(type_name)_generic.mk
-endif
-
--include ../../special.mk
--include ../special.mk
--include special.mk

src/lib/rt/motif/os_linux/hw_x86_64/makefile

-include $(pwre_dir_symbols)
-
--include $(pwre_sroot)/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
-endif
-
-ifeq ($($(type_name)_generic_mk),)
- include $(pwre_sroot)/tools/bld/src/$(type_name)_generic.mk
-endif
-
--include ../../special.mk
--include ../special.mk
--include special.mk

src/tools/pwre/src/os_linux/pwre_merge.sh

@@ -62,7 +62,7 @@ else
   for lib in $libraries; do
 
     arname=${lib##/*/}
-    if [ $arname = "libpwr_rt.a" ] || [ $arname = "libpwr_rt_motif.a" ] || [ $arname = "libpwr_rt_gtk.a" ] || [ $arname = "libpwr_wb.a" ] || [ $arname = "libpwr_wb_motif.a" ] || [ $arname = "libpwr_wb_gtk.a" ] || [ $arname = "libpwr_xtt.a" ] || [ $arname = "libpwr_xtt_motif.a" ] || [ $arname = "libpwr_xtt_gtk.a" ]; then
+    if [ $arname = "libpwr_rt.a" ] || [ $arname = "libpwr_cow.a" ] || [ $arname = "libpwr_cow_motif.a" ] || [ $arname = "libpwr_cow_gtk.a" ] || [ $arname = "libpwr_wb.a" ] || [ $arname = "libpwr_wb_motif.a" ] || [ $arname = "libpwr_wb_gtk.a" ] || [ $arname = "libpwr_xtt.a" ] || [ $arname = "libpwr_xtt_motif.a" ] || [ $arname = "libpwr_xtt_gtk.a" ]; then
       echo "Merge $lib"
       modules=`eval ar -tf $lib`
       ar -xf $lib

wb/exe/wb/gtk/os_linux/link_rule.mk

@@ -7,7 +7,7 @@ ifeq ($(export_type),exp)
 	$(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_procom.o $(pwr_eobj)/stdsoap2.o \
 	-L/usr/X11R6/lib -L/usr/local/BerkeleyDB.4.0/lib \
 	-L/opt/gnome/lib \
-	-lpwr_wb_gtk -lpwr_wb -lpwr_wb_gtk -lpwr_wb -lpwr_rt_gtk -lpwr_rt \
+	-lpwr_wb_gtk -lpwr_wb -lpwr_wb_gtk -lpwr_wb -lpwr_rt \
         -lpwr_ge_gtk -lpwr_ge -lpwr_flow_gtk -lpwr_flow -lpwr_glow_gtk -lpwr_glow 
 	-lpwr_cow_gtk -lpwr_cow -lpwr_co -lpwr_rt -lpwr_statussrv \
 	`pkg-config --libs gtk+-2.0` \
@@ -19,7 +19,7 @@ else
 	$(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_procom.o $(pwr_eobj)/stdsoap2.o \
 	-L/usr/X11R6/lib -L/usr/local/BerkeleyDB.4.0/lib \
 	-L/opt/gnome/lib \
-	-lpwr_wb_gtk -lpwr_wb -lpwr_rt_gtk -lpwr_rt -lpwr_ge_gtk -lpwr_ge \
+	-lpwr_wb_gtk -lpwr_wb -lpwr_rt -lpwr_ge_gtk -lpwr_ge \
 	-lpwr_flow_gtk -lpwr_flow -lpwr_glow_gtk -lpwr_glow -lpwr_cow_gtk -lpwr_cow \
 	-lpwr_co -lpwr_statussrv -lpwr_rt\
 	`pkg-config --libs gtk+-2.0` \

wb/exe/wb/motif/os_linux/link_rule.mk

@@ -7,7 +7,7 @@ ifeq ($(export_type),exp)
 	$(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_procom.o \
 	-L/usr/X11R6/lib -L/usr/local/BerkeleyDB.4.0/lib \
 	-L/opt/gnome/lib \
-	-lpwr_wb_motif -lpwr_wb -lpwr_wb_motif -lpwr_wb -lpwr_rt_motif -lpwr_rt -lpwr_ge_motif -lpwr_ge \
+	-lpwr_wb_motif -lpwr_wb -lpwr_wb_motif -lpwr_wb -lpwr_rt -lpwr_ge_motif -lpwr_ge \
 	-lpwr_flow_motif -lpwr_flow -lpwr_glow_motif -lpwr_glow -lpwr_cow_motif -lpwr_cow -lpwr_co \
 	-lpwr_msg_dummy -lantlr -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
         -lXmu -lSM -lICE\
@@ -18,7 +18,7 @@ else
 	$(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_procom.o \
 	-L/usr/X11R6/lib -L/usr/local/BerkeleyDB.4.0/lib \
 	-L/opt/gnome/lib \
-	-lpwr_wb_motif -lpwr_wb -lpwr_rt_motif -lpwr_rt -lpwr_ge_motif -lpwr_ge \
+	-lpwr_wb_motif -lpwr_wb -lpwr_rt -lpwr_ge_motif -lpwr_ge \
 	-lpwr_flow_motif -lpwr_flow -lpwr_glow_motif -lpwr_glow -lpwr_cow_motif -lpwr_cow -lpwr_co \
 	-lpwr_msg_dummy -lantlr -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
         -lXmu -lSM -lICE\

wb/exe/wb_cmd/gtk/os_linux/link_rule.mk

@@ -6,7 +6,7 @@ link_rule_mk := 1
 	$(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_procom.o \
 	-L/usr/X11R6/lib -L/usr/local/BerkeleyDB.4.0/lib \
 	-L/opt/gnome/lib \
-	-lpwr_wb_gtk -lpwr_wb -lpwr_rt_gtk -lpwr_rt -lpwr_ge_gtk -lpwr_ge \
+	-lpwr_wb_gtk -lpwr_wb -lpwr_rt -lpwr_ge_gtk -lpwr_ge \
 	-lpwr_flow_gtk -lpwr_flow -lpwr_glow_gtk -lpwr_glow -lpwr_cow_gtk -lpwr_cow \
 	-lpwr_co \
 	`pkg-config --libs gtk+-2.0` \

wb/exe/wb_cmd/motif/os_linux/link_rule.mk

@@ -6,7 +6,7 @@ link_rule_mk := 1
 	$(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_procom.o \
 	-L/usr/X11R6/lib -L/usr/local/BerkeleyDB.4.0/lib \
 	-L/opt/gnome/lib \
-	-lpwr_wb_motif -lpwr_wb -lpwr_rt_motif -lpwr_rt -lpwr_ge_motif -lpwr_ge \
+	-lpwr_wb_motif -lpwr_wb -lpwr_rt -lpwr_ge_motif -lpwr_ge \
 	-lpwr_flow_motif -lpwr_flow -lpwr_glow_motif -lpwr_glow -lpwr_cow_motif -lpwr_cow -lpwr_co \
 	-lpwr_msg_dummy -lantlr -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
         -lXmu -lSM -lICE\

wb/lib/wb/motif/wb_uted_motif.cpp

@@ -24,7 +24,7 @@
 #include <string.h>
 #include <string.h>
 
-#include "co_wlogin.h"
+#include "cow_login.h"
 
 #include <Xm/Xm.h>
 #include <Mrm/MrmPublic.h>
@@ -39,7 +39,7 @@
 #include "co_time.h"
 #include "co_msg.h"
 #include "co_dcli.h"
-#include "co_wxhelp.h"
+#include "cow_xhelp.h"
 #include "wb_ldh.h"
 #include "wb_foe.h"
 #include "wb_foe_msg.h"

wb/lib/wb/motif/wb_wattnav_motif.cpp

@@ -65,8 +65,8 @@ WAttNavMotif::WAttNavMotif(
 	wb_eUtility	wa_utility,
 	Widget 		*w,
 	pwr_tStatus 	*status) :
-  WAttNav(wa_parent_ctx,wa_name,wa_ldhses,wa_aref,wa_editmode,wa_advanced_user,
-	  wa_display_objectname,wa_utility,status), parent_wid(wa_parent_wid)
+  WAttNav(wa_parent_ctx,wattnav_eType_Object,wa_name,wa_ldhses,wa_aref,wa_editmode,
+	  wa_advanced_user,wa_display_objectname,wa_utility,status), parent_wid(wa_parent_wid)
 {
   form_widget = ScrolledBrowCreate( parent_wid, name, NULL, 0, 
 	WAttNav::init_brow_cb, this, (Widget *)&brow_widget);

wb/lib/wb/motif/wb_wtt_motif.cpp

@@ -1773,11 +1773,11 @@ void WttMotif::set_options()
   build_crossref = XmToggleButtonGetState(build_crossref_w);
   build_manual = XmToggleButtonGetState(build_manual_w);
 
-  wnav->set_options( show_class, show_alias, 
+  wnav->set_options( enable_comment, show_class, show_alias, 
 	show_descrip, show_objref, show_objxref, 
 	show_attrref, show_attrxref, build_force, build_debug,
 	build_crossref, build_manual);
-  wnavnode->set_options( show_class, show_alias, 
+  wnavnode->set_options( enable_comment, show_class, show_alias, 
 	show_descrip, show_objref, show_objxref, 
         show_attrref, show_attrxref, build_force, build_debug,
 	build_crossref, build_manual);
@@ -2298,7 +2298,7 @@ WttMotif::WttMotif(
   flow_AddCloseVMProtocolCb( toplevel, 
 	(XtCallbackProc)activate_exit, this);
 
-  wnav->get_options( &show_class, &show_alias, 
+  wnav->get_options( &enable_comment, &show_class, &show_alias, 
 	&show_descrip, &show_objref, &show_objxref, 
 	&show_attrref, &show_attrxref, &build_force, &build_debug,
 	&build_crossref, &build_manual);

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

@@ -7,7 +7,7 @@ ifeq ($(export_type),exp)
 	$(pwr_eobj)/rt_io_user.o -L/usr/X11R6/lib\
 	-L/opt/gnome/lib \
 	-lpwr_xtt_gtk -lpwr_xtt -lpwr_xtt_gtk -lpwr_xtt -lpwr_ge_gtk -lpwr_ge -lpwr_rt \
-	-lpwr_co_gtk -lpwr_co -lpwr_cow_gtk -lpwr_cow -lpwr_flow_gtk -lpwr_flow -lpwr_glow_gtk -lpwr_glow \
+	-lpwr_co -lpwr_cow_gtk -lpwr_cow -lpwr_flow_gtk -lpwr_flow -lpwr_glow_gtk -lpwr_glow \
 	`pkg-config --libs gtk+-2.0` \
 	-lpwr_msg_dummy \
 	-ldb -lrpcsvc -lpthread -lm -lrt -lcrypt -lasound
@@ -17,7 +17,7 @@ else
 	$(pwr_eobj)/rt_io_user.o -L/usr/X11R6/lib\
 	-L/opt/gnome/lib \
 	-lpwr_xtt_gtk -lpwr_xtt -lpwr_xtt_gtk -lpwr_xtt -lpwr_ge_gtk -lpwr_ge -lpwr_rt \
-	-lpwr_co_gtk -lpwr_co -lpwr_cow_gtk -lpwr_cow -lpwr_flow_gtk -lpwr_flow -lpwr_glow_gtk -lpwr_glow \
+	-lpwr_co -lpwr_cow_gtk -lpwr_cow -lpwr_flow_gtk -lpwr_flow -lpwr_glow_gtk -lpwr_glow \
 	`pkg-config --libs gtk+-2.0` \
 	-lpwr_msg_dummy \
 	-ldb -lrpcsvc -lpthread -lm -lrt -lcrypt -lasound

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

@@ -6,7 +6,7 @@ ifeq ($(export_type),exp)
 	$(bld_dir)/rt_xtt_motif.o $(bld_dir)/xtt_main.o $(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o -L/usr/X11R6/lib\
 	-L/opt/gnome/lib \
-	-lpwr_xtt_motif -lpwr_xtt -lpwr_xtt_motif -lpwr_xtt -lpwr_ge_motif -lpwr_ge -lpwr_rt_motif -lpwr_rt \
+	-lpwr_xtt_motif -lpwr_xtt -lpwr_xtt_motif -lpwr_xtt -lpwr_ge_motif -lpwr_ge -lpwr_rt \
 	-lpwr_cow_motif -lpwr_cow -lpwr_co -lpwr_flow_motif -lpwr_flow -lpwr_glow_motif -lpwr_glow \
 	-lpwr_msg_dummy -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
         -lSM -lICE\
@@ -16,7 +16,7 @@ else
 	$(bld_dir)/rt_xtt_motif.o $(bld_dir)/xtt_main.o $(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o -L/usr/X11R6/lib\
 	-L/opt/gnome/lib \
-	-lpwr_xtt_motif -lpwr_xtt -lpwr_xtt_motif -lpwr_xtt -lpwr_ge_motif -lpwr_ge -lpwr_rt_motif -lpwr_rt \
+	-lpwr_xtt_motif -lpwr_xtt -lpwr_xtt_motif -lpwr_xtt -lpwr_ge_motif -lpwr_ge -lpwr_rt \
 	-lpwr_cow_motif -lpwr_cow -lpwr_co -lpwr_flow_motif -lpwr_flow -lpwr_glow_motif -lpwr_glow \
 	-lpwr_msg_dummy -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
         -lSM -lICE\

xtt/exe/rt_xtt/motif/rt_xtt_motif.cpp

@@ -58,7 +58,7 @@ extern "C" {
 #include "flow_browapi.h"
 //#include "flow_browwidget.h"
 #include "rt_xtt_motif.h"
-#include "rt_trace.h"
+#include "xtt_trace.h"
 #include "xtt_xnav_motif.h"
 #include "xtt_item.h"
 #include "xtt_url.h"
@@ -531,7 +531,7 @@ XttMotif::~XttMotif()
 }
 
 XttMotif::XttMotif( int argc, char *argv[], int *return_sts) :
-  Xtt( argc, argv, return_sts),
+  Xtt( &argc, &argv, return_sts),
   cmd_current_recall(0), value_current_recall(0) 
 {
   char		uid_filename[120] = {"xtt.uid"};

xtt/exe/rt_xtt/motif/rt_xtt_motif.h

@@ -27,8 +27,8 @@
 # include "rt_xtt_main.h"
 #endif
 
-#ifndef co_wow_motif_h
-#include "co_wow_motif.h"
+#ifndef cow_wow_motif_h
+#include "cow_wow_motif.h"
 #endif
 
 #ifndef xtt_hotkey_motif_h

xtt/exe/wb_ge/gtk/os_linux/link_rule.mk

 ifndef link_rule_mk
 link_rule_mk := 1
 
-link = $(ldxx) $(elinkflags) $(domap) -o $(pwr_exe)/wb_ge_gtk \
+link = $(ldxx) -L$(pwr_elib) $(elinkflags) $(domap) -o $(pwr_exe)/wb_ge_gtk \
 	$(bld_dir)/wb_ge_gtk.o $(wb_msg_eobjs) $(rt_msg_eobjs) $(pwr_eobj)/pwr_msg_glow.o\
 	$(pwr_eobj)/rt_io_user.o $(pwr_eobj)/wb_provider.o -L/usr/X11R6/lib \
 	-L/usr/local/BerkeleyDB.4.0/lib \
 	-L/opt/gnome/lib \
 	-lpwr_ge_gtk -lpwr_ge -lpwr_wb_gtk -lpwr_wb -lpwr_wb_gtk -l pwr_wb -lpwr_ge_gtk -lpwr_ge \
-	-lpwr_flow_gtk -lpwr_flow -lpwr_glow_gtk -lpwr_glow -lpwr_rt_gtk -lpwr_rt \
-	-lpwr_cow_gtk -lpwr_cow -lpwr_co_gtk -lpwr_co -lpwr_flow_gtk -lpwr_flow \
+	-lpwr_flow_gtk -lpwr_flow -lpwr_glow_gtk -lpwr_glow -lpwr_rt \
+	-lpwr_cow_gtk -lpwr_cow -lpwr_co -lpwr_flow_gtk -lpwr_flow \
 	`pkg-config --libs gtk+-2.0` \
 	-lpwr_msg_dummy -lantlr \
 	-lcrypt -lrpcsvc -lpthread -lm -ldb_cxx -lz $(linkmysql)

xtt/exe/wb_ge/motif/os_linux/link_rule.mk

 ifndef link_rule_mk
 link_rule_mk := 1
 
-link = $(ldxx) $(elinkflags) $(domap) -o $(pwr_exe)/wb_ge_motif \
+link = $(ldxx) -L$(pwr_elib) $(elinkflags) $(domap) -o $(pwr_exe)/wb_ge_motif \
 	$(bld_dir)/wb_ge_motif.o $(wb_msg_eobjs) $(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o $(pwr_eobj)/wb_provider.o -L/usr/X11R6/lib \
 	-L/usr/local/BerkeleyDB.4.0/lib \
 	-L/opt/gnome/lib \
 	-lpwr_ge_motif -lpwr_ge -lpwr_wb_motif -lpwr_wb -lpwr_wb_motif -lpwr_wb -lpwr_flow_motif -lpwr_flow \
-	-lpwr_glow_motif -lpwr_glow -lpwr_rt_motif -lpwr_rt -lpwr_cow_motif -lpwr_cow -lpwr_co \
+	-lpwr_glow_motif -lpwr_glow -lpwr_rt -lpwr_cow_motif -lpwr_cow -lpwr_co \
 	-lpwr_msg_dummy -lantlr -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
         -lXmu -lSM -lICE\
 	-lcrypt -lrpcsvc -lpthread -lm -ldb_cxx -lz $(linkmysql)

xtt/exe/wb_ge/motif/wb_ge_motif.cpp

@@ -34,7 +34,7 @@ typedef void *ldh_tSesContext;
 
 #include "ge_motif.h"
 #include "co_lng.h"
-#include "co_xhelp_motif.h"
+#include "cow_xhelp_motif.h"
 
 
 /*  Fallback resources  */

xtt/lib/cow/gtk/os_linux/hw_x86_64/makefile

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

xtt/lib/cow/motif/cow_msgwindow_motif.h

@@ -20,10 +20,10 @@
 #ifndef co_msgwindow_motif_h
 #define co_msgwindow_motif_h
 
-/* co_msgwindow_motif.h -- Message window */
+/* cow_msgwindow_motif.h -- Message window */
 
-#ifndef co_msgwindow_h
-# include "co_msgwindow.h"
+#ifndef cow_msgwindow_h
+# include "cow_msgwindow.h"
 #endif
 
 #include <Xm/Xm.h>

xtt/lib/cow/motif/cow_wow_motif.h

@@ -93,7 +93,7 @@ class CoWowMotif : public CoWow {
 				void *data);
   void DisplayError( const char *title, const char *text);
   void DisplayText( const char *title, const char *text) {}
-  void *CreateList( const char *title, const char *texts,
+  void *CreateList( const char *title, const char *texts, int textsize,
 		    void (action_cb)( void *, char *),
 		    void (cancel_cb)( void *),
 		    void *ctx,

xtt/lib/cow/motif/cow_xhelpnav_motif.cpp

@@ -47,7 +47,7 @@
 
 extern "C" {
 #include "flow_x.h"
-#include "co_mrm_util.h"
+#include "cow_mrm_util.h"
 #include "co_api.h"
 }
 

xtt/lib/cow/motif/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/lib/cow/motif/os_linux/hw_x86_64/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/lib/ge/motif/ge_attr_motif.cpp

@@ -34,7 +34,7 @@
 
 #include "co_cdh.h"
 #include "co_time.h"
-#include "co_mrm_util.h"
+#include "cow_mrm_util.h"
 #include "flow_x.h"
 
 #include "flow.h"

xtt/lib/xtt/motif/xtt_ge_motif.cpp

@@ -18,6 +18,8 @@
  */
 
 #include "glow_std.h"
+#include "pwr.h"
+#include "pwr_baseclasses.h"
 
 #include <stdio.h>
 #include <stdlib.h>

xtt/lib/xtt/motif/xtt_op_motif.cpp

@@ -443,9 +443,10 @@ int OpMotif::configure( char *opplace_str)
   XtFree( (char *)entry);
 
   // Examine Graph objects
-  for ( i = 0; i < 15; i++)
+  int idx = 0;
+  for ( i = 0; i < 25; i++)
   {
-    if ( i >= 15)
+    if ( idx >= 15)
       break;
     memset( &attrref, 0, sizeof(attrref));
     sts = gdh_ClassAttrToAttrref( pwr_cClass_XttGraph, ".ButtonText", &attrref);
@@ -454,23 +455,23 @@ int OpMotif::configure( char *opplace_str)
     if ( cdh_ObjidIsNotNull( opplace_p->FastAvail[i].Objid)) {
 
       attrref = cdh_ArefAdd( &opplace_p->FastAvail[i], &attrref);
-      sts = gdh_GetObjectInfoAttrref( &attrref, (void *)button_title[i], 
+      sts = gdh_GetObjectInfoAttrref( &attrref, (void *)button_title[idx], 
 				      sizeof(button_title[0]));
       if ( ODD(sts)) 
-	button_aref[i] = attrref.Objid;
+	button_aref[idx] = attrref;
       else
-	button_aref[i] = pwr_cNOid;
+	button_aref[idx].Objid = pwr_cNOid;
+      idx++;
     }
-    else 
-      button_aref[i] = pwr_cNOid;      
   }
+  button_cnt = idx;
 
   // Create the application buttons
   for ( i = 0; i < button_cnt; i++)
   {
     Widget b[15];
 
-    if ( cdh_ObjidIsNull( button_aref[i]))
+    if ( cdh_ObjidIsNull( button_aref[i].Objid))
       continue;	 
 
     switch ( i)

src/lib/rt/motif/rt_trace_motif.cpp → xtt/lib/xtt/motif/xtt_trace_motif.cpp

 /* 
- * Proview   $Id: rt_trace_motif.cpp,v 1.2 2008-10-31 12:51:30 claes Exp $
+ * Proview   $Id$
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -17,7 +17,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-/* rt_trace.cpp -- trace in runtime environment */
+/* xtt_trace_motif.cpp -- trace in runtime environment */
 
 #include <stdio.h>
 #include <string.h>
@@ -45,12 +45,12 @@
 #include "co_cdh.h"
 #include "co_api.h"
 #include "co_dcli.h"
-#include "co_mrm_util.h"
+#include "cow_mrm_util.h"
 #include "rt_gdh.h"
 #include "flow_x.h"
 #include "flow_widget_motif.h"
-#include "rt_trace_motif.h"
-#include "co_wow_motif.h"
+#include "xtt_trace_motif.h"
+#include "cow_wow_motif.h"
 
 #define GOEN_F_GRID 0.05
 

src/lib/rt/motif/rt_trace_motif.h → xtt/lib/xtt/motif/xtt_trace_motif.h

 /* 
- * Proview   $Id: rt_trace_motif.h,v 1.1 2007-01-04 07:52:30 claes Exp $
+ * Proview   $Id$
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -17,11 +17,11 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef rt_trace_motif_h
-#define rt_trace_motif_h
+#ifndef xtt_trace_motif_h
+#define xtt_trace_motif_h
 
-#ifndef rt_trace_h
-#include "rt_trace.h"
+#ifndef xtt_trace_h
+#include "xtt_trace.h"
 #endif
 
 class RtTraceMotif : public RtTrace {

xtt/lib/xtt/motif/xtt_xatt_motif.cpp

@@ -20,6 +20,8 @@
 /* xtt_xatt.cpp -- Display object attributes */
 
 #include "glow_std.h"
+#include "pwr.h"
+#include "pwr_baseclasses.h"
 
 #include <stdio.h>
 #include <stdlib.h>

xtt/lib/xtt/motif/xtt_xattone_motif.cpp

@@ -28,6 +28,8 @@
 #endif
 
 #include "glow_std.h"
+#include "pwr.h"
+#include "pwr_baseclasses.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -44,7 +46,7 @@
 #include "co_time.h"
 #include "flow_x.h"
 #include "rt_xnav_msg.h"
-#include "co_mrm_util.h"
+#include "cow_mrm_util.h"
 
 #include "flow.h"
 #include "flow_browctx.h"

xtt/lib/xtt/motif/xtt_xcrr_motif.cpp

@@ -20,6 +20,8 @@
 /* xtt_xcrr_motif.cpp -- Display object crossreferences */
 
 #include "glow_std.h"
+#include "pwr.h"
+#include "pwr_baseclasses.h"
 
 #include <stdio.h>
 #include <stdlib.h>

xtt/lib/xtt/motif/xtt_xnav_motif.cpp

@@ -66,7 +66,7 @@ extern "C" {
 #include "glow_curvectx.h"
 
 #include "flow_x.h"
-#include "rt_trace_motif.h"
+#include "xtt_trace_motif.h"
 #include "cow_mrm_util.h"
 #include "co_lng.h"
 #include "co_error.h"
@@ -220,11 +220,11 @@ XCrr *XNavMotif::xcrr_new( pwr_tAttrRef *arp, int advanced_user, pwr_tStatus *st
 Ev *XNavMotif::ev_new( char *eve_name, char *ala_name, char *blk_name,
 		      pwr_tObjid ev_user, int display_ala, int display_eve,
 		      int display_blk, int display_return, int display_ack,
-		      int ev_beep, pwr_tStatus *status)
+		      int ev_beep, pwr_tMask ev_pop_mask, pwr_tStatus *status)
 {
   return new EvMotif( this, parent_wid, eve_name, ala_name, blk_name,
 		      ev_user, display_ala, display_eve, display_blk,
-		      display_return, display_ack, ev_beep, status);
+		      display_return, display_ack, ev_beep, ev_pop_mask, status);
 }
 
 Hist *XNavMotif::hist_new( char *title, pwr_tOid oid, pwr_tStatus *sts)

xtt/lib/xtt/motif/xtt_xnav_motif.h

@@ -51,7 +51,7 @@ class XNavMotif : public XNav {
     Ev *ev_new( char *eve_name, char *ala_name, char *blk_name,
 		pwr_tObjid ev_user, int display_ala, int display_eve,
 		int display_blk, int display_return, int display_ack,
-		int ev_beep, pwr_tStatus *status);
+		int ev_beep, pwr_tMask ev_pop_mask, pwr_tStatus *status);
     Hist *hist_new( char *title, pwr_tOid oid, pwr_tStatus *sts);
     Block *block_new( pwr_tAttrRef *arp, char *name, unsigned int priv,
 		      pwr_tStatus *sts);