Use consistent naming of binaries accross BTS models

Let's use one systematic naming schemes for all BTS models.

osmobts-trx -> osmo-bts-trx
sysmobts -> osmo-bts-sysmo
lc15bts -> osmo-bts-lc15

4 files changed, 14 insertions, 14 deletions

diff --git a/.gitignore b/.gitignore
index af0a848e..39503777 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,11 +25,11 @@ core.*
 contrib/sysmobts-calib/sysmobts-calib
 
 src/osmo-bts-sysmo/l1fwd-proxy
-src/osmo-bts-sysmo/sysmobts
-src/osmo-bts-sysmo/sysmobts-remote
+src/osmo-bts-sysmo/osmo-bts-sysmo
+src/osmo-bts-sysmo/osmo-bts-sysmo-remote
 src/osmo-bts-sysmo/sysmobts-mgr
 
-src/osmo-bts-trx/osmobts-trx
+src/osmo-bts-trx/osmo-bts-trx
 
 src/osmo-bts-octphy/osmo-bts-octphy
 
diff --git a/src/osmo-bts-litecell15/Makefile.am b/src/osmo-bts-litecell15/Makefile.am
index 6e6c9940..3b6254b2 100644
--- a/src/osmo-bts-litecell15/Makefile.am
+++ b/src/osmo-bts-litecell15/Makefile.am
@@ -9,13 +9,13 @@ EXTRA_DIST = misc/lc15bts_mgr.h misc/lc15bts_misc.h misc/lc15bts_par.h \
 	misc/lc15bts_bid.h misc/lc15bts_nl.h femtobts.h hw_misc.h \
 	l1_if.h l1_transp.h utils.h oml_router.h
 
-bin_PROGRAMS = lc15bts lc15bts-mgr lc15bts-util
+bin_PROGRAMS = osmo-bts-lc15 lc15bts-mgr lc15bts-util
 
 COMMON_SOURCES = main.c lc15bts.c l1_if.c oml.c lc15bts_vty.c tch.c hw_misc.c calib_file.c \
 		 utils.c misc/lc15bts_par.c misc/lc15bts_bid.c oml_router.c
 
-lc15bts_SOURCES = $(COMMON_SOURCES) l1_transp_hw.c
-lc15bts_LDADD = $(top_builddir)/src/common/libbts.a $(COMMON_LDADD)
+osmo_bts_lc15_SOURCES = $(COMMON_SOURCES) l1_transp_hw.c
+osmo_bts_lc15_LDADD = $(top_builddir)/src/common/libbts.a $(COMMON_LDADD)
 
 lc15bts_mgr_SOURCES = \
 		misc/lc15bts_mgr.c misc/lc15bts_misc.c \
diff --git a/src/osmo-bts-sysmo/Makefile.am b/src/osmo-bts-sysmo/Makefile.am
index 81676eaa..9ed89dc6 100644
--- a/src/osmo-bts-sysmo/Makefile.am
+++ b/src/osmo-bts-sysmo/Makefile.am
@@ -6,16 +6,16 @@ EXTRA_DIST = misc/sysmobts_mgr.h misc/sysmobts_misc.h misc/sysmobts_par.h \
 	misc/sysmobts_eeprom.h misc/sysmobts_nl.h femtobts.h hw_misc.h \
 	l1_fwd.h l1_if.h l1_transp.h eeprom.h utils.h oml_router.h
 
-bin_PROGRAMS = sysmobts sysmobts-remote l1fwd-proxy sysmobts-mgr sysmobts-util
+bin_PROGRAMS = osmo-bts-sysmo osmo-bts-sysmo-remote l1fwd-proxy sysmobts-mgr sysmobts-util
 
 COMMON_SOURCES = main.c femtobts.c l1_if.c oml.c sysmobts_vty.c tch.c hw_misc.c calib_file.c \
 		 eeprom.c calib_fixup.c utils.c misc/sysmobts_par.c oml_router.c sysmobts_ctrl.c
 
-sysmobts_SOURCES = $(COMMON_SOURCES) l1_transp_hw.c
-sysmobts_LDADD = $(top_builddir)/src/common/libbts.a $(COMMON_LDADD)
+osmo_bts_sysmo_SOURCES = $(COMMON_SOURCES) l1_transp_hw.c
+osmo_bts_sysmo_LDADD = $(top_builddir)/src/common/libbts.a $(COMMON_LDADD)
 
-sysmobts_remote_SOURCES = $(COMMON_SOURCES) l1_transp_fwd.c
-sysmobts_remote_LDADD = $(top_builddir)/src/common/libbts.a $(COMMON_LDADD)
+osmo_bts_sysmo_remote_SOURCES = $(COMMON_SOURCES) l1_transp_fwd.c
+osmo_bts_sysmo_remote_LDADD = $(top_builddir)/src/common/libbts.a $(COMMON_LDADD)
 
 l1fwd_proxy_SOURCES = l1_fwd_main.c l1_transp_hw.c
 l1fwd_proxy_LDADD = $(top_builddir)/src/common/libbts.a $(COMMON_LDADD)
diff --git a/src/osmo-bts-trx/Makefile.am b/src/osmo-bts-trx/Makefile.am
index 0c0d2818..e31b57f5 100644
--- a/src/osmo-bts-trx/Makefile.am
+++ b/src/osmo-bts-trx/Makefile.am
@@ -4,8 +4,8 @@ LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOVTY
 
 EXTRA_DIST = trx_if.h l1_if.h gsm0503_parity.h gsm0503_conv.h gsm0503_interleaving.h gsm0503_mapping.h gsm0503_coding.h gsm0503_tables.h loops.h amr.h
 
-bin_PROGRAMS = osmobts-trx
+bin_PROGRAMS = osmo-bts-trx
 
-osmobts_trx_SOURCES = main.c trx_if.c l1_if.c scheduler_trx.c trx_vty.c gsm0503_parity.c gsm0503_conv.c gsm0503_interleaving.c gsm0503_mapping.c gsm0503_coding.c gsm0503_tables.c loops.c amr.c
-osmobts_trx_LDADD = $(top_builddir)/src/common/libbts.a $(top_builddir)/src/common/libl1sched.a $(LDADD)
+osmo_bts_trx_SOURCES = main.c trx_if.c l1_if.c scheduler_trx.c trx_vty.c gsm0503_parity.c gsm0503_conv.c gsm0503_interleaving.c gsm0503_mapping.c gsm0503_coding.c gsm0503_tables.c loops.c amr.c
+osmo_bts_trx_LDADD = $(top_builddir)/src/common/libbts.a $(top_builddir)/src/common/libl1sched.a $(LDADD)