Clean up osmo-bts-*/Makefile.am

Make them more easy to read and edit by splitting to one element per
line when several elements are present.

Change-Id: I24ecfa1167b806dcb3a5a0c00343299df842a78b

18 files changed, 510 insertions, 85 deletions

diff --git a/src/osmo-bts-lc15/Makefile.am b/src/osmo-bts-lc15/Makefile.am
index bb68efaf..a4a105a6 100644
--- a/src/osmo-bts-lc15/Makefile.am
+++ b/src/osmo-bts-lc15/Makefile.am
@@ -1,38 +1,100 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include $(LITECELL15_INCDIR)
-AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBGPS_CFLAGS) $(LIBSYSTEMD_CFLAGS)
-COMMON_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCTRL_LIBS)
+
+AM_CFLAGS = \
+	-Wall \
+	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOCODEC_CFLAGS) \
+	$(LIBOSMOGSM_CFLAGS) \
+	$(LIBOSMOVTY_CFLAGS) \
+	$(LIBOSMOCTRL_CFLAGS) \
+	$(LIBOSMOABIS_CFLAGS) \
+	$(LIBOSMOTRAU_CFLAGS) \
+	$(LIBGPS_CFLAGS) \
+	$(LIBSYSTEMD_CFLAGS) \
+	$(NULL)
+
+COMMON_LDADD = \
+	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOCODEC_LIBS) \
+	$(LIBOSMOGSM_LIBS) \
+	$(LIBOSMOVTY_LIBS) \
+	$(LIBOSMOCTRL_LIBS) \
+	$(LIBOSMOABIS_LIBS) \
+	$(LIBOSMOTRAU_LIBS) \
+	$(NULL)
 
 AM_CFLAGS += -DENABLE_LC15BTS
 
-EXTRA_DIST = misc/lc15bts_mgr.h misc/lc15bts_misc.h misc/lc15bts_par.h misc/lc15bts_led.h \
-	misc/lc15bts_temp.h misc/lc15bts_power.h misc/lc15bts_clock.h \
-	misc/lc15bts_bid.h misc/lc15bts_nl.h misc/lc15bts_bts.h misc/lc15bts_swd.h \
-	hw_misc.h l1_if.h l1_transp.h lc15bts.h utils.h
+EXTRA_DIST = \
+	misc/lc15bts_mgr.h \
+	misc/lc15bts_misc.h \
+	misc/lc15bts_par.h \
+	misc/lc15bts_led.h \
+	misc/lc15bts_temp.h \
+	misc/lc15bts_power.h \
+	misc/lc15bts_clock.h \
+	misc/lc15bts_bid.h \
+	misc/lc15bts_nl.h \
+	misc/lc15bts_bts.h \
+	misc/lc15bts_swd.h \
+	hw_misc.h \
+	l1_if.h \
+	l1_transp.h \
+	lc15bts.h \
+	utils.h \
+	$(NULL)
 
 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
+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 \
+	$(NULL)
 
 osmo_bts_lc15_SOURCES = $(COMMON_SOURCES) l1_transp_hw.c
-osmo_bts_lc15_LDADD = $(top_builddir)/src/common/libbts.a $(COMMON_LDADD)
+osmo_bts_lc15_LDADD = \
+	$(top_builddir)/src/common/libbts.a \
+	$(COMMON_LDADD) \
+	$(NULL)
 
 lc15bts_mgr_SOURCES = \
-		misc/lc15bts_mgr.c misc/lc15bts_misc.c \
-		misc/lc15bts_par.c misc/lc15bts_nl.c \
-		misc/lc15bts_temp.c misc/lc15bts_power.c \
-		misc/lc15bts_clock.c misc/lc15bts_bid.c \
+		misc/lc15bts_mgr.c \
+		misc/lc15bts_misc.c \
+		misc/lc15bts_par.c \
+		misc/lc15bts_nl.c \
+		misc/lc15bts_temp.c \
+		misc/lc15bts_power.c \
+		misc/lc15bts_clock.c \
+		misc/lc15bts_bid.c \
 		misc/lc15bts_mgr_vty.c \
 		misc/lc15bts_mgr_nl.c \
 		misc/lc15bts_mgr_temp.c \
 		misc/lc15bts_mgr_calib.c \
 		misc/lc15bts_led.c \
 		misc/lc15bts_bts.c \
-		misc/lc15bts_swd.c
+		misc/lc15bts_swd.c \
+		$(NULL)
 
-lc15bts_mgr_LDADD = $(top_builddir)/src/common/libbts.a $(LIBGPS_LIBS) $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBSYSTEMD_LIBS) $(COMMON_LDADD)
+lc15bts_mgr_LDADD = \
+	$(top_builddir)/src/common/libbts.a \
+	$(COMMON_LDADD) \
+	$(LIBGPS_LIBS) \
+	$(LIBSYSTEMD_LIBS) \
+	$(NULL)
 
-lc15bts_util_SOURCES = misc/lc15bts_util.c misc/lc15bts_par.c
+lc15bts_util_SOURCES = \
+	misc/lc15bts_util.c \
+	misc/lc15bts_par.c \
+	$(NULL)
 lc15bts_util_LDADD = $(LIBOSMOCORE_LIBS)
diff --git a/src/osmo-bts-oc2g/Makefile.am b/src/osmo-bts-oc2g/Makefile.am
index 7b18e88f..6e6078d3 100644
--- a/src/osmo-bts-oc2g/Makefile.am
+++ b/src/osmo-bts-oc2g/Makefile.am
@@ -1,38 +1,102 @@
-AUTOMAKE_OPTIONS = subdir-objects 
+AUTOMAKE_OPTIONS = subdir-objects
 
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include $(OC2G_INCDIR)
-AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBGPS_CFLAGS) $(ORTP_CFLAGS) $(LIBSYSTEMD_CFLAGS)
-COMMON_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCTRL_LIBS) $(ORTP_LIBS)
+
+AM_CFLAGS = \
+	-Wall \
+	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOCODEC_CFLAGS) \
+	$(LIBOSMOGSM_CFLAGS) \
+	$(LIBOSMOVTY_CFLAGS) \
+	$(LIBOSMOCTRL_CFLAGS) \
+	$(LIBOSMOABIS_CFLAGS) \
+	$(LIBOSMOTRAU_CFLAGS) \
+	$(LIBGPS_CFLAGS) \
+	$(LIBSYSTEMD_CFLAGS) \
+	$(ORTP_CFLAGS) \
+	$(NULL)
+
+COMMON_LDADD = \
+	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOCODEC_LIBS) \
+	$(LIBOSMOGSM_LIBS) \
+	$(LIBOSMOVTY_LIBS) \
+	$(LIBOSMOCTRL_LIBS) \
+	$(LIBOSMOABIS_LIBS) \
+	$(LIBOSMOTRAU_LIBS) \
+	$(ORTP_LIBS) \
+	$(NULL)
 
 AM_CFLAGS += -DENABLE_OC2GBTS
 
-EXTRA_DIST = misc/oc2gbts_mgr.h misc/oc2gbts_misc.h misc/oc2gbts_par.h misc/oc2gbts_led.h \
-	misc/oc2gbts_temp.h misc/oc2gbts_power.h misc/oc2gbts_clock.h \
-	misc/oc2gbts_bid.h misc/oc2gbts_bts.h misc/oc2gbts_nl.h misc/oc2gbts_swd.h \
-	hw_misc.h l1_if.h l1_transp.h oc2gbts.h utils.h
+EXTRA_DIST = \
+	misc/oc2gbts_mgr.h \
+	misc/oc2gbts_misc.h \
+	misc/oc2gbts_par.h \
+	misc/oc2gbts_led.h \
+	misc/oc2gbts_temp.h \
+	misc/oc2gbts_power.h \
+	misc/oc2gbts_clock.h \
+	misc/oc2gbts_bid.h \
+	misc/oc2gbts_bts.h \
+	misc/oc2gbts_nl.h \
+	misc/oc2gbts_swd.h \
+	hw_misc.h \
+	l1_if.h \
+	l1_transp.h \
+	oc2gbts.h \
+	utils.h \
+	$(NULL)
 
 bin_PROGRAMS = osmo-bts-oc2g oc2gbts-mgr oc2gbts-util
 
-COMMON_SOURCES = main.c oc2gbts.c l1_if.c oml.c oc2gbts_vty.c tch.c hw_misc.c calib_file.c \
-		 utils.c misc/oc2gbts_par.c misc/oc2gbts_bid.c
+COMMON_SOURCES = \
+	main.c \
+	oc2gbts.c \
+	l1_if.c \
+	oml.c \
+	oc2gbts_vty.c \
+	tch.c \
+	hw_misc.c \
+	calib_file.c \
+	utils.c \
+	misc/oc2gbts_par.c \
+	misc/oc2gbts_bid.c \
+	$(NULL)
 
 osmo_bts_oc2g_SOURCES = $(COMMON_SOURCES) l1_transp_hw.c
-osmo_bts_oc2g_LDADD = $(top_builddir)/src/common/libbts.a $(COMMON_LDADD)
+osmo_bts_oc2g_LDADD = \
+	$(top_builddir)/src/common/libbts.a \
+	$(COMMON_LDADD) \
+	$(NULL)
 
 oc2gbts_mgr_SOURCES = \
-		misc/oc2gbts_mgr.c misc/oc2gbts_misc.c \
-		misc/oc2gbts_par.c misc/oc2gbts_nl.c \
-		misc/oc2gbts_temp.c misc/oc2gbts_power.c \
-		misc/oc2gbts_clock.c misc/oc2gbts_bid.c \
+		misc/oc2gbts_mgr.c \
+		misc/oc2gbts_misc.c \
+		misc/oc2gbts_par.c \
+		misc/oc2gbts_nl.c \
+		misc/oc2gbts_temp.c \
+		misc/oc2gbts_power.c \
+		misc/oc2gbts_clock.c \
+		misc/oc2gbts_bid.c \
 		misc/oc2gbts_mgr_vty.c \
 		misc/oc2gbts_mgr_nl.c \
 		misc/oc2gbts_mgr_temp.c \
 		misc/oc2gbts_mgr_calib.c \
 		misc/oc2gbts_led.c \
 		misc/oc2gbts_bts.c \
-		misc/oc2gbts_swd.c
+		misc/oc2gbts_swd.c \
+		$(NULL)
 
-oc2gbts_mgr_LDADD = $(top_builddir)/src/common/libbts.a $(LIBGPS_LIBS) $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBSYSTEMD_LIBS) $(COMMON_LDADD)
+oc2gbts_mgr_LDADD = \
+	$(top_builddir)/src/common/libbts.a \
+	$(COMMON_LDADD) \
+	$(LIBGPS_LIBS) \
+	$(LIBSYSTEMD_LIBS) \
+	$(NULL)
 
-oc2gbts_util_SOURCES = misc/oc2gbts_util.c misc/oc2gbts_par.c
+oc2gbts_util_SOURCES = \
+	misc/oc2gbts_util.c \
+	misc/oc2gbts_par.c \
+	$(NULL)
 oc2gbts_util_LDADD = $(LIBOSMOCORE_LIBS)
diff --git a/src/osmo-bts-octphy/Makefile.am b/src/osmo-bts-octphy/Makefile.am
index 43d9cd7d..fa0a63db 100644
--- a/src/osmo-bts-octphy/Makefile.am
+++ b/src/osmo-bts-octphy/Makefile.am
@@ -1,12 +1,40 @@
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include $(OCTSDR2G_INCDIR)
-AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBOSMOCTRL_CFLAGS)
-COMMON_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCTRL_LIBS)
+
+AM_CFLAGS = \
+	-Wall \
+	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOCODEC_CFLAGS) \
+	$(LIBOSMOGSM_CFLAGS) \
+	$(LIBOSMOVTY_CFLAGS) \
+	$(LIBOSMOCTRL_CFLAGS) \
+	$(LIBOSMOABIS_CFLAGS) \
+	$(LIBOSMOTRAU_CFLAGS) \
+	$(NULL)
+
+COMMON_LDADD = \
+	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOCODEC_LIBS) \
+	$(LIBOSMOGSM_LIBS) \
+	$(LIBOSMOVTY_LIBS) \
+	$(LIBOSMOCTRL_LIBS) \
+	$(LIBOSMOABIS_LIBS) \
+	$(LIBOSMOTRAU_LIBS) \
+	$(NULL)
 
 EXTRA_DIST = l1_if.h l1_oml.h l1_utils.h octphy_hw_api.h octpkt.h
 
 bin_PROGRAMS = osmo-bts-octphy
 
-COMMON_SOURCES = main.c l1_if.c l1_oml.c l1_utils.c l1_tch.c octphy_hw_api.c octphy_vty.c octpkt.c
+COMMON_SOURCES = \
+	main.c \
+	l1_if.c \
+	l1_oml.c \
+	l1_utils.c \
+	l1_tch.c \
+	octphy_hw_api.c \
+	octphy_vty.c \
+	octpkt.c \
+	$(NULL)
 
 osmo_bts_octphy_SOURCES = $(COMMON_SOURCES)
 osmo_bts_octphy_LDADD = $(top_builddir)/src/common/libbts.a $(COMMON_LDADD)
diff --git a/src/osmo-bts-omldummy/Makefile.am b/src/osmo-bts-omldummy/Makefile.am
index 5a4ce7c5..68008836 100644
--- a/src/osmo-bts-omldummy/Makefile.am
+++ b/src/osmo-bts-omldummy/Makefile.am
@@ -1,6 +1,25 @@
-AM_CFLAGS = -Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBGPS_CFLAGS)
+AM_CFLAGS = \
+	-Wall -fno-strict-aliasing \
+	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOGSM_CFLAGS) \
+	$(LIBOSMOVTY_CFLAGS) \
+	$(LIBOSMOCTRL_CFLAGS) \
+	$(LIBOSMOABIS_CFLAGS) \
+	$(LIBOSMOTRAU_CFLAGS) \
+	$(LIBGPS_CFLAGS) \
+	$(NULL)
+
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Iinclude
-COMMON_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCTRL_LIBS) -ldl
+
+COMMON_LDADD = \
+	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOGSM_LIBS) \
+	$(LIBOSMOVTY_LIBS) \
+	$(LIBOSMOCTRL_LIBS) \
+	$(LIBOSMOABIS_LIBS) \
+	$(LIBOSMOTRAU_LIBS) \
+	-ldl \
+	$(NULL)
 
 bin_PROGRAMS = osmo-bts-omldummy
 
diff --git a/src/osmo-bts-sysmo/Makefile.am b/src/osmo-bts-sysmo/Makefile.am
index 1faf1221..0641433f 100644
--- a/src/osmo-bts-sysmo/Makefile.am
+++ b/src/osmo-bts-sysmo/Makefile.am
@@ -1,16 +1,60 @@
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include $(SYSMOBTS_INCDIR)
-AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBGPS_CFLAGS)
-COMMON_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCTRL_LIBS)
+AM_CFLAGS = \
+	-Wall \
+	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOCODEC_CFLAGS) \
+	$(LIBOSMOGSM_CFLAGS) \
+	$(LIBOSMOVTY_CFLAGS) \
+	$(LIBOSMOCTRL_CFLAGS) \
+	$(LIBOSMOABIS_CFLAGS) \
+	$(LIBOSMOTRAU_CFLAGS) \
+	$(LIBGPS_CFLAGS) \
+	$(NULL)
 
-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 \
+COMMON_LDADD = \
+	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOCODEC_LIBS) \
+	$(LIBOSMOGSM_LIBS) \
+	$(LIBOSMOVTY_LIBS) \
+	$(LIBOSMOCTRL_LIBS) \
+	$(LIBOSMOABIS_LIBS) \
+	$(LIBOSMOTRAU_LIBS) \
+	$(NULL)
+
+EXTRA_DIST = \
+	misc/sysmobts_mgr.h \
+	misc/sysmobts_misc.h \
+	misc/sysmobts_par.h \
+	misc/sysmobts_eeprom.h \
+	misc/sysmobts_nl.h \
 	misc/sysmobts-layer1.h \
-	l1_fwd.h l1_if.h l1_transp.h eeprom.h utils.h
+	femtobts.h \
+	hw_misc.h \
+	l1_fwd.h \
+	l1_if.h \
+	l1_transp.h \
+	eeprom.h \
+	utils.h \
+	$(NULL)
 
 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 sysmobts_ctrl.c
+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 \
+	sysmobts_ctrl.c \
+	$(NULL)
+
 
 osmo_bts_sysmo_SOURCES = $(COMMON_SOURCES) l1_transp_hw.c
 osmo_bts_sysmo_LDADD = $(top_builddir)/src/common/libbts.a $(COMMON_LDADD)
@@ -37,7 +81,15 @@ sysmobts_mgr_SOURCES = \
 		misc/sysmobts_mgr_temp.c \
 		misc/sysmobts_mgr_calib.c \
 		eeprom.c
-sysmobts_mgr_LDADD = $(LIBGPS_LIBS) $(top_builddir)/src/common/libbts.a $(COMMON_LDADD)
+sysmobts_mgr_LDADD = \
+	$(LIBGPS_LIBS) \
+	$(top_builddir)/src/common/libbts.a \
+	$(COMMON_LDADD) \
+	$(NULL)
 
-sysmobts_util_SOURCES = misc/sysmobts_util.c misc/sysmobts_par.c eeprom.c
+sysmobts_util_SOURCES = \
+	misc/sysmobts_util.c \
+	misc/sysmobts_par.c \
+	eeprom.c \
+	$(NULL)
 sysmobts_util_LDADD = $(LIBOSMOCORE_LIBS)
diff --git a/src/osmo-bts-trx/Makefile.am b/src/osmo-bts-trx/Makefile.am
index f6094dd4..845c9e70 100644
--- a/src/osmo-bts-trx/Makefile.am
+++ b/src/osmo-bts-trx/Makefile.am
@@ -11,9 +11,9 @@ AM_CFLAGS = \
 	$(LIBOSMOCODEC_CFLAGS) \
 	$(LIBOSMOCODING_CFLAGS) \
 	$(LIBOSMOVTY_CFLAGS) \
-	$(LIBOSMOTRAU_CFLAGS) \
-	$(LIBOSMOABIS_CFLAGS) \
 	$(LIBOSMOCTRL_CFLAGS) \
+	$(LIBOSMOABIS_CFLAGS) \
+	$(LIBOSMOTRAU_CFLAGS) \
 	$(NULL)
 
 LDADD = \
@@ -22,9 +22,9 @@ LDADD = \
 	$(LIBOSMOCODEC_LIBS) \
 	$(LIBOSMOCODING_LIBS) \
 	$(LIBOSMOVTY_LIBS) \
-	$(LIBOSMOTRAU_LIBS) \
-	$(LIBOSMOABIS_LIBS) \
 	$(LIBOSMOCTRL_LIBS) \
+	$(LIBOSMOABIS_LIBS) \
+	$(LIBOSMOTRAU_LIBS) \
 	-ldl \
 	$(NULL)
 
diff --git a/src/osmo-bts-virtual/Makefile.am b/src/osmo-bts-virtual/Makefile.am
index 070efed6..2b3d825d 100644
--- a/src/osmo-bts-virtual/Makefile.am
+++ b/src/osmo-bts-virtual/Makefile.am
@@ -1,10 +1,46 @@
-AM_CFLAGS = -Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBGPS_CFLAGS)
+AM_CFLAGS = \
+	-Wall -fno-strict-aliasing \
+	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOGSM_CFLAGS) \
+	$(LIBOSMOVTY_CFLAGS) \
+	$(LIBOSMOCTRL_CFLAGS) \
+	$(LIBOSMOABIS_CFLAGS) \
+	$(LIBOSMOTRAU_CFLAGS) \
+	$(LIBGPS_CFLAGS) \
+	$(NULL)
+
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Iinclude
-COMMON_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCTRL_LIBS) -ldl
 
-noinst_HEADERS = l1_if.h osmo_mcast_sock.h virtual_um.h
+COMMON_LDADD = \
+	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOGSM_LIBS) \
+	$(LIBOSMOVTY_LIBS) \
+	$(LIBOSMOCTRL_LIBS) \
+	$(LIBOSMOABIS_LIBS) \
+	$(LIBOSMOTRAU_LIBS) \
+	-ldl \
+	$(NULL)
+
+noinst_HEADERS = \
+	l1_if.h \
+	osmo_mcast_sock.h \
+	virtual_um.h \
+	$(NULL)
 
 bin_PROGRAMS = osmo-bts-virtual
 
-osmo_bts_virtual_SOURCES = main.c bts_model.c virtualbts_vty.c scheduler_virtbts.c l1_if.c virtual_um.c osmo_mcast_sock.c
-osmo_bts_virtual_LDADD = $(top_builddir)/src/common/libl1sched.a $(top_builddir)/src/common/libbts.a $(COMMON_LDADD)
+osmo_bts_virtual_SOURCES = \
+	main.c \
+	bts_model.c \
+	virtualbts_vty.c \
+	scheduler_virtbts.c \
+	l1_if.c \
+	virtual_um.c \
+	osmo_mcast_sock.c \
+	$(NULL)
+
+osmo_bts_virtual_LDADD = \
+	$(top_builddir)/src/common/libl1sched.a \
+	$(top_builddir)/src/common/libbts.a \
+	$(COMMON_LDADD) \
+	$(NULL)
diff --git a/tests/agch/Makefile.am b/tests/agch/Makefile.am
index f1c58f67..2bb41445 100644
--- a/tests/agch/Makefile.am
+++ b/tests/agch/Makefile.am
@@ -1,6 +1,22 @@
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOCODEC_CFLAGS)
-LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCODEC_LIBS)
+AM_CFLAGS = \
+	-Wall \
+	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOGSM_CFLAGS) \
+	$(LIBOSMOVTY_CFLAGS) \
+	$(LIBOSMOCODEC_CFLAGS) \
+	$(LIBOSMOABIS_CFLAGS) \
+	$(LIBOSMOTRAU_CFLAGS) \
+	$(NULL)
+LDADD = \
+	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOGSM_LIBS) \
+	$(LIBOSMOVTY_LIBS) \
+	$(LIBOSMOCODEC_LIBS) \
+	$(LIBOSMOABIS_LIBS) \
+	$(LIBOSMOTRAU_LIBS) \
+	$(NULL)
+
 check_PROGRAMS = agch_test
 EXTRA_DIST = agch_test.ok
 
diff --git a/tests/amr/Makefile.am b/tests/amr/Makefile.am
index 79225353..80a35d0b 100644
--- a/tests/amr/Makefile.am
+++ b/tests/amr/Makefile.am
@@ -1,8 +1,20 @@
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) \
-	$(LIBOSMOABIS_CFLAGS) $(LIBOSMOTRAU_CFLAGS)
-LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) \
-	$(LIBOSMOABIS_LIBS) $(LIBOSMOTRAU_LIBS)
+AM_CFLAGS = \
+	-Wall \
+	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOGSM_CFLAGS) \
+	$(LIBOSMOCODEC_CFLAGS) \
+	$(LIBOSMOABIS_CFLAGS) \
+	$(LIBOSMOTRAU_CFLAGS) \
+	$(NULL)
+LDADD = \
+	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOGSM_LIBS) \
+	$(LIBOSMOCODEC_LIBS) \
+	$(LIBOSMOABIS_LIBS) \
+	$(LIBOSMOTRAU_LIBS) \
+	$(NULL)
+
 check_PROGRAMS = amr_test
 EXTRA_DIST = amr_test.ok amr_test.err
 
diff --git a/tests/cipher/Makefile.am b/tests/cipher/Makefile.am
index a69321ef..0650d3d9 100644
--- a/tests/cipher/Makefile.am
+++ b/tests/cipher/Makefile.am
@@ -1,6 +1,22 @@
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOCODEC_CFLAGS)
-LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCODEC_LIBS)
+AM_CFLAGS = \
+	-Wall \
+	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOGSM_CFLAGS) \
+	$(LIBOSMOVTY_CFLAGS) \
+	$(LIBOSMOCODEC_CFLAGS) \
+	$(LIBOSMOABIS_CFLAGS) \
+	$(LIBOSMOTRAU_CFLAGS) \
+	$(NULL)
+LDADD = \
+	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOGSM_LIBS) \
+	$(LIBOSMOVTY_LIBS) \
+	$(LIBOSMOCODEC_LIBS) \
+	$(LIBOSMOABIS_LIBS) \
+	$(LIBOSMOTRAU_LIBS) \
+	$(NULL)
+
 check_PROGRAMS = cipher_test
 EXTRA_DIST = cipher_test.ok
 
diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am
index e83af78d..f850a6ff 100644
--- a/tests/handover/Makefile.am
+++ b/tests/handover/Makefile.am
@@ -1,6 +1,20 @@
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS)
-LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS)
+AM_CFLAGS = \
+	-Wall \
+	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOGSM_CFLAGS) \
+	$(LIBOSMOCODEC_CFLAGS) \
+	$(LIBOSMOABIS_CFLAGS) \
+	$(LIBOSMOTRAU_CFLAGS) \
+	$(NULL)
+LDADD = \
+	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOGSM_LIBS) \
+	$(LIBOSMOCODEC_LIBS) \
+	$(LIBOSMOABIS_LIBS) \
+	$(LIBOSMOTRAU_LIBS) \
+	$(NULL)
+
 check_PROGRAMS = handover_test
 EXTRA_DIST = handover_test.ok
 
diff --git a/tests/meas/Makefile.am b/tests/meas/Makefile.am
index 6c41dd8f..e75481f8 100644
--- a/tests/meas/Makefile.am
+++ b/tests/meas/Makefile.am
@@ -1,6 +1,20 @@
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS)
-LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS)
+AM_CFLAGS = \
+	-Wall \
+	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOGSM_CFLAGS) \
+	$(LIBOSMOCODEC_CFLAGS) \
+	$(LIBOSMOABIS_CFLAGS) \
+	$(LIBOSMOTRAU_CFLAGS) \
+	$(NULL)
+LDADD = \
+	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOGSM_LIBS) \
+	$(LIBOSMOCODEC_LIBS) \
+	$(LIBOSMOTRAU_LIBS) \
+	$(LIBOSMOABIS_LIBS) \
+	$(NULL)
+
 check_PROGRAMS = meas_test
 noinst_HEADERS = sysmobts_fr_samples.h meas_testcases.h
 EXTRA_DIST = meas_test.ok
diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am
index 7a884fd9..f3cc7347 100644
--- a/tests/misc/Makefile.am
+++ b/tests/misc/Makefile.am
@@ -1,8 +1,19 @@
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) \
-	$(LIBOSMOABIS_CFLAGS) $(LIBOSMOTRAU_CFLAGS)
-LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) \
-	$(LIBOSMOABIS_LIBS) $(LIBOSMOTRAU_LIBS)
+AM_CFLAGS = \
+	-Wall \
+	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOGSM_CFLAGS) \
+	$(LIBOSMOCODEC_CFLAGS) \
+	$(LIBOSMOABIS_CFLAGS) \
+	$(LIBOSMOTRAU_CFLAGS) \
+	$(NULL)
+LDADD = \
+	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOGSM_LIBS) \
+	$(LIBOSMOCODEC_LIBS) \
+	$(LIBOSMOABIS_LIBS) \
+	$(LIBOSMOTRAU_LIBS) \
+	$(NULL)
 check_PROGRAMS = misc_test
 EXTRA_DIST = misc_test.ok
 
diff --git a/tests/paging/Makefile.am b/tests/paging/Makefile.am
index f4ae659a..d5b090ca 100644
--- a/tests/paging/Makefile.am
+++ b/tests/paging/Makefile.am
@@ -1,6 +1,22 @@
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOCODEC_CFLAGS)
-LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCODEC_LIBS)
+AM_CFLAGS = \
+	-Wall \
+	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOGSM_CFLAGS) \
+	$(LIBOSMOVTY_CFLAGS) \
+	$(LIBOSMOCODEC_CFLAGS) \
+	$(LIBOSMOABIS_CFLAGS) \
+	$(LIBOSMOTRAU_CFLAGS) \
+	$(NULL)
+LDADD = \
+	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOGSM_LIBS) \
+	$(LIBOSMOVTY_LIBS) \
+	$(LIBOSMOCODEC_LIBS) \
+	$(LIBOSMOABIS_LIBS) \
+	$(LIBOSMOTRAU_LIBS) \
+	$(NULL)
+
 check_PROGRAMS = paging_test
 EXTRA_DIST = paging_test.ok
 
diff --git a/tests/power/Makefile.am b/tests/power/Makefile.am
index f7bb060c..149d6910 100644
--- a/tests/power/Makefile.am
+++ b/tests/power/Makefile.am
@@ -1,6 +1,19 @@
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS)
-LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS)
+AM_CFLAGS = \
+	-Wall \
+	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOCODEC_CFLAGS) \
+	$(LIBOSMOGSM_CFLAGS) \
+	$(LIBOSMOVTY_CFLAGS) \
+	$(LIBOSMOTRAU_CFLAGS) \
+	$(NULL)
+LDADD = \
+	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOCODEC_LIBS) \
+	$(LIBOSMOGSM_LIBS) \
+	$(LIBOSMOVTY_LIBS) \
+	$(LIBOSMOTRAU_LIBS) \
+	$(NULL)
 
 check_PROGRAMS = ms_power_loop_test bs_power_loop_test
 EXTRA_DIST = ms_power_loop_test.ok ms_power_loop_test.err \
diff --git a/tests/sysmobts/Makefile.am b/tests/sysmobts/Makefile.am
index 3a6dcaa5..59d68fa8 100644
--- a/tests/sysmobts/Makefile.am
+++ b/tests/sysmobts/Makefile.am
@@ -1,11 +1,33 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_srcdir)/src/osmo-bts-sysmo $(SYSMOBTS_INCDIR)
-AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS)
-LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS)
+AM_CPPFLAGS = \
+	$(all_includes) \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/src/osmo-bts-sysmo \
+	$(SYSMOBTS_INCDIR) \
+	$(NULL)
+AM_CFLAGS = \
+	-Wall \
+	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOCODEC_CFLAGS) \
+	$(LIBOSMOGSM_CFLAGS) \
+	$(LIBOSMOVTY_CFLAGS) \
+	$(LIBOSMOABIS_CFLAGS) \
+	$(LIBOSMOTRAU_CFLAGS) \
+	$(NULL)
+LDADD = \
+	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOCODEC_LIBS) \
+	$(LIBOSMOGSM_LIBS) \
+	$(LIBOSMOVTY_LIBS) \
+	$(LIBOSMOABIS_LIBS) \
+	$(LIBOSMOTRAU_LIBS) \
+	$(NULL)
 
 check_PROGRAMS = sysmobts_test
 EXTRA_DIST = sysmobts_test.ok
 
-sysmobts_test_SOURCES = sysmobts_test.c $(top_srcdir)/src/osmo-bts-sysmo/utils.c \
+sysmobts_test_SOURCES = \
+		sysmobts_test.c \
+		$(top_srcdir)/src/osmo-bts-sysmo/utils.c \
 		$(top_srcdir)/src/osmo-bts-sysmo/l1_if.c \
 		$(top_srcdir)/src/osmo-bts-sysmo/oml.c \
 		$(top_srcdir)/src/osmo-bts-sysmo/l1_transp_hw.c \
@@ -15,4 +37,7 @@ sysmobts_test_SOURCES = sysmobts_test.c $(top_srcdir)/src/osmo-bts-sysmo/utils.c
 		$(top_srcdir)/src/osmo-bts-sysmo/misc/sysmobts_par.c \
 		$(top_srcdir)/src/osmo-bts-sysmo/femtobts.c \
 		$(top_srcdir)/src/osmo-bts-sysmo/eeprom.c
-sysmobts_test_LDADD = $(top_builddir)/src/common/libbts.a $(LIBOSMOABIS_LIBS) $(LDADD)
+sysmobts_test_LDADD = \
+	$(top_builddir)/src/common/libbts.a \
+	$(LDADD) \
+	$(NULL)
diff --git a/tests/ta_control/Makefile.am b/tests/ta_control/Makefile.am
index 67455eac..e2494388 100644
--- a/tests/ta_control/Makefile.am
+++ b/tests/ta_control/Makefile.am
@@ -1,6 +1,20 @@
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS)
-LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS)
+AM_CFLAGS = \
+	-Wall \
+	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOGSM_CFLAGS) \
+	$(LIBOSMOCODEC_CFLAGS) \
+	$(LIBOSMOABIS_CFLAGS) \
+	$(LIBOSMOTRAU_CFLAGS) \
+	$(NULL)
+LDADD = \
+	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOGSM_LIBS) \
+	$(LIBOSMOCODEC_LIBS) \
+	$(LIBOSMOABIS_LIBS) \
+	$(LIBOSMOTRAU_LIBS) \
+	$(NULL)
+
 check_PROGRAMS = ta_control_test
 EXTRA_DIST = ta_control_test.ok
 ta_control_test_LDADD = $(top_builddir)/src/common/libbts.a $(LDADD)
diff --git a/tests/tx_power/Makefile.am b/tests/tx_power/Makefile.am
index feee7f42..f59f0c06 100644
--- a/tests/tx_power/Makefile.am
+++ b/tests/tx_power/Makefile.am
@@ -1,6 +1,19 @@
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS)
-LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS)
+AM_CFLAGS = \
+	-Wall \
+	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOGSM_CFLAGS) \
+	$(LIBOSMOCODEC_CFLAGS) \
+	$(LIBOSMOABIS_CFLAGS) \
+	$(LIBOSMOTRAU_CFLAGS) \
+	$(NULL)
+LDADD = \
+	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOGSM_LIBS) \
+	$(LIBOSMOCODEC_LIBS) \
+	$(LIBOSMOABIS_LIBS) \
+	$(LIBOSMOTRAU_LIBS) \
+	$(NULL)
 check_PROGRAMS = tx_power_test
 EXTRA_DIST = tx_power_test.ok tx_power_test.err