Skip to content

P
proview
Commit 83065e42 authored by claes's avatar claes
Browse files
Options

Motif removed

parent 3bdbf1e2
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 153 deletions
src/lib/co/src/co_api.cpp
View file @ 83065e42
/** /**
* Proview $Id: co_api.cpp,v 1.10 2007-01-04 07:51:41 claes Exp $ * Proview $Id: co_api.cpp,v 1.11 2007-02-07 15:46:22 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -32,16 +32,6 @@ extern "C" { ...@@ -32,16 +32,6 @@ extern "C" {
#include "pwr.h" #include "pwr.h"
} }
#include <Xm/Xm.h>
#include <Mrm/MrmPublic.h>
#ifndef _XtIntrinsic_h
#include <X11/Intrinsic.h>
#endif
#include <X11/IntrinsicP.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include "flow.h" #include "flow.h"
#include "flow_browctx.h" #include "flow_browctx.h"
#include "flow_browapi.h" #include "flow_browapi.h"
......
src/lib/co/src/co_msglist.cpp
View file @ 83065e42
/** /**
* Proview $Id: co_msglist.cpp,v 1.7 2007-01-11 11:40:30 claes Exp $ * Proview $Id: co_msglist.cpp,v 1.8 2007-02-07 15:45:44 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -24,29 +24,10 @@ ...@@ -24,29 +24,10 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
extern "C" {
#include "co_cdh.h" #include "co_cdh.h"
#include "co_time.h" #include "co_time.h"
//#include "pwr_baseclasses.h"
}
#include <Xm/Xm.h>
#include <Xm/XmP.h>
#include <Xm/Text.h>
#include <Mrm/MrmPublic.h>
#include <X11/Intrinsic.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
// Status is defined as int i xlib...
#ifdef Status
# undef Status
#endif
extern "C" {
#include "flow_x.h"
#include "co_mrm_util.h"
}
#include "flow.h" #include "flow.h"
#include "flow_browctx.h" #include "flow_browctx.h"
#include "flow_browapi.h" #include "flow_browapi.h"
......
src/lib/co/src/co_msgwindow.cpp
View file @ 83065e42
/** /**
* Proview $Id: co_msgwindow.cpp,v 1.10 2007-01-04 07:51:42 claes Exp $ * Proview $Id: co_msgwindow.cpp,v 1.11 2007-02-07 15:45:44 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -28,17 +28,6 @@ ...@@ -28,17 +28,6 @@
#include "co_time.h" #include "co_time.h"
#include "co_dcli.h" #include "co_dcli.h"
#include <Xm/Xm.h>
#include <Xm/XmP.h>
#include <Xm/Text.h>
#include <Mrm/MrmPublic.h>
#include <X11/Intrinsic.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
extern "C" {
#include "flow_x.h"
}
#include "co_lng.h" #include "co_lng.h"
#include "co_xhelp.h" #include "co_xhelp.h"
#include "co_msgwindow.h" #include "co_msgwindow.h"
......
src/lib/co/src/co_xhelp.cpp
View file @ 83065e42
/** /**
* Proview $Id: co_xhelp.cpp,v 1.8 2007-01-04 07:51:42 claes Exp $ * Proview $Id: co_xhelp.cpp,v 1.9 2007-02-07 15:45:44 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -29,27 +29,13 @@ ...@@ -29,27 +29,13 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <Xm/Xm.h>
#include <Xm/XmP.h>
#include <Xm/Text.h>
#include <Xm/Protocols.h>
#include <Mrm/MrmPublic.h>
#include <X11/Intrinsic.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include "flow.h" #include "flow.h"
#include "flow_browctx.h" #include "flow_browctx.h"
#include "flow_browapi.h" #include "flow_browapi.h"
//extern "C" {
#include "co_cdh.h" #include "co_cdh.h"
#include "co_dcli.h" #include "co_dcli.h"
#include "co_time.h" #include "co_time.h"
#include "flow_x.h"
#include "co_mrm_util.h"
//}
#include "co_lng.h" #include "co_lng.h"
#include "co_xhelpnav.h" #include "co_xhelpnav.h"
#include "co_xhelp.h" #include "co_xhelp.h"
......
src/lib/co/src/co_xhelpnav.cpp
View file @ 83065e42
/** /**
* Proview $Id: co_xhelpnav.cpp,v 1.10 2007-01-04 07:51:42 claes Exp $ * Proview $Id: co_xhelpnav.cpp,v 1.11 2007-02-07 15:45:44 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -24,33 +24,16 @@ ...@@ -24,33 +24,16 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
//extern "C" {
#include "co_cdh.h" #include "co_cdh.h"
#include "co_dcli.h" #include "co_dcli.h"
#include "co_time.h" #include "co_time.h"
#include "co_msg.h" #include "co_msg.h"
//#include "pwr_baseclasses.h"
//}
#include <Xm/Xm.h>
#include <Xm/XmP.h>
#include <Xm/Text.h>
#include <Mrm/MrmPublic.h>
#include <X11/Intrinsic.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include "flow.h" #include "flow.h"
#include "flow_browctx.h" #include "flow_browctx.h"
#include "flow_browapi.h" #include "flow_browapi.h"
#include "flow_utils.h" #include "flow_utils.h"
#include "co_xhelpnav.h" #include "co_xhelpnav.h"
extern "C" {
#include "co_api.h"
}
#include "xnav_bitmap_morehelp8.h" #include "xnav_bitmap_morehelp8.h"
#include "xnav_bitmap_morehelp10.h" #include "xnav_bitmap_morehelp10.h"
#include "xnav_bitmap_morehelp12.h" #include "xnav_bitmap_morehelp12.h"
......
wb/exe/wb/src/os_linux/link_rule.mk
View file @ 83065e42
...@@ -3,23 +3,25 @@ link_rule_mk := 1 ...@@ -3,23 +3,25 @@ link_rule_mk := 1
ifeq ($(export_type),exp) ifeq ($(export_type),exp)
link = $(ldxx) $(explinkflags) $(domap) -o $(export_exe) \ link = $(ldxx) $(explinkflags) $(domap) -o $(export_exe) \
$(bld_dir)/wb.o $(wb_msg_eobjs) $(rt_msg_eobjs) \ $(bld_dir)/wb.o -lpwr_co
$(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_procom.o \ # $(bld_dir)/wb.o $(wb_msg_eobjs) $(rt_msg_eobjs) \
-L/usr/X11R6/lib -L/usr/local/BerkeleyDB.4.0/lib \ # $(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_procom.o \
-L/opt/gnome/lib \ # -L/usr/X11R6/lib -L/usr/local/BerkeleyDB.4.0/lib \
-lpwr_wb -lpwr_rt -lpwr_ge -lpwr_flow -lpwr_glow -lpwr_co \ # -L/opt/gnome/lib \
-lpwr_msg_dummy -lantlr -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\ # -lpwr_wb -lpwr_rt -lpwr_ge -lpwr_flow -lpwr_glow -lpwr_co \
-lXmu -lSM -lICE\ # -lpwr_msg_dummy -lantlr -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
-lrpcsvc -lpthread -lm -ldb_cxx -lz # -lXmu -lSM -lICE\
# -lrpcsvc -lpthread -lm -ldb_cxx -lz
else else
link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \ link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
$(bld_dir)/wb.o $(objects) $(wb_msg_eobjs) $(rt_msg_eobjs) \ $(bld_dir)/wb.o -lpwr_co
$(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_procom.o \ # $(bld_dir)/wb.o $(objects) $(wb_msg_eobjs) $(rt_msg_eobjs) \
-L/usr/X11R6/lib -L/usr/local/BerkeleyDB.4.0/lib \ # $(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_procom.o \
-L/opt/gnome/lib \ # -L/usr/X11R6/lib -L/usr/local/BerkeleyDB.4.0/lib \
-lpwr_wb -lpwr_rt -lpwr_ge -lpwr_flow -lpwr_glow -lpwr_co \ # -L/opt/gnome/lib \
-lpwr_msg_dummy -lantlr -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\ # -lpwr_wb -lpwr_rt -lpwr_ge -lpwr_flow -lpwr_glow -lpwr_co \
-lXmu -lSM -lICE\ # -lpwr_msg_dummy -lantlr -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
-lrpcsvc -lpthread -lm -ldb_cxx -lz # -lXmu -lSM -lICE\
# -lrpcsvc -lpthread -lm -ldb_cxx -lz
endif endif
endif endif
wb/exe/wb_cmd/src/os_linux/link_rule.mk
View file @ 83065e42
...@@ -2,13 +2,14 @@ ifndef link_rule_mk ...@@ -2,13 +2,14 @@ ifndef link_rule_mk
link_rule_mk := 1 link_rule_mk := 1
link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \ link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
$(export_obj) $(objects) $(wb_msg_eobjs) $(rt_msg_eobjs) \ $(export_obj) -lpwr_co
$(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_provider.o \ # $(export_obj) $(objects) $(wb_msg_eobjs) $(rt_msg_eobjs) \
-L/usr/X11R6/lib -L/usr/local/BerkeleyDB.4.0/lib \ # $(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_provider.o \
-L/opt/gnome/lib \ # -L/usr/X11R6/lib -L/usr/local/BerkeleyDB.4.0/lib \
-lpwr_wb -lpwr_rt -lpwr_ge -lpwr_flow -lpwr_glow -lpwr_co \ # -L/opt/gnome/lib \
-lpwr_msg_dummy -lantlr -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\ # -lpwr_wb -lpwr_rt -lpwr_ge -lpwr_flow -lpwr_glow -lpwr_co \
-lXmu -lSM -lICE\ # -lpwr_msg_dummy -lantlr -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
-lrpcsvc -lpthread -lm -lrt -ldb_cxx -lz # -lXmu -lSM -lICE\
# -lrpcsvc -lpthread -lm -lrt -ldb_cxx -lz
endif endif
wb/lib/wb/gtk/wb_wpkgnav_gtk.cpp
View file @ 83065e42
/* /*
* Proview $Id: wb_wpkgnav_gtk.cpp,v 1.1 2007-01-04 07:29:02 claes Exp $ * Proview $Id: wb_wpkgnav_gtk.cpp,v 1.2 2007-02-07 15:45:44 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -29,14 +29,6 @@ ...@@ -29,14 +29,6 @@
#include "rt_load.h" #include "rt_load.h"
#include "wb_pkg_msg.h" #include "wb_pkg_msg.h"
#include <Xm/Xm.h>
#include <Xm/XmP.h>
#include <Xm/Text.h>
#include <Mrm/MrmPublic.h>
#include <X11/Intrinsic.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include "flow.h" #include "flow.h"
#include "flow_browctx.h" #include "flow_browctx.h"
#include "flow_browapi.h" #include "flow_browapi.h"
......
xtt/exe/rt_xtt/src/os_linux/link_rule.mk
View file @ 83065e42
...@@ -2,11 +2,12 @@ ifndef link_rule_mk ...@@ -2,11 +2,12 @@ ifndef link_rule_mk
link_rule_mk := 1 link_rule_mk := 1
link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \ link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
$(export_obj) $(rt_msg_eobjs) \ $(export_obj) -lpwr_co
$(pwr_eobj)/rt_io_user.o -L/usr/X11R6/lib\ # $(export_obj) $(rt_msg_eobjs) \
-L/opt/gnome/lib \ # $(pwr_eobj)/rt_io_user.o -L/usr/X11R6/lib\
-lpwr_xtt -lpwr_ge -lpwr_rt -lpwr_co -lpwr_flow -lpwr_glow \ # -L/opt/gnome/lib \
-lpwr_msg_dummy -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\ # -lpwr_xtt -lpwr_ge -lpwr_rt -lpwr_co -lpwr_flow -lpwr_glow \
-lSM -lICE\ # -lpwr_msg_dummy -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
-ldb -lrpcsvc -lpthread -lm -lrt -lasound # -lSM -lICE\
# -ldb -lrpcsvc -lpthread -lm -lrt -lasound
endif endif
xtt/lib/ge/src/ge_convert.cpp
View file @ 83065e42
/* /*
* Proview $Id: ge_convert.cpp,v 1.5 2007-01-04 08:18:35 claes Exp $ * Proview $Id: ge_convert.cpp,v 1.6 2007-02-07 15:45:44 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -31,24 +31,11 @@ ...@@ -31,24 +31,11 @@
# include <stdlib.h> # include <stdlib.h>
# include <ctype.h> # include <ctype.h>
extern "C" {
#include "pwr_class.h" #include "pwr_class.h"
#include "co_cdh.h" #include "co_cdh.h"
#include "co_ccm.h" #include "co_ccm.h"
#include "co_dcli.h" #include "co_dcli.h"
#include "co_ccm_msg.h" #include "co_ccm_msg.h"
}
#include <Xm/Xm.h>
#include <Xm/XmP.h>
#include <Xm/Text.h>
#include <Xm/MessageB.h>
#include <Xm/SelectioB.h>
#include <Mrm/MrmPublic.h>
#include <X11/Intrinsic.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include "glow.h" #include "glow.h"
#include "glow_growctx.h" #include "glow_growctx.h"
#include "glow_growapi.h" #include "glow_growapi.h"
...@@ -60,7 +47,6 @@ extern "C" { ...@@ -60,7 +47,6 @@ extern "C" {
#include "ge_dyn.h" #include "ge_dyn.h"
extern "C" { extern "C" {
#include "flow_x.h"
#if LDH #if LDH
# include "wb_wccm.h" # include "wb_wccm.h"
#endif #endif
......
xtt/lib/ge/src/ge_graph_command.cpp
View file @ 83065e42
/* /*
* Proview $Id: ge_graph_command.cpp,v 1.11 2007-01-04 08:18:35 claes Exp $ * Proview $Id: ge_graph_command.cpp,v 1.12 2007-02-07 15:45:44 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -46,9 +46,6 @@ ...@@ -46,9 +46,6 @@
#include "ge.h" #include "ge.h"
#include "ge_dyn.h" #include "ge_dyn.h"
extern "C" {
#include "flow_x.h"
}
#if LDH #if LDH
# include "wb_wccm.h" # include "wb_wccm.h"
#endif #endif
......
xtt/lib/ge/src/ge_graph_web.cpp
View file @ 83065e42
/* /*
* Proview $Id: ge_graph_web.cpp,v 1.11 2007-01-30 13:00:18 claes Exp $ * Proview $Id: ge_graph_web.cpp,v 1.12 2007-02-07 15:45:44 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -25,8 +25,6 @@ ...@@ -25,8 +25,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h> #include <ctype.h>
extern "C" {
#include "co_cdh.h" #include "co_cdh.h"
#include "co_time.h" #include "co_time.h"
#include "co_ccm_msg.h" #include "co_ccm_msg.h"
...@@ -34,10 +32,6 @@ extern "C" { ...@@ -34,10 +32,6 @@ extern "C" {
#include "co_cnf.h" #include "co_cnf.h"
#include "pwr_baseclasses.h" #include "pwr_baseclasses.h"
#include "rt_gdh.h" #include "rt_gdh.h"
}
#include <Xm/Xm.h>
#include "glow.h" #include "glow.h"
#include "glow_growctx.h" #include "glow_growctx.h"
#include "glow_growapi.h" #include "glow_growapi.h"
......
xtt/lib/xtt/gtk/xtt_xattnav_gtk.cpp
View file @ 83065e42
/* /*
* Proview $Id: xtt_xattnav_gtk.cpp,v 1.1 2007-01-04 08:29:32 claes Exp $ * Proview $Id: xtt_xattnav_gtk.cpp,v 1.2 2007-02-07 15:45:44 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -27,15 +27,6 @@ ...@@ -27,15 +27,6 @@
#include "pwr_baseclasses.h" #include "pwr_baseclasses.h"
#include "rt_xatt_msg.h" #include "rt_xatt_msg.h"
#include "rt_mh_net.h" #include "rt_mh_net.h"
#include <Xm/Xm.h>
#include <Xm/XmP.h>
#include <Xm/Text.h>
#include <Mrm/MrmPublic.h>
#include <X11/Intrinsic.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include "flow.h" #include "flow.h"
#include "flow_browctx.h" #include "flow_browctx.h"
#include "flow_browapi.h" #include "flow_browapi.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7