diff --git a/openbsc/src/Makefile.am b/openbsc/src/Makefile.am
index 4aa880f..272292a 100644
--- a/openbsc/src/Makefile.am
+++ b/openbsc/src/Makefile.am
@@ -1,22 +1,59 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
-AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(COVERAGE_LDFLAGS)
+AM_CPPFLAGS = \
+	$(all_includes) \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir) \
+	$(NULL)
+
+AM_CFLAGS = \
+	-Wall \
+	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOGSM_CFLAGS) \
+	$(LIBOSMOGSM_CFLAGS) \
+	$(LIBOSMOVTY_CFLAGS) \
+	$(COVERAGE_CFLAGS) \
+	$(NULL)
+
+AM_LDFLAGS = \
+	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOGSM_LIBS) \
+	$(COVERAGE_LDFLAGS) \
+	$(NULL)
 
 # Libraries
-SUBDIRS = libcommon libmgcp libbsc libmsc libtrau libfilter
+SUBDIRS = \
+	libcommon \
+	libmgcp \
+	libbsc \
+	libmsc \
+	libtrau \
+	libfilter \
+	$(NULL)
 
 # Conditional Libraries
 if BUILD_IU
-SUBDIRS += libiu
+SUBDIRS += \
+	libiu \
+	$(NULL)
 endif
 
 # Programs
-SUBDIRS += osmo-nitb osmo-bsc_mgcp utils ipaccess gprs
+SUBDIRS += \
+	osmo-nitb \
+	osmo-bsc_mgcp \
+	utils \
+	ipaccess \
+	gprs \
+	$(NULL)
 
 # Conditional Programs
 if BUILD_NAT
-SUBDIRS += osmo-bsc_nat
+SUBDIRS += \
+	osmo-bsc_nat \
+	$(NULL)
 endif
+
 if BUILD_BSC
-SUBDIRS += osmo-bsc
+SUBDIRS += \
+	osmo-bsc \
+	$(NULL)
 endif