Consistenly format variables in */Makefile.am files
Change-Id: Ifa21513c007072314097b7bec188579972dc1694
diff --git a/openbsc/src/utils/Makefile.am b/openbsc/src/utils/Makefile.am
index 5a2e2d2..0dbb85c 100644
--- a/openbsc/src/utils/Makefile.am
+++ b/openbsc/src/utils/Makefile.am
@@ -1,42 +1,123 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(SQLITE3_CFLAGS) \
- $(LIBSMPP34_CFLAGS)
-AM_LDFLAGS = $(COVERAGE_LDFLAGS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir) \
+ $(NULL)
-noinst_HEADERS = meas_db.h
+AM_CFLAGS = \
+ -Wall \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(LIBOSMOVTY_CFLAGS) \
+ $(LIBOSMOABIS_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ $(SQLITE3_CFLAGS) \
+ $(LIBSMPP34_CFLAGS) \
+ $(NULL)
-bin_PROGRAMS = bs11_config isdnsync
+AM_LDFLAGS = \
+ $(COVERAGE_LDFLAGS) \
+ $(NULL)
+
+noinst_HEADERS = \
+ meas_db.h \
+ $(NULL)
+
+bin_PROGRAMS = \
+ bs11_config \
+ isdnsync \
+ $(NULL)
if HAVE_SQLITE3
-bin_PROGRAMS += osmo-meas-pcap2db osmo-meas-udp2db
+bin_PROGRAMS += \
+ osmo-meas-pcap2db \
+ osmo-meas-udp2db \
+ $(NULL)
endif
if HAVE_LIBCDK
-bin_PROGRAMS += meas_vis
+bin_PROGRAMS += \
+ meas_vis \
+ $(NULL)
endif
if BUILD_SMPP
-noinst_PROGRAMS = smpp_mirror
+noinst_PROGRAMS = \
+ smpp_mirror \
+ $(NULL)
endif
-bs11_config_SOURCES = bs11_config.c
-bs11_config_LDADD = $(top_builddir)/src/libbsc/libbsc.a \
- $(top_builddir)/src/libtrau/libtrau.a \
- $(top_builddir)/src/libcommon/libcommon.a \
- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOABIS_LIBS)
+bs11_config_SOURCES = \
+ bs11_config.c \
+ $(NULL)
-isdnsync_SOURCES = isdnsync.c
+bs11_config_LDADD = \
+ $(top_builddir)/src/libbsc/libbsc.a \
+ $(top_builddir)/src/libtrau/libtrau.a \
+ $(top_builddir)/src/libcommon/libcommon.a \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBOSMOABIS_LIBS) \
+ $(NULL)
-smpp_mirror_SOURCES = smpp_mirror.c
-smpp_mirror_LDADD = $(top_builddir)/src/libcommon/libcommon.a \
- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBSMPP34_LIBS)
+isdnsync_SOURCES = \
+ isdnsync.c \
+ $(NULL)
-meas_vis_SOURCES = meas_vis.c
-meas_vis_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -lcdk -lncurses
-meas_vis_CFLAGS = $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS)
+smpp_mirror_SOURCES = \
+ smpp_mirror.c \
+ $(NULL)
-osmo_meas_pcap2db_SOURCES = meas_pcap2db.c meas_db.c
-osmo_meas_pcap2db_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -lpcap $(SQLITE3_LIBS)
-osmo_meas_pcap2db_CFLAGS = $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS)
+smpp_mirror_LDADD = \
+ $(top_builddir)/src/libcommon/libcommon.a \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBSMPP34_LIBS) \
+ $(NULL)
-osmo_meas_udp2db_SOURCES = meas_udp2db.c meas_db.c
-osmo_meas_udp2db_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(SQLITE3_LIBS)
-osmo_meas_udp2db_CFLAGS = $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS)
+meas_vis_SOURCES = \
+ meas_vis.c \
+ $(NULL)
+
+meas_vis_LDADD = \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ -lcdk \
+ -lncurses \
+ $(NULL)
+
+meas_vis_CFLAGS = \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(NULL)
+
+osmo_meas_pcap2db_SOURCES = \
+ meas_pcap2db.c \
+ meas_db.c \
+ $(NULL)
+
+osmo_meas_pcap2db_LDADD = \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(SQLITE3_LIBS) \
+ -lpcap \
+ $(NULL)
+
+osmo_meas_pcap2db_CFLAGS = \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(NULL)
+
+osmo_meas_udp2db_SOURCES = \
+ meas_udp2db.c \
+ meas_db.c \
+ $(NULL)
+
+osmo_meas_udp2db_LDADD = \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(SQLITE3_LIBS) \
+ $(NULL)
+
+osmo_meas_udp2db_CFLAGS = \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(NULL)