Commit aa2e0f44 authored by claes's avatar claes

*** empty log message ***

parent 30916854
ifndef link_rule_mk ifndef link_rule_mk
link_rule_mk := 1 link_rule_mk := 1
link = $(ld) $(elinkflags) $(domap) -o $(export_exe) \ ifeq ($(export_type),exp)
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 \
-lpwr_rt -lpwr_co -lpwr_msg_dummy -lpthread -lm -lpwr_rt -lpwr_co -lpwr_msg_dummy -lpthread -lm
else
link = $(ld) $(elinkflags) $(domap) -o $(export_exe) \
$(export_obj) $(objects) $(rt_msg_objs) \
$(pwr_obj)/rt_io_user.o \
-lpwr_rt -lpwr_co -lpwr_msg_dummy -lpthread -lm
endif
endif endif
...@@ -247,8 +247,9 @@ sub build_all_modules () ...@@ -247,8 +247,9 @@ sub build_all_modules ()
build_all(); build_all();
merge(); merge();
# Relink method dependent programs printf("-- Relink method dependent programs");
_module("rt"); _module("rt");
$ENV{"export_type"} = "exp";
my($exe_dir) = $ENV{"pwr_exe"}; my($exe_dir) = $ENV{"pwr_exe"};
system("rm $exe_dir/rt_io_comm"); system("rm $exe_dir/rt_io_comm");
_build("exe", "rt_io_comm", "all"); _build("exe", "rt_io_comm", "all");
......
ifndef link_rule_mk ifndef link_rule_mk
link_rule_mk := 1 link_rule_mk := 1
link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \ ifeq ($(export_type),exp)
link = $(ldxx) $(explinkflags) $(domap) -o $(export_exe) \
$(export_obj) $(objects) $(wb_msg_eobjs) $(rt_msg_eobjs) \ $(export_obj) $(objects) $(wb_msg_eobjs) $(rt_msg_eobjs) \
$(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_provider.o \ $(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_provider.o \
-L/usr/X11R6/lib -L/usr/local/BerkeleyDB.4.0/lib \ -L/usr/X11R6/lib -L/usr/local/BerkeleyDB.4.0/lib \
...@@ -10,5 +11,15 @@ link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \ ...@@ -10,5 +11,15 @@ link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
-lpwr_msg_dummy -lantlr -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\ -lpwr_msg_dummy -lantlr -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
-lXmu -lSM -lICE\ -lXmu -lSM -lICE\
-lrpcsvc -lpthread -lm -ldb_cxx -lz -lrpcsvc -lpthread -lm -ldb_cxx -lz
else
link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
$(export_obj) $(objects) $(wb_msg_eobjs) $(rt_msg_eobjs) \
$(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_provider.o \
-L/usr/X11R6/lib -L/usr/local/BerkeleyDB.4.0/lib \
-L/opt/gnome/lib \
-lpwr_wb -lpwr_rt -lpwr_ge -lpwr_flow -lpwr_glow -lpwr_co \
-lpwr_msg_dummy -lantlr -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
-lXmu -lSM -lICE\
-lrpcsvc -lpthread -lm -ldb_cxx -lz
endif
endif endif
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