diff --git a/openbsc/src/libbsc/Makefile.am b/openbsc/src/libbsc/Makefile.am
index fd8de0e..4728e23 100644
--- a/openbsc/src/libbsc/Makefile.am
+++ b/openbsc/src/libbsc/Makefile.am
@@ -1,28 +1,53 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) \
-	$(LIBOSMOVTY_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS)
+AM_CPPFLAGS = \
+	$(all_includes) \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir) \
+	$(NULL)
 
-noinst_LIBRARIES = libbsc.a
+AM_CFLAGS = \
+	-Wall \
+	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOGSM_CFLAGS) \
+	$(LIBOSMOVTY_CFLAGS) \
+	$(LIBOSMOABIS_CFLAGS) \
+	$(COVERAGE_CFLAGS) \
+	$(NULL)
 
-libbsc_a_SOURCES =	abis_nm.c abis_nm_vty.c \
-			abis_om2000.c abis_om2000_vty.c \
-			abis_rsl.c bsc_rll.c \
-			paging.c \
-			bts_ericsson_rbs2000.c \
-			bts_ipaccess_nanobts.c \
-			bts_siemens_bs11.c \
-			bts_nokia_site.c \
-			bts_unknown.c \
-			bts_sysmobts.c \
-			chan_alloc.c \
-			handover_decision.c handover_logic.c meas_rep.c \
-			rest_octets.c system_information.c \
-			e1_config.c \
-			bsc_api.c bsc_msc.c bsc_vty.c \
-			gsm_04_08_utils.c \
-			bsc_init.c bts_init.c bsc_rf_ctrl.c \
-			arfcn_range_encode.c bsc_ctrl_commands.c \
-			bsc_ctrl_lookup.c \
-			net_init.c \
-			bsc_dyn_ts.c
+noinst_LIBRARIES = \
+	libbsc.a \
+	$(NULL)
+
+libbsc_a_SOURCES = \
+	abis_nm.c \
+	abis_nm_vty.c \
+	abis_om2000.c \
+	abis_om2000_vty.c \
+	abis_rsl.c \
+	bsc_rll.c \
+	paging.c \
+	bts_ericsson_rbs2000.c \
+	bts_ipaccess_nanobts.c \
+	bts_siemens_bs11.c \
+	bts_nokia_site.c \
+	bts_unknown.c \
+	bts_sysmobts.c \
+	chan_alloc.c \
+	handover_decision.c \
+	handover_logic.c \
+	meas_rep.c \
+	rest_octets.c \
+	system_information.c \
+	e1_config.c \
+	bsc_api.c \
+	bsc_msc.c bsc_vty.c \
+	gsm_04_08_utils.c \
+	bsc_init.c \
+	bts_init.c \
+	bsc_rf_ctrl.c \
+	arfcn_range_encode.c \
+	bsc_ctrl_commands.c \
+	bsc_ctrl_lookup.c \
+	net_init.c \
+	bsc_dyn_ts.c \
+	$(NULL)