Skip to content

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

Module separation work

parent 60379bea
Hide whitespace changes
Inline Side-by-side
Showing with 239 additions and 134 deletions
java/exe/jpwr_rt_gdh/src/os_linux/hw_x86/makefile
View file @ d17f3e3b
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
......
java/exe/jpwr_rt_gdh/src/os_linux/link_rule.mk
View file @ d17f3e3b
......@@ -2,10 +2,11 @@ ifndef link_rule_mk
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_objs) \
$(rt_msg_eobjs) \
${pwre_broot}/${pwre_target}/bld/lib/msg_dummy/msg_dummy_qcom.o \
${pwre_broot}/${pwre_target}/bld/lib/msg_dummy/msg_dummy_op.o \
${pwre_broot}/${pwre_target}/bld/lib/msg_dummy/msg_dummy_wb.o \
......
nmps/wbl/nmps/src/os_linux/hw_x86/makefile
View file @ d17f3e3b
......@@ -51,7 +51,7 @@ $(load_dir)/nmps.dbs :
$(inc_dir)/pwr_nmpsclasses.h :
@ echo "Generating struct files for nmps classes..."
@ co_convert -s -d $(inc_dir) "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
@ co_convert -so -d $(inc_dir) "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
$(inc_dir)/pwr_nmpsclasses.hpp :
@ echo "Generating hpp files for nmps classes..."
......
src/exp/rt/src/os_linux/hw_x86/makefile
View file @ d17f3e3b
......@@ -67,7 +67,7 @@ all : init copy lib
init :
copy : $(exe_dir)/xtt_help.dat $(exe_dir)/sv_se/pwrb_xtthelp.dat $(exe_dir)/pwr_logga.gif $(export_gif) $(export_gifdoc) $(export_wav)
copy : $(load_dir)/pwr_volumelist.dat $(exe_dir)/xtt_help.dat $(exe_dir)/sv_se/pwrb_xtthelp.dat $(exe_dir)/pwr_logga.gif $(export_gif) $(export_gifdoc) $(export_wav)
lib : $(export_obj)
......@@ -83,6 +83,10 @@ $(exe_dir)/%.wav : ../../%.wav
@ $(log_h_h)
@ $(cp) $(cpflags) $(source) $(target)
$(load_dir)/pwr_volumelist.dat : ../../pwr_volumelist.dat
@ echo "Copying pwr_volumelist.dat"
@ $(cp) $(cpflags) $(source) $(target)
$(exe_dir)/xtt_help.dat : xtt_help.dat
@ echo "Copying xtt_help.dat"
@ $(cp) $(cpflags) $(source) $(target)
......
src/tools/bld/src/os_linux/exe_generic.mk
View file @ d17f3e3b
......@@ -9,18 +9,18 @@ ifndef exe_generic_mk
exe_generic_mk := 1
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
......@@ -33,7 +33,7 @@ ifndef link_rule_mk
-include $(link_rule)
endif
ifndef link_rule_mk
link_rule := $(pwre_sroot)/tools/bld/src/$(os_name)/link_rule_generic.mk
link_rule := $(pwre_kroot)/tools/bld/src/$(os_name)/link_rule_generic.mk
include $(link_rule)
endif
......
src/tools/bld/src/os_linux/hw_x86/variables.mk
View file @ d17f3e3b
......@@ -25,6 +25,8 @@ load_dir := $(module_root)/load
doc_dir := $(release_root)/exp/doc
elib_dir := $(release_root)/exp/lib
einc_dir := $(release_root)/exp/inc
eobj_dir := $(release_root)/exp/obj
eexe_dir := $(release_root)/exp/exe
bld_dir := $(release_root)/bld/$(type_name)/$(comp_name)
tmp_dir := $(release_root)/tmp
......@@ -85,6 +87,9 @@ clibobj = -c -o $(libobj)
rt_msg_objs := $(obj_dir)/pwr_msg_co.o $(obj_dir)/pwr_msg_rt.o
rs_msg_objs := $(obj_dir)/pwr_msg_rs.o
wb_msg_objs := $(obj_dir)/pwr_msg_wb.o $(obj_dir)/pwr_msg_ge.o $(obj_dir)/pwr_msg_flow.o
rt_msg_eobjs := $(eobj_dir)/pwr_msg_co.o $(eobj_dir)/pwr_msg_rt.o
rs_msg_eobjs := $(eobj_dir)/pwr_msg_rs.o
wb_msg_eobjs := $(eobj_dir)/pwr_msg_wb.o $(eobj_dir)/pwr_msg_ge.o $(eobj_dir)/pwr_msg_flow.o
log_done =
csetos := -DOS_LINUX=1 -DOS=linux -DHW_X86=1 -DHW=x86
......@@ -102,7 +107,7 @@ ld := gcc
cxx := g++
ldxx := g++
lex := flex
msg2cmsg := $(exe_dir)/tools_msg2cmsg
msg2cmsg := $(eexe_dir)/tools_msg2cmsg
javac := javac
#list = $(to-vms $(lis_dir)/$(sname)$(lis_ext))
......@@ -113,7 +118,7 @@ ifeq ($(pwre_btype),rls)
cflags := -c -O3 -D_GNU_SOURCE -DPWR_NDEBUG -D_REENTRANT
cxxflags := $(cflags)
linkflags := -O3 -L/usr/local/lib -L$(lib_dir) -lm -lrt
elinkflags := -O3 -L/usr/local/lib -L$(elib_dir) -L$(libdir) -lm -lrt
elinkflags := -O3 -L/usr/local/lib -L$(libdir) -L$(elib_dir) -lm -lrt
clis = /lis=$(list)
dolist = /lis=$(list)
domap = -Xlinker -Map -Xlinker $(map)
......@@ -122,7 +127,7 @@ else
cxxflags := $(cflags) -Wno-deprecated
mmflags := -Wno-deprecated
linkflags := -g -L/usr/local/lib -L$(lib_dir) -lrt
elinkflags := -g -L/usr/local/lib -L$(elib_dir) -L$(lib_dir) -lrt
elinkflags := -g -L/usr/local/lib -L$(lib_dir) -L$(elib_dir) -lrt
dolist = /lis=$(list)
clis :=
domap = -Xlinker -Map -Xlinker $(map)
......
src/tools/bld/src/os_linux/jpwr_generic.mk
View file @ d17f3e3b
......@@ -10,18 +10,18 @@ jpwr_generic_mk := 1
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
......
src/tools/bld/src/os_linux/link_rule_generic.mk
View file @ d17f3e3b
ifndef link_rule_mk
link_rule_mk := 1
link = $(ld) $(linkflags) $(domap) -o $(export_exe) \
link = $(ld) $(elinkflags) $(domap) -o $(export_exe) \
$(export_obj) $(objects) $(rt_msg_objs) \
-lpwr_rt -lpwr_co -lpwr_msg_dummy -lpthread -lm -lrpcsvc
......
src/tools/bld/src/os_linux/msg_generic.mk
View file @ d17f3e3b
......@@ -9,18 +9,18 @@ ifndef msg_generic_mk
msg_generic_mk := 1
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
......
src/tools/bld/src/os_linux/wbl_generic.mk
View file @ d17f3e3b
......@@ -81,7 +81,7 @@ $(load_dir)/%.dbs : ../../%.wb_load
$(inc_dir)/pwr_%classes.h : ../../%.wb_load
@ echo "Generating struct files for $(source) classes..."
@ co_convert -s -d $(inc_dir) "$(source)"
@ co_convert -so -d $(inc_dir) "$(source)"
$(inc_dir)/pwr_%classes.hpp : ../../%.wb_load
@ echo "Generating hpp files for $(source) classes..."
......
src/tools/pwre/src/os_linux/pwre.pl
View file @ d17f3e3b
......@@ -171,53 +171,95 @@ sub build () # args: branch, subbranch, phase
#
sub build_all_modules ()
{
_module("kernel");
build_all("copy");
merge();
_module("wb");
build_all("copy");
merge();
_module("kernel");
build_all("lib");
merge();
_module("ssabox");
_module("wb");
build_all("lib");
merge();
_module("nmps");
build_all("copy", "lib");
merge();
_module("tlog");
build_all("copy", "lib");
merge();
_module("remote");
build_all("copy");
merge();
_module("bcomp");
build_all("copy");
merge();
_module("java");
build_all("copy");
merge();
_module("ssabox");
build_all("copy");
merge();
_module("othermanu");
build_all("lib");
build_all("copy");
merge();
_module("abb");
build_all("lib");
build_all("copy");
merge();
_module("siemens");
build_all("lib");
build_all("copy");
merge();
_module("inor");
build_all("lib");
build_all("copy");
merge();
_module("klocknermoeller");
build_all("lib");
build_all("copy");
merge();
_module("telemecanique");
build_all("lib");
build_all("copy");
merge();
_module("wb");
build_all("exe");
merge();
_module("kernel");
build_all("","exe");
build_all("exe");
merge();
_module("nmps");
build_all("lib", "exe");
merge();
_module("tlog");
build_all("lib", "exe");
merge();
_module("remote");
build_all("lib", "exe");
merge();
_module("bcomp");
build_all("lib", "exe");
merge();
_module("java");
build_all("lib", "exe");
merge();
_module("ssabox");
build_all("","exe");
build_all("lib", "exe");
merge();
_module("othermanu");
build_all("","exe");
build_all("lib", "exe");
merge();
_module("abb");
build_all("","exe");
build_all("lib", "exe");
merge();
_module("siemens");
build_all("","exe");
build_all("lib", "exe");
merge();
_module("inor");
build_all("","exe");
build_all("lib", "exe");
merge();
_module("klocknermoeller");
build_all("","exe");
build_all("lib", "exe");
merge();
_module("telemecanique");
build_all("","exe");
build_all("lib", "exe");
merge();
# my($exe_dir) = $ENV{"pwr_exe"};
......@@ -233,6 +275,18 @@ sub create_all_modules ()
{
_module("kernel");
create();
_module("wb");
create();
_module("nmps");
create();
_module("tlog");
create();
_module("remote");
create();
_module("java");
create();
_module("bcomp");
create();
_module("ssabox");
create();
_module("othermanu");
......@@ -254,8 +308,24 @@ sub create_all_modules ()
#
sub build_all ()
{
my($to) = $_[0];
my($from) = $_[1];
$copy = 0;
$lib = 0;
$exe = 0;
if ( $_[0] eq "copy" || $_[1] eq "copy" || $_[2] eq "copy") {
$copy = 1;
}
if ( $_[0] eq "lib" || $_[1] eq "lib" || $_[2] eq "lib") {
$lib = 1;
}
if ( $_[0] eq "exe" || $_[1] eq "exe" || $_[2] eq "exe") {
$exe = 1;
}
if ( $_[0] eq "") {
$copy = 1;
$lib = 1;
$exe = 1;
}
if (!defined($ENV{"pwre_env"})) {
print("++ Environment is not initialized!\n");
......@@ -278,87 +348,92 @@ sub build_all ()
if ( $module eq "kernel") {
if ( $from eq "") {
if ( $copy == 1) {
_build("exp", "inc", "all");
_build("exp", "com", "all");
_build("tools/exe", "*", "all");
merge("exe/tools_cmsg2c");
merge("exe/tools_msg2cmsg");
_build("msg", "*", "all");
_build("lib", "rt", "init copy");
_build("lib", "wb", "init copy");
# _build("lib", "wb", "init copy");
_build("lib", "co", "init copy");
_build("lib", "dtt", "init copy");
_build("exp", "wb", "init copy");
# _build("exp", "wb", "init copy");
_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("wbl", "nmps", "copy");
_build("wbl", "ssab", "copy");
_build("wbl", "tlog", "copy");
_build("wbl", "bcomp", "copy");
}
if ( $lib == 1) {
_build("lib", "ge", "all");
_build("lib", "wb", "all");
_module("nmps");
_build("wbl", "nmps", "init copy");
merge("inc/pwr_nmpsclasses.h");
_module("remote");
_build("wbl", "remote", "init copy");
merge("inc/pwr_remoteclasses.h");
_module("kernel");
_build("lib", "rt", "all");
_build("lib", "rs", "all");
_build("exp", "rt", "all");
_build("exp", "wb", "all");
# _build("exp", "wb", "all");
_build("lib", "msg_dummy", "all");
_build("exe", "wb_rtt", "all");
_build("lib", "dtt", "all");
_build("exp", "rt", "all");
# _build("lib", "wb", "all");
}
if ( $to eq "lib") {
return;
if ( $exe == 1) {
_build("exe", "rt*", "all");
# _build("exe", "wb*", "all");
_build("exp", "ge", "all");
_build("mmi", "*", "copy");
# _build("db", "wb", "init");
_build("wbl", "pwrs", "lib");
_build("wbl", "pwrb", "lib");
_build("wbl", "wb", "lib");
_build("wbl", "rt", "lib");
_build("doc", "web", "all");
_build("doc", "dweb", "all");
_build("doc", "orm", "all");
_build("doc", "prm", "all");
_build("doc", "man", "all");
_build("doc", "dox", "all");
_build("wbl", "pwrs", "exe");
_build("wbl", "pwrb", "exe");
}
}
elsif ( $module eq "java") {
if ( $lib == 1) {
_build("jpwr", "rt", "all");
_build("jpwr", "jop", "all");
_build("jpwr", "jopc", "all");
_build("jpwr", "beans", "all");
_build("jpwr", "rt_client", "all");
}
_build("exe", "wb*", "all");
_build("exe", "rt*", "all");
_build("exe", "rs*", "all");
_build("exe", "jpwr*", "all");
_build("exp", "ge", "all");
_build("mmi", "*", "copy");
_build("jpwr", "rt", "all");
_build("jpwr", "jop", "all");
_build("jpwr", "jopc", "all");
_build("jpwr", "beans", "all");
_build("jpwr", "rt_client", "all");
# _build("db", "wb", "init");
_build("wbl", "pwrs", "lib");
_build("wbl", "pwrb", "lib");
_build("wbl", "nmps", "lib");
_build("wbl", "ssab", "lib");
_build("wbl", "tlog", "lib");
_build("wbl", "bcomp", "lib");
_build("wbl", "wb", "lib");
_build("wbl", "rt", "lib");
_build("doc", "web", "all");
_build("doc", "dweb", "all");
_build("doc", "orm", "all");
_build("doc", "prm", "all");
_build("doc", "man", "all");
_build("doc", "dox", "all");
_build("wbl", "pwrs", "exe");
_build("wbl", "pwrb", "exe");
_build("wbl", "nmps", "exe");
_build("wbl", "tlog", "exe");
_build("wbl", "ssab", "exe");
_build("wbl", "bcomp", "exe");
}
else {
if ( $from eq "") {
_build("wbl", "mcomp", "copy");
_build("mmi", "mcomp", "copy");
_build("lib", "rt", "all");
_build("lib", "wb", "all");
printf( "Copy: %d Lib: %d Exe: %d\n", $copy, $lib, $exe);
if ( $copy == 1) {
_build("wbl", "*", "copy");
_build("lib", "*", "init copy");
_build("exp", "*", "init copy");
_build("mmi", "*", "copy");
}
if ( $to eq "lib") {
return;
if ( $lib == 1) {
_build("lib", "*", "lib");
_build("exp", "*", "lib");
}
if ( $exe == 1) {
_build("wbl", "*", "lib");
_build("wbl", "*", "exe");
_build("exe", "*", "all");
_build("doc", "dsh", "copy");
_build("doc", "orm", "copy");
}
_build("wbl", "mcomp", "lib");
_build("wbl", "mcomp", "exe");
_build("doc", "dsh", "copy");
_build("doc", "orm", "copy");
}
}
......@@ -671,6 +746,8 @@ sub merge ()
printf("++\n++ No build root is defined\n");
exit 1;
}
my($file) = $_[0];
# if ($module eq "kernel") {
# printf("++\n++ No merge for module kernel needed\n");
# exit 1;
......@@ -681,9 +758,9 @@ sub merge ()
$mroot .= "/" . $ENV{"pwre_module"};
$eroot .= "/exp";
printf("--\n");
printf("-- Merge $module...\n");
printf("-- Merge %s %s\n", $module, $file);
my($cmd) = $ENV{pwre_bin} . "/pwre_merge.sh " . $mroot . " " . $eroot;
my($cmd) = $ENV{pwre_bin} . "/pwre_merge.sh " . $mroot . " " . $eroot . " " . $file;
system("$cmd");
}
......
src/tools/pwre/src/os_linux/pwre_merge.sh
View file @ d17f3e3b
......@@ -7,8 +7,14 @@ merge_dir_func()
{
local todir=$1
local fromdir=$2
local singlefile=$3
files=`eval ls $fromdir 2>/dev/null`
if [ "$singlefile" != "" ]; then
files=$singlefile
todir=$todir/${singlefile%/*}
else
files=`eval ls $fromdir 2>/dev/null`
fi
if [ ! -z "$files" ]; then
for file in $files; do
......@@ -34,40 +40,52 @@ merge_dir_func()
fromroot=$1
toroot=$2
file=$3
# Copy exe, load, obj and inc
merge_dir_func $toroot/exe $fromroot/exe
merge_dir_func $toroot/exe/sv_se $fromroot/exe/sv_se
merge_dir_func $toroot/exe/en_us $fromroot/exe/en_us
merge_dir_func $toroot/exe/de_de $fromroot/exe/de_de
merge_dir_func $toroot/inc $fromroot/inc
merge_dir_func $toroot/load $fromroot/load
merge_dir_func $toroot/obj $fromroot/obj
if [ "$file" != "" ]; then
# Merge only this file
merge_dir_func $toroot $fromroot $file
else
# Copy exe, load, obj and inc
merge_dir_func $toroot/exe $fromroot/exe
merge_dir_func $toroot/exe/sv_se $fromroot/exe/sv_se
merge_dir_func $toroot/exe/en_us $fromroot/exe/en_us
merge_dir_func $toroot/exe/de_de $fromroot/exe/de_de
merge_dir_func $toroot/inc $fromroot/inc
merge_dir_func $toroot/load $fromroot/load
merge_dir_func $toroot/obj $fromroot/obj
# Merge archives
cd ${toroot%/*}/tmp
libraries=`eval ls $fromroot/lib/* 2>/dev/null`
for lib in $libraries; do
# Merge archives
cd ${toroot%/*}/tmp
libraries=`eval ls $fromroot/lib/* 2>/dev/null`
for lib in $libraries; do
arname=${lib##/*/}
if [ $arname = "libpwr_rt.a" ] || [ $arname = "libpwr_wb.a" ]; then
echo "Merge $lib"
modules=`eval ar -tf $lib`
ar -xf $lib
ar -rc $toroot/lib/$arname $modules
rm $modules
else
echo "Copy $lib"
cp $lib $toroot/lib/
fi
done
#Merge io methods
echo "-- Merge io methods"
co_merge io_base $pwr_einc/rt_io_\*.meth $pwr_elib/libpwr_rt.a
echo "-- Merge wb methods"
co_merge wb_base $pwr_einc/wb_\*.meth $pwr_elib/libpwr_wb.a
arname=${lib##/*/}
if [ $arname = "libpwr_rt.a" ] || [ $arname = "libpwr_wb.a" ]; then
echo "Merge $lib"
modules=`eval ar -tf $lib`
ar -xf $lib
ar -rc $toroot/lib/$arname $modules
rm $modules
else
echo "Copy $lib"
cp $lib $toroot/lib/
fi
done
#Merge io methods
methodfile=$pwr_inc/rt_io_$pwre_module.meth
if [ -e $methodfile ]; then
echo "-- Merge io methods"
co_merge io_base $pwr_einc/rt_io_\*.meth $pwr_elib/libpwr_rt.a
fi
methodfile=$pwr_inc/wb_$pwre_module.meth
if [ -e $methodfile ]; then
echo "-- Merge wb methods"
co_merge wb_base $pwr_einc/wb_\*.meth $pwr_elib/libpwr_wb.a
fi
fi
src/wbl/pwrb/src/os_linux/hw_x86/makefile
View file @ d17f3e3b
......@@ -52,7 +52,7 @@ $(load_dir)/pwrb.dbs :
$(inc_dir)/pwr_baseclasses.h :
@ echo "Generating struct files for pwrb classes..."
@ co_convert -s -d $(inc_dir) "$(pwre_sroot)/wbl/pwrb/src/pwrb_*.wb_load"
@ co_convert -so -d $(inc_dir) "$(pwre_sroot)/wbl/pwrb/src/pwrb_*.wb_load"
$(inc_dir)/pwr_baseclasses.hpp :
@ echo "Generating hpp files for pwrb classes..."
......
src/wbl/pwrs/src/os_linux/hw_x86/makefile
View file @ d17f3e3b
......@@ -50,7 +50,7 @@ $(load_dir)/pwrs.dbs :
$(inc_dir)/pwr_systemclasses.h :
@ echo "Generating struct files for pwrs classes..."
@ co_convert -s -d $(inc_dir) "$(pwre_sroot)/wbl/pwrs/src/pwrs_c_*.wb_load"
@ co_convert -so -d $(inc_dir) "$(pwre_sroot)/wbl/pwrs/src/pwrs_c_*.wb_load"
$(inc_dir)/pwr_systemclasses.hpp :
@ echo "Generating hpp files for pwrs classes..."
......
tlog/wbl/tlog/src/os_linux/hw_x86/makefile
View file @ d17f3e3b
......@@ -51,7 +51,7 @@ $(load_dir)/tlog.dbs :
$(inc_dir)/pwr_tlogclasses.h :
@ echo "Generating struct files for tlog classes..."
@ co_convert -s -d $(inc_dir) "$(pwre_sroot)/wbl/tlog/src/tlog_c_*.wb_load"
@ co_convert -so -d $(inc_dir) "$(pwre_sroot)/wbl/tlog/src/tlog_c_*.wb_load"
$(inc_dir)/pwr_tlogclasses.hpp :
@ echo "Generating hpp files for tlog classes..."
......
xtt/exe/wb_ge/src/os_linux/link_rule.mk
View file @ d17f3e3b
ifndef link_rule_mk
link_rule_mk := 1
link = $(ldxx) $(linkflags) $(domap) -o $(export_exe) \
link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
$(export_obj) $(objects) $(wb_msg_objs) $(rt_msg_objs) \
$(pwr_obj)/rt_io_user.o $(pwr_obj)/wb_provider.o -L/usr/X11R6/lib \
$(pwr_obj)/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 -lpwr_wb -lpwr_flow -lpwr_glow -lpwr_rt -lpwr_co \
......
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