Commit 71947b15 authored by service's avatar service

Build dependencies for method build

parent b55b84bd
......@@ -7,6 +7,7 @@ ifeq ($(PWRE_CONF_MQ),1)
$(pwre_conf_libdir) $(pwre_conf_libpwrremote) $(pwre_conf_libpwrrt) \
$(pwre_conf_libmq) $(pwre_conf_lib)
else
link = echo "Mq not installed"
log_link_exe = echo "$(exe_flv_name): MQ not installed"
link = :
endif
endif
ifndef link_rule_mk
link_rule_mk := 1
ifeq ($(PWRE_CONF_MQ),1)
link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
$(export_obj) $(objects) $(rt_msg_eobjs) \
$(pwre_conf_libdir) $(pwre_conf_libpwrremote) $(pwre_conf_libpwrrt) \
$(pwre_conf_libmq) $(pwre_conf_lib)
else
link = echo "Mq not installed"
endif
endif
......@@ -2,15 +2,17 @@ ifndef link_rule_mk
link_rule_mk := 1
ifeq ($(export_type),exp)
link = $(ldxx) $(explinkflags) $(domap) -o $(export_exe) \
$(export_obj) $(objects) $(rt_msg_objs) \
$(pwr_obj)/rt_io_user.o \
$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib) \
$(pwre_conf_libpwrprofibus) $(pwre_conf_libpwrotherio)
else
link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
$(export_obj) $(objects) $(rt_msg_objs) \
$(pwr_obj)/rt_io_user.o \
$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
link = :
# link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
# $(export_obj) $(objects) $(rt_msg_objs) \
# $(pwr_obj)/rt_io_user.o \
# $(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
endif
endif
......@@ -144,7 +144,9 @@ realclean : clean $(clean_h_includes) $(clean_hpp_includes) clean_dirs
$(export_exe) : $(link_rule) $(export_flv_obj) $(objects)
@ $(log_link_exe)
@ $(link) -t | grep $(pwre_broot) | awk -f $(pwre_kroot)/tools/bld/src/$(os_name)/ld_trace_to_d.awk -v target=$(target) > $(link_dependencies)
@ if [ "$(link)" != ":" ]; then \
$(link) -t | grep $(pwre_broot) | awk -f $(pwre_kroot)/tools/bld/src/$(os_name)/ld_trace_to_d.awk -v target=$(target) > $(link_dependencies); \
fi
@ if [ "$(linkcp)" != ":" ]; then \
$(linkcp); \
fi
......
......@@ -856,8 +856,8 @@ sub method_build ()
printf("-- Method build %s\n", $program);
_module("rt");
$ENV{"export_type"} = "exp";
my($exe_dir) = $ENV{"pwr_exe"};
system("rm $exe_dir/rt_io_comm");
# my($exe_dir) = $ENV{"pwr_exe"};
# system("rm $exe_dir/rt_io_comm");
_build("exe", "rt_io_comm", "src", "all");
merge();
}
......@@ -869,8 +869,8 @@ sub method_build ()
_module("wb");
$ENV{"export_type"} = "exp";
my($exe_dir) = $ENV{"pwr_exe"};
system("rm $exe_dir/wb_$flavour");
# my($exe_dir) = $ENV{"pwr_exe"};
# system("rm $exe_dir/wb_$flavour");
_build("exe", "wb", $flavour, "all");
# _build("exe", "wb", "src", "all");
merge();
......@@ -880,8 +880,8 @@ sub method_build ()
_module("xtt");
$ENV{"export_type"} = "exp";
my($exe_dir) = $ENV{"pwr_exe"};
system("rm $exe_dir/rt_xtt_$flavour");
# my($exe_dir) = $ENV{"pwr_exe"};
# system("rm $exe_dir/rt_xtt_$flavour");
_build("exe", "rt_xtt", $flavour, "all");
# _build("exe", "rt_xtt", "src", "all");
merge();
......
......@@ -11,13 +11,13 @@ ifeq ($(export_type),exp)
$(pwre_conf_libpwrrt) $(pwre_conf_libwb) $(pwre_conf_lib)
else
link = $(ldxx) $(elinkflags) $(domap) -o $(pwr_exe)/wb_gtk \
$(bld_dir)/wb_gtk.o $(bld_dir)/wb_main.o $(wb_msg_eobjs) $(rt_msg_eobjs) \
$(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_procom.o $(pwr_eobj)/stdsoap2.o \
$(pwre_conf_libdir) $(pwre_conf_libpwrwbgtk) $(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrwb) \
$(pwre_conf_libpwrxtt) $(pwre_conf_libpwrwbgtk) $(pwre_conf_libpwrwb) \
$(pwre_conf_libgtk) \
$(pwre_conf_libpwrrt) $(pwre_conf_libwb) $(pwre_conf_lib)
# link = $(ldxx) $(elinkflags) $(domap) -o $(pwr_exe)/wb_gtk \
# $(bld_dir)/wb_gtk.o $(bld_dir)/wb_main.o $(wb_msg_eobjs) $(rt_msg_eobjs) \
# $(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_procom.o $(pwr_eobj)/stdsoap2.o \
# $(pwre_conf_libdir) $(pwre_conf_libpwrwbgtk) $(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrwb) \
# $(pwre_conf_libpwrxtt) $(pwre_conf_libpwrwbgtk) $(pwre_conf_libpwrwb) \
# $(pwre_conf_libgtk) \
# $(pwre_conf_libpwrrt) $(pwre_conf_libwb) $(pwre_conf_lib)
link = :
endif
endif
......@@ -11,13 +11,13 @@ ifeq ($(export_type),exp)
$(pwre_conf_libpwrrt) $(pwre_conf_lib)
else
link = $(ldxx) $(elinkflags) $(domap) -o $(pwr_exe)/rt_xtt_gtk \
$(bld_dir)/rt_xtt_gtk.o $(bld_dir)/xtt_main.o $(rt_msg_eobjs) \
$(pwr_eobj)/rt_io_user.o \
$(pwre_conf_libdir) $(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) \
$(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) \
$(pwre_conf_libgst) $(pwre_conf_libgtk) \
$(pwre_conf_libpwrrt) $(pwre_conf_lib)
# link = $(ldxx) $(elinkflags) $(domap) -o $(pwr_exe)/rt_xtt_gtk \
# $(bld_dir)/rt_xtt_gtk.o $(bld_dir)/xtt_main.o $(rt_msg_eobjs) \
# $(pwr_eobj)/rt_io_user.o \
# $(pwre_conf_libdir) $(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) \
# $(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) \
# $(pwre_conf_libgst) $(pwre_conf_libgtk) \
# $(pwre_conf_libpwrrt) $(pwre_conf_lib)
link = :
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