Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
proview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Esteban Blanc
proview
Commits
348bdd40
Commit
348bdd40
authored
Nov 23, 2010
by
Claes Sjofors
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More pwre configure script modifications
parent
a065d5cc
Changes
15
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
70 additions
and
67 deletions
+70
-67
java/exe/jpwr_rt_gdh/src/os_templ/link_rule.mk
java/exe/jpwr_rt_gdh/src/os_templ/link_rule.mk
+2
-1
src/exe/rt_io_comm/src/os_templ/link_rule.mk
src/exe/rt_io_comm/src/os_templ/link_rule.mk
+2
-1
src/exe/rt_rtt/src/os_templ/link_rule.mk
src/exe/rt_rtt/src/os_templ/link_rule.mk
+1
-1
src/exp/com/src/os_linux/upgrade.sh
src/exp/com/src/os_linux/upgrade.sh
+32
-28
src/tools/pwre/src/os_freebsd/pwre_configure.sh
src/tools/pwre/src/os_freebsd/pwre_configure.sh
+3
-0
src/tools/pwre/src/os_linux/pwre.pl
src/tools/pwre/src/os_linux/pwre.pl
+2
-0
src/tools/pwre/src/os_linux/pwre_configure.sh
src/tools/pwre/src/os_linux/pwre_configure.sh
+8
-2
src/tools/pwre/src/os_macos/pwre_configure.sh
src/tools/pwre/src/os_macos/pwre_configure.sh
+1
-0
src/tools/pwre/src/os_templ/pwre_configure.sh
src/tools/pwre/src/os_templ/pwre_configure.sh
+2
-1
wb/exe/wb/gtk/os_templ/link_rule.mk
wb/exe/wb/gtk/os_templ/link_rule.mk
+1
-1
wb/exe/wb/motif/os_templ/link_rule.mk
wb/exe/wb/motif/os_templ/link_rule.mk
+1
-1
xtt/exe/rt_xtt/gtk/os_templ/link_rule.mk
xtt/exe/rt_xtt/gtk/os_templ/link_rule.mk
+6
-2
xtt/exe/rt_xtt/motif/os_templ/link_rule.mk
xtt/exe/rt_xtt/motif/os_templ/link_rule.mk
+7
-17
xtt/exe/wb_ge/motif/os_templ/link_rule.mk
xtt/exe/wb_ge/motif/os_templ/link_rule.mk
+1
-12
xtt/lib/xtt/motif/xtt_xnav_motif.cpp
xtt/lib/xtt/motif/xtt_xnav_motif.cpp
+1
-0
No files found.
java/exe/jpwr_rt_gdh/src/os_templ/link_rule.mk
View file @
348bdd40
...
@@ -25,7 +25,8 @@ link = $(ldxx) -shared -DHW_X86 -DOS_LINUX \
...
@@ -25,7 +25,8 @@ link = $(ldxx) -shared -DHW_X86 -DOS_LINUX \
${pwre_broot}
/
${pwre_target}
/bld/exe/jpwr_rt_gdh/jpwr_rt_gdh.o
\
${pwre_broot}
/
${pwre_target}
/bld/exe/jpwr_rt_gdh/jpwr_rt_gdh.o
\
${pwre_broot}
/
${pwre_target}
/bld/lib/statussrv/
*
.o
\
${pwre_broot}
/
${pwre_target}
/bld/lib/statussrv/
*
.o
\
${pwre_broot}
/
${pwre_target}
/exp/obj/stdsoap2.o
\
${pwre_broot}
/
${pwre_target}
/exp/obj/stdsoap2.o
\
-o
${pwr_exe}
/libjpwr_rt_gdh.so
$(pwre_conf_libpwrotherio)
$(pwre_conf_lib)
-lpwr_dtt
-o
${pwr_exe}
/libjpwr_rt_gdh.so
$(pwre_conf_libpwrotherio)
$(pwre_conf_lib)
\
$(pwre_conf_libpwrdtt)
# -lm -lpthread -lrt -lcrypt -lpwr_dtt -lpwr_usbio_dummy -ldb
# -lm -lpthread -lrt -lcrypt -lpwr_dtt -lpwr_usbio_dummy -ldb
...
...
src/exe/rt_io_comm/src/os_templ/link_rule.mk
View file @
348bdd40
...
@@ -5,7 +5,8 @@ ifeq ($(export_type),exp)
...
@@ -5,7 +5,8 @@ ifeq ($(export_type),exp)
link
=
$(ld)
$(explinkflags)
$(domap)
-o
$(export_exe)
\
link
=
$(ld)
$(explinkflags)
$(domap)
-o
$(export_exe)
\
$(export_obj)
$(objects)
$(rt_msg_objs)
\
$(export_obj)
$(objects)
$(rt_msg_objs)
\
$(pwr_obj)
/rt_io_user.o
\
$(pwr_obj)
/rt_io_user.o
\
$(pwre_conf_libpwrrt)
$(pwre_conf_lib)
$(pwre_conf_libpwrotherio)
$(pwre_conf_libpwrrt)
$(pwre_conf_lib)
\
$(pwre_conf_libpwrprofibus)
$(pwre_conf_libpwrotherio)
else
else
link
=
$(ld)
$(elinkflags)
$(domap)
-o
$(export_exe)
\
link
=
$(ld)
$(elinkflags)
$(domap)
-o
$(export_exe)
\
$(export_obj)
$(objects)
$(rt_msg_objs)
\
$(export_obj)
$(objects)
$(rt_msg_objs)
\
...
...
src/exe/rt_rtt/src/os_templ/link_rule.mk
View file @
348bdd40
...
@@ -4,6 +4,6 @@ link_rule_mk := 1
...
@@ -4,6 +4,6 @@ link_rule_mk := 1
link
=
$(ldxx)
$(linkflags)
$(domap)
-o
$(export_exe)
\
link
=
$(ldxx)
$(linkflags)
$(domap)
-o
$(export_exe)
\
$(export_obj)
$(objects)
$(rt_msg_objs)
$(pwr_obj)
/dtt_rttsys.o
\
$(export_obj)
$(objects)
$(rt_msg_objs)
$(pwr_obj)
/dtt_rttsys.o
\
$(pwr_obj)
/rt_io_user.o
$(pwr_lib)
/libpwr_dtt.a
-L
$(pwr_elib)
\
$(pwr_obj)
/rt_io_user.o
$(pwr_lib)
/libpwr_dtt.a
-L
$(pwr_elib)
\
-lpwr_dtt
$(pwre_conf_libpwrrt)
$(pwre_conf_lib)
$(pwre_conf_libpwrdtt)
$(pwre_conf_libpwrrt)
$(pwre_conf_lib)
endif
endif
src/exp/com/src/os_linux/upgrade.sh
View file @
348bdd40
...
@@ -89,6 +89,7 @@ reload_classvolumes()
...
@@ -89,6 +89,7 @@ reload_classvolumes()
echo
""
echo
""
echo
"Found classvolumes: "
echo
"Found classvolumes: "
for
file
in
$list
;
do
for
file
in
$list
;
do
if
[
${
file
##/*/
}
!=
"directory.wb_load"
]
;
then
volume
=
`
eval head
-n
1
$file
|
grep
pwr_eClass_ClassVolume |
awk
'{ print $2 }'
`
volume
=
`
eval head
-n
1
$file
|
grep
pwr_eClass_ClassVolume |
awk
'{ print $2 }'
`
if
[
"
$volume
"
==
""
]
;
then
if
[
"
$volume
"
==
""
]
;
then
volume
=
`
eval head
-n
1
$file
|
grep
ClassVolume |
awk
'{ print $2 }'
`
volume
=
`
eval head
-n
1
$file
|
grep
ClassVolume |
awk
'{ print $2 }'
`
...
@@ -97,6 +98,7 @@ reload_classvolumes()
...
@@ -97,6 +98,7 @@ reload_classvolumes()
if
[
"
$volume
"
!=
""
]
;
then
if
[
"
$volume
"
!=
""
]
;
then
echo
$file
echo
$file
fi
fi
fi
done
done
echo
""
echo
""
...
@@ -104,6 +106,7 @@ reload_classvolumes()
...
@@ -104,6 +106,7 @@ reload_classvolumes()
list
=
`
eval ls
-1d
$pwrp_db
/
*
.wb_load
`
list
=
`
eval ls
-1d
$pwrp_db
/
*
.wb_load
`
for
file
in
$list
;
do
for
file
in
$list
;
do
if
[
${
file
##/*/
}
!=
"directory.wb_load"
]
;
then
volume
=
`
eval grep
pwr_eClass_ClassVolume
$file
|
awk
'{ print $2 }'
`
volume
=
`
eval grep
pwr_eClass_ClassVolume
$file
|
awk
'{ print $2 }'
`
volumelow
=
`
eval grep
pwr_eClass_ClassVolume
$file
|
awk
'{ print tolower($2) }'
`
volumelow
=
`
eval grep
pwr_eClass_ClassVolume
$file
|
awk
'{ print tolower($2) }'
`
if
[
"
$volume
"
==
""
]
;
then
if
[
"
$volume
"
==
""
]
;
then
...
@@ -128,6 +131,7 @@ reload_classvolumes()
...
@@ -128,6 +131,7 @@ reload_classvolumes()
return
return
fi
fi
fi
fi
fi
done
done
}
}
...
...
src/tools/pwre/src/os_freebsd/pwre_configure.sh
View file @
348bdd40
...
@@ -102,6 +102,8 @@ pwre_config_check_lib()
...
@@ -102,6 +102,8 @@ pwre_config_check_lib()
elif
test
$3
==
"gtk"
;
then
elif
test
$3
==
"gtk"
;
then
conf_libgtk
=
$conf_libgtk
"
\\\`
pkg-config --libs gtk+-2.0
\\\`
"
conf_libgtk
=
$conf_libgtk
"
\\\`
pkg-config --libs gtk+-2.0
\\\`
"
conf_incdirgtk
=
$conf_incdirgtk
"
\\\`
pkg-config --cflags gtk+-2.0
\\\`
"
conf_incdirgtk
=
$conf_incdirgtk
"
\\\`
pkg-config --cflags gtk+-2.0
\\\`
"
elif
test
$3
==
"motif"
;
then
conf_libmotif
=
$conf_libmotif
" -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp -lSM -lICE"
else
else
echo
"Unknown type"
echo
"Unknown type"
fi
fi
...
@@ -281,6 +283,7 @@ echo "export PKG_CONFIG_PATH=/sw/fink/pkgconfig" >> $cfile
...
@@ -281,6 +283,7 @@ echo "export PKG_CONFIG_PATH=/sw/fink/pkgconfig" >> $cfile
echo
"export pwre_conf_cc_define=
\"
$conf_cc_define
\"
"
>>
$cfile
echo
"export pwre_conf_cc_define=
\"
$conf_cc_define
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrco=
\"
-lpwr_co
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrco=
\"
-lpwr_co
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrrt=
\"
-lpwr_rt -lpwr_co -lpwr_statussrv -lpwr_msg_dummy
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrrt=
\"
-lpwr_rt -lpwr_co -lpwr_statussrv -lpwr_msg_dummy
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrdtt=
\"
-lpwr_dtt
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrotherio=
\"
-lpwr_usbio_dummy -lpwr_usb_dummy
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrotherio=
\"
-lpwr_usbio_dummy -lpwr_usb_dummy
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrxtt=
\"
-lpwr_xtt -lpwr_ge -lpwr_cow -lpwr_flow -lpwr_glow
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrxtt=
\"
-lpwr_xtt -lpwr_ge -lpwr_cow -lpwr_flow -lpwr_glow
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrxttgtk=
\"
-lpwr_xtt_gtk -lpwr_ge_gtk -lpwr_cow_gtk -lpwr_flow_gtk -lpwr_glow_gtk
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrxttgtk=
\"
-lpwr_xtt_gtk -lpwr_ge_gtk -lpwr_cow_gtk -lpwr_flow_gtk -lpwr_glow_gtk
\"
"
>>
$cfile
...
...
src/tools/pwre/src/os_linux/pwre.pl
View file @
348bdd40
...
@@ -61,6 +61,8 @@ $varstr;
...
@@ -61,6 +61,8 @@ $varstr;
if
((
$dbname
=
$ENV
{"
pwre_env_db
"})
eq
"")
{
if
((
$dbname
=
$ENV
{"
pwre_env_db
"})
eq
"")
{
$dbname
=
$ENV
{"
HOME
"}
.
"
/pwre/pwre
";
$dbname
=
$ENV
{"
HOME
"}
.
"
/pwre/pwre
";
}
}
$os
=
substr
(
$ENV
{"
pwre_os
"},
3
,
100
);
$hw
=
substr
(
$ENV
{"
pwre_hw
"},
3
,
100
);
$configfile
=
$ENV
{"
pwre_broot
"}
.
"
/pwre_
"
.
$hw
.
"
_
"
.
$os
.
"
.cnf
";
$configfile
=
$ENV
{"
pwre_broot
"}
.
"
/pwre_
"
.
$hw
.
"
_
"
.
$os
.
"
.cnf
";
...
...
src/tools/pwre/src/os_linux/pwre_configure.sh
View file @
348bdd40
...
@@ -102,6 +102,8 @@ pwre_config_check_lib()
...
@@ -102,6 +102,8 @@ pwre_config_check_lib()
elif
test
$3
==
"gtk"
;
then
elif
test
$3
==
"gtk"
;
then
conf_libgtk
=
$conf_libgtk
"
\\\`
pkg-config --libs gtk+-2.0
\\\`
"
conf_libgtk
=
$conf_libgtk
"
\\\`
pkg-config --libs gtk+-2.0
\\\`
"
conf_incdirgtk
=
$conf_incdirgtk
"
\\\`
pkg-config --cflags gtk+-2.0
\\\`
"
conf_incdirgtk
=
$conf_incdirgtk
"
\\\`
pkg-config --cflags gtk+-2.0
\\\`
"
elif
test
$3
==
"motif"
;
then
conf_libmotif
=
$conf_libmotif
" -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp -lSM -lICE"
else
else
echo
"Unknown type"
echo
"Unknown type"
fi
fi
...
@@ -230,6 +232,7 @@ pwre_config_init
...
@@ -230,6 +232,7 @@ pwre_config_init
#Gtk
#Gtk
pwre_config_check_lib gtk GTK gtk gtk 0 /usr/lib/libgtk-x11-2.0.so
pwre_config_check_lib gtk GTK gtk gtk 0 /usr/lib/libgtk-x11-2.0.so
pwre_config_check_lib motif MRM motif motif 0 /usr/lib/libMrm.so
pwre_config_check_lib libantlr LIBANTLR lib lib 0 /usr/local/lib/libantlr.a
pwre_config_check_lib libantlr LIBANTLR lib lib 0 /usr/local/lib/libantlr.a
pwre_config_check_lib librpcsvc LIBRPCSVC lib lib 0 /usr/lib/librpcsvc.so:/usr/lib/librpcsvc.a
pwre_config_check_lib librpcsvc LIBRPCSVC lib lib 0 /usr/lib/librpcsvc.so:/usr/lib/librpcsvc.a
...
@@ -271,10 +274,13 @@ done
...
@@ -271,10 +274,13 @@ done
echo
"export pwre_conf_cc_define=
\"
$conf_cc_define
\"
"
>>
$cfile
echo
"export pwre_conf_cc_define=
\"
$conf_cc_define
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrco=
\"
-lpwr_co
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrco=
\"
-lpwr_co
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrrt=
\"
-lpwr_rt -lpwr_co -lpwr_statussrv -lpwr_msg_dummy -lpwr_usbio_dummy -lpwr_usb_dummy
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrrt=
\"
-lpwr_rt -lpwr_co -lpwr_statussrv -lpwr_msg_dummy
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrdtt=
\"
-lpwr_dtt
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrotherio=
\"
-lpwr_usbio_dummy -lpwr_usb_dummy
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrprofibus=
\"
-lpwr_pnak_dummy
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrxtt=
\"
-lpwr_xtt -lpwr_ge -lpwr_cow -lpwr_flow -lpwr_glow
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrxtt=
\"
-lpwr_xtt -lpwr_ge -lpwr_cow -lpwr_flow -lpwr_glow
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrxttgtk=
\"
-lpwr_xtt_gtk -lpwr_ge_gtk -lpwr_cow_gtk -lpwr_flow_gtk -lpwr_glow_gtk
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrxttgtk=
\"
-lpwr_xtt_gtk -lpwr_ge_gtk -lpwr_cow_gtk -lpwr_flow_gtk -lpwr_glow_gtk
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrxttmotif=
\"
-lpwr_ge_motif -lpwr_cow_motif -lpwr_flow_motif -lpwr_glow_motif
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrxttmotif=
\"
-lpwr_xtt_motif
-lpwr_ge_motif -lpwr_cow_motif -lpwr_flow_motif -lpwr_glow_motif
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrwb=
\"
-lpwr_wb
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrwb=
\"
-lpwr_wb
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrwbgtk=
\"
-lpwr_wb_gtk
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrwbgtk=
\"
-lpwr_wb_gtk
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrwbmotif=
\"
-lpwr_wb_motif
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrwbmotif=
\"
-lpwr_wb_motif
\"
"
>>
$cfile
...
...
src/tools/pwre/src/os_macos/pwre_configure.sh
View file @
348bdd40
...
@@ -281,6 +281,7 @@ echo "export PKG_CONFIG_PATH=/sw/fink/pkgconfig" >> $cfile
...
@@ -281,6 +281,7 @@ echo "export PKG_CONFIG_PATH=/sw/fink/pkgconfig" >> $cfile
echo
"export pwre_conf_cc_define=
\"
$conf_cc_define
\"
"
>>
$cfile
echo
"export pwre_conf_cc_define=
\"
$conf_cc_define
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrco=
\"
-lpwr_co
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrco=
\"
-lpwr_co
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrrt=
\"
-lpwr_rt -lpwr_co -lpwr_statussrv -lpwr_msg_dummy
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrrt=
\"
-lpwr_rt -lpwr_co -lpwr_statussrv -lpwr_msg_dummy
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrdtt=
\"
-lpwr_dtt
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrotherio=
\"
-lpwr_usbio_dummy -lpwr_usb_dummy
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrotherio=
\"
-lpwr_usbio_dummy -lpwr_usb_dummy
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrxtt=
\"
-lpwr_xtt -lpwr_ge -lpwr_cow -lpwr_flow -lpwr_glow
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrxtt=
\"
-lpwr_xtt -lpwr_ge -lpwr_cow -lpwr_flow -lpwr_glow
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrxttgtk=
\"
-lpwr_xtt_gtk -lpwr_ge_gtk -lpwr_cow_gtk -lpwr_flow_gtk -lpwr_glow_gtk
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrxttgtk=
\"
-lpwr_xtt_gtk -lpwr_ge_gtk -lpwr_cow_gtk -lpwr_flow_gtk -lpwr_glow_gtk
\"
"
>>
$cfile
...
...
src/tools/pwre/src/os_templ/pwre_configure.sh
View file @
348bdd40
...
@@ -271,7 +271,8 @@ done
...
@@ -271,7 +271,8 @@ done
echo
"export pwre_conf_cc_define=
\"
$conf_cc_define
\"
"
>>
$cfile
echo
"export pwre_conf_cc_define=
\"
$conf_cc_define
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrco=
\"
-lpwr_co
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrco=
\"
-lpwr_co
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrrt=
\"
-lpwr_rt -lpwr_co -lpwr_statussrv -lpwr_msg_dummy -lpwr_usbio_dummy -lpwr_usb_dummy
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrrt=
\"
-lpwr_rt -lpwr_co -lpwr_statussrv -lpwr_msg_dummy
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrotherio=
\"
-lpwr_usbio_dummy -lpwr_usb_dummy
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrxtt=
\"
-lpwr_xtt -lpwr_ge -lpwr_cow -lpwr_flow -lpwr_glow
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrxtt=
\"
-lpwr_xtt -lpwr_ge -lpwr_cow -lpwr_flow -lpwr_glow
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrxttgtk=
\"
-lpwr_xtt_gtk -lpwr_ge_gtk -lpwr_cow_gtk -lpwr_flow_gtk -lpwr_glow_gtk
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrxttgtk=
\"
-lpwr_xtt_gtk -lpwr_ge_gtk -lpwr_cow_gtk -lpwr_flow_gtk -lpwr_glow_gtk
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrxttmotif=
\"
-lpwr_ge_motif -lpwr_cow_motif -lpwr_flow_motif -lpwr_glow_motif
\"
"
>>
$cfile
echo
"export pwre_conf_libpwrxttmotif=
\"
-lpwr_ge_motif -lpwr_cow_motif -lpwr_flow_motif -lpwr_glow_motif
\"
"
>>
$cfile
...
...
wb/exe/wb/gtk/os_templ/link_rule.mk
View file @
348bdd40
...
@@ -7,7 +7,7 @@ ifeq ($(export_type),exp)
...
@@ -7,7 +7,7 @@ ifeq ($(export_type),exp)
$(pwr_eobj)
/rt_io_user.o
$(pwr_obj)
/wb_procom.o
$(pwr_eobj)
/stdsoap2.o
\
$(pwr_eobj)
/rt_io_user.o
$(pwr_obj)
/wb_procom.o
$(pwr_eobj)
/stdsoap2.o
\
$(pwre_conf_libpwrwbgtk)
$(pwre_conf_libpwrxttgtk)
$(pwre_conf_libpwrwb)
\
$(pwre_conf_libpwrwbgtk)
$(pwre_conf_libpwrxttgtk)
$(pwre_conf_libpwrwb)
\
$(pwre_conf_libpwrxtt)
$(pwre_conf_libpwrwbgtk)
$(pwre_conf_libpwrwb)
\
$(pwre_conf_libpwrxtt)
$(pwre_conf_libpwrwbgtk)
$(pwre_conf_libpwrwb)
\
$(pwre_conf_libgtk)
\
$(pwre_conf_lib
pwrxttgtk)
$(pwre_conf_libpwrxtt)
$(pwre_conf_lib
gtk)
\
$(pwre_conf_libpwrrt)
$(pwre_conf_lib)
$(pwre_conf_libpwrrt)
$(pwre_conf_lib)
else
else
...
...
wb/exe/wb/motif/os_templ/link_rule.mk
View file @
348bdd40
...
@@ -7,7 +7,7 @@ ifeq ($(export_type),exp)
...
@@ -7,7 +7,7 @@ ifeq ($(export_type),exp)
$(pwr_eobj)
/rt_io_user.o
$(pwr_obj)
/wb_procom.o
\
$(pwr_eobj)
/rt_io_user.o
$(pwr_obj)
/wb_procom.o
\
$(pwre_conf_libpwrwbmotif)
$(pwre_conf_libpwrxttmotif)
$(pwre_conf_libpwrwb)
\
$(pwre_conf_libpwrwbmotif)
$(pwre_conf_libpwrxttmotif)
$(pwre_conf_libpwrwb)
\
$(pwre_conf_libpwrxtt)
$(pwre_conf_libpwrwbmotif)
$(pwre_conf_libpwrwb)
\
$(pwre_conf_libpwrxtt)
$(pwre_conf_libpwrwbmotif)
$(pwre_conf_libpwrwb)
\
$(pwre_conf_libmotif)
\
$(pwre_conf_lib
pwrxttmotif)
$(pwre_conf_libpwrxtt)
$(pwre_conf_lib
motif)
\
$(pwre_conf_libpwrrt)
$(pwre_conf_lib)
$(pwre_conf_libpwrrt)
$(pwre_conf_lib)
# -L/usr/X11R6/lib -L/usr/local/BerkeleyDB.4.0/lib \
# -L/usr/X11R6/lib -L/usr/local/BerkeleyDB.4.0/lib \
...
...
xtt/exe/rt_xtt/gtk/os_templ/link_rule.mk
View file @
348bdd40
...
@@ -5,14 +5,18 @@ ifeq ($(export_type),exp)
...
@@ -5,14 +5,18 @@ ifeq ($(export_type),exp)
link
=
$(ldxx)
$(explinkflags)
$(domap)
-o
$(pwr_exe)
/rt_xtt_gtk
\
link
=
$(ldxx)
$(explinkflags)
$(domap)
-o
$(pwr_exe)
/rt_xtt_gtk
\
$(bld_dir)
/rt_xtt_gtk.o
$(bld_dir)
/xtt_main.o
$(rt_msg_eobjs)
\
$(bld_dir)
/rt_xtt_gtk.o
$(bld_dir)
/xtt_main.o
$(rt_msg_eobjs)
\
$(pwr_eobj)
/rt_io_user.o
\
$(pwr_eobj)
/rt_io_user.o
\
$(pwre_conf_libpwrxttgtk)
$(pwre_conf_libpwrxtt)
$(pwre_conf_libgtk)
\
$(pwre_conf_libpwrxttgtk)
$(pwre_conf_libpwrxtt)
\
$(pwre_conf_libpwrxttgtk)
$(pwre_conf_libpwrxtt)
\
$(pwre_conf_libgtk)
\
$(pwre_conf_libpwrrt)
$(pwre_conf_lib)
$(pwre_conf_libpwrrt)
$(pwre_conf_lib)
else
else
link
=
$(ldxx)
$(elinkflags)
$(domap)
-o
$(pwr_exe)
/rt_xtt_gtk
\
link
=
$(ldxx)
$(elinkflags)
$(domap)
-o
$(pwr_exe)
/rt_xtt_gtk
\
$(bld_dir)
/rt_xtt_gtk.o
$(bld_dir)
/xtt_main.o
$(rt_msg_eobjs)
\
$(bld_dir)
/rt_xtt_gtk.o
$(bld_dir)
/xtt_main.o
$(rt_msg_eobjs)
\
$(pwr_eobj)
/rt_io_user.o
\
$(pwr_eobj)
/rt_io_user.o
\
$(pwre_conf_libpwrxttgtk)
$(pwre_conf_libpwrxtt)
$(pwre_conf_libgtk)
\
$(pwre_conf_libpwrxttgtk)
$(pwre_conf_libpwrxtt)
\
$(pwre_conf_libpwrxttgtk)
$(pwre_conf_libpwrxtt)
\
$(pwre_conf_libgtk)
\
$(pwre_conf_libpwrrt)
$(pwre_conf_lib)
$(pwre_conf_libpwrrt)
$(pwre_conf_lib)
endif
endif
...
...
xtt/exe/rt_xtt/motif/os_templ/link_rule.mk
View file @
348bdd40
...
@@ -4,30 +4,20 @@ link_rule_mk := 1
...
@@ -4,30 +4,20 @@ link_rule_mk := 1
ifeq
($(export_type),exp)
ifeq
($(export_type),exp)
link
=
$(ldxx)
$(explinkflags)
$(domap)
-o
$(pwr_exe)
/rt_xtt_motif
\
link
=
$(ldxx)
$(explinkflags)
$(domap)
-o
$(pwr_exe)
/rt_xtt_motif
\
$(bld_dir)
/rt_xtt_motif.o
$(bld_dir)
/xtt_main.o
$(rt_msg_eobjs)
\
$(bld_dir)
/rt_xtt_motif.o
$(bld_dir)
/xtt_main.o
$(rt_msg_eobjs)
\
$(pwr_eobj)
/rt_io_user.o
$(pwr_eobj)
/rt_io_user.o
\
$(pwre_conf_libpwrxttmotif)
$(pwre_conf_libpwrxtt)
$(pwre_conf_libmotif)
\
$(pwre_conf_libpwrxttmotif)
$(pwre_conf_libpwrxtt)
\
$(pwre_conf_libpwrxttmotif)
$(pwre_conf_libpwrxtt)
\
$(pwre_conf_libmotif)
\
$(pwre_conf_libpwrrt)
$(pwre_conf_lib)
$(pwre_conf_libpwrrt)
$(pwre_conf_lib)
#-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 \
# -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\
# -ldb -lrpcsvc -lpthread -lm -lrt -lasound -lcrypt
else
else
link
=
$(ldxx)
$(elinkflags)
$(domap)
-o
$(pwr_exe)
/rt_xtt_motif
\
link
=
$(ldxx)
$(elinkflags)
$(domap)
-o
$(pwr_exe)
/rt_xtt_motif
\
$(bld_dir)
/rt_xtt_motif.o
$(bld_dir)
/xtt_main.o
$(rt_msg_eobjs)
\
$(bld_dir)
/rt_xtt_motif.o
$(bld_dir)
/xtt_main.o
$(rt_msg_eobjs)
\
$(pwr_eobj)
/rt_io_user.o
\
$(pwr_eobj)
/rt_io_user.o
\
$(pwre_conf_libpwrxttmotif)
$(pwre_conf_libpwrxtt)
$(pwre_conf_libmotif)
\
$(pwre_conf_libpwrxttmotif)
$(pwre_conf_libpwrxtt)
\
$(pwre_conf_libpwrxttmotif)
$(pwre_conf_libpwrxtt)
\
$(pwre_conf_libmotif)
\
$(pwre_conf_libpwrrt)
$(pwre_conf_lib)
$(pwre_conf_libpwrrt)
$(pwre_conf_lib)
#-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 \
# -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\
# -ldb -lrpcsvc -lpthread -lm -lrt -lasound -lcrypt
endif
endif
endif
endif
xtt/exe/wb_ge/motif/os_templ/link_rule.mk
View file @
348bdd40
...
@@ -6,18 +6,7 @@ link = $(ldxx) -L$(pwr_elib) $(elinkflags) $(domap) -o $(pwr_exe)/wb_ge_motif \
...
@@ -6,18 +6,7 @@ link = $(ldxx) -L$(pwr_elib) $(elinkflags) $(domap) -o $(pwr_exe)/wb_ge_motif \
$(pwr_eobj)
/rt_io_user.o
$(pwr_eobj)
/wb_provider.o
\
$(pwr_eobj)
/rt_io_user.o
$(pwr_eobj)
/wb_provider.o
\
$(pwre_conf_libpwrwbmotif)
$(pwre_conf_libpwrxttmotif)
$(pwre_conf_libpwrwb)
\
$(pwre_conf_libpwrwbmotif)
$(pwre_conf_libpwrxttmotif)
$(pwre_conf_libpwrwb)
\
$(pwre_conf_libpwrxtt)
$(pwre_conf_libpwrwbmotif)
$(pwre_conf_libpwrwb)
\
$(pwre_conf_libpwrxtt)
$(pwre_conf_libpwrwbmotif)
$(pwre_conf_libpwrwb)
\
$(pwre_conf_libmotif)
\
$(pwre_conf_lib
pwrxttmotif)
$(pwre_conf_libpwrxtt)
$(pwre_conf_lib
motif)
\
$(pwre_conf_libpwrrt)
$(pwre_conf_lib)
$(pwre_conf_libpwrrt)
$(pwre_conf_lib)
#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 -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)
endif
endif
xtt/lib/xtt/motif/xtt_xnav_motif.cpp
View file @
348bdd40
...
@@ -25,6 +25,7 @@
...
@@ -25,6 +25,7 @@
#include <stdlib.h>
#include <stdlib.h>
#include <vector>
#include <vector>
#include "pwr.h"
#include "co_nav_help.h"
#include "co_nav_help.h"
extern
"C"
{
extern
"C"
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment