Commit 6eb2b8e4 authored by Mathias Ettinger's avatar Mathias Ettinger

Make package less intrusive

parent 85f0fc14
bin_PROGRAMS = st sat gw gw-net-acc gw-phy
bin_PROGRAMS = opensand-st opensand-sat opensand-gw opensand-gw-net-acc opensand-gw-phy
PACKED_COMMON_CPPFLAGS = \
$(AM_CPPFLAGS) \
......@@ -41,33 +41,33 @@ allexec_LDADD = \
-lpthread \
-lrt
st_SOURCES = st.cpp
st_CPPFLAGS = $(PACKED_COMMON_CPPFLAGS)
st_LDADD = \
opensand_st_SOURCES = st.cpp
opensand_st_CPPFLAGS = $(PACKED_COMMON_CPPFLAGS)
opensand_st_LDADD = \
$(PACKED_COMMON_LIBS) \
$(allexec_LDADD)
gw_SOURCES = gw.cpp
gw_CPPFLAGS = $(PACKED_COMMON_CPPFLAGS)
gw_LDADD = \
opensand_gw_SOURCES = gw.cpp
opensand_gw_CPPFLAGS = $(PACKED_COMMON_CPPFLAGS)
opensand_gw_LDADD = \
$(PACKED_COMMON_LIBS) \
$(allexec_LDADD)
gw_net_acc_SOURCES = gw_net_acc.cpp
gw_net_acc_CPPFLAGS = $(PACKED_COMMON_CPPFLAGS)
gw_net_acc_LDADD = \
opensand_gw_net_acc_SOURCES = gw_net_acc.cpp
opensand_gw_net_acc_CPPFLAGS = $(PACKED_COMMON_CPPFLAGS)
opensand_gw_net_acc_LDADD = \
$(PACKED_COMMON_LIBS) \
$(allexec_LDADD)
gw_phy_SOURCES = gw_phy.cpp
gw_phy_CPPFLAGS = $(PACKED_COMMON_CPPFLAGS)
gw_phy_LDADD = \
opensand_gw_phy_SOURCES = gw_phy.cpp
opensand_gw_phy_CPPFLAGS = $(PACKED_COMMON_CPPFLAGS)
opensand_gw_phy_LDADD = \
$(PACKED_COMMON_LIBS) \
$(allexec_LDADD)
sat_SOURCES = sat.cpp
sat_CPPFLAGS = $(PACKED_COMMON_CPPFLAGS)
sat_LDADD = \
opensand_sat_SOURCES = sat.cpp
opensand_sat_CPPFLAGS = $(PACKED_COMMON_CPPFLAGS)
opensand_sat_LDADD = \
$(PACKED_COMMON_LIBS) \
$(allexec_LDADD)
......@@ -256,20 +256,20 @@ class MachineController:
if component not in {SAT, GW_PHY}:
tuntap_iface += '-t opensand_tap'
if component == GW_NET_ACC:
command_line = '%s %s %s -u %s -w %s -c %s' % \
command_line = 'opensand-%s %s %s -u %s -w %s -c %s' % \
(bin_file, instance_param, tuntap_iface,
self._machine_model.get_interconnect_interface(),
self._machine_model.get_interconnect_address(),
CONF_DESTINATION_PATH)
elif component == GW_PHY:
command_line = '%s %s -a %s -u %s -w %s -c %s' % \
command_line = 'opensand-%s %s -a %s -u %s -w %s -c %s' % \
(bin_file, instance_param,
self._machine_model.get_emulation_address(),
self._machine_model.get_interconnect_interface(),
self._machine_model.get_interconnect_address(),
CONF_DESTINATION_PATH)
else:
command_line = '%s -a %s %s %s -c %s' % \
command_line = 'opensand-%s -a %s %s %s -c %s' % \
(bin_file,
self._machine_model.get_emulation_address(),
tuntap_iface, instance_param,
......
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