diff --git a/openbsc/src/ipaccess/Makefile.am b/openbsc/src/ipaccess/Makefile.am
index 9acc0f7..784a578 100644
--- a/openbsc/src/ipaccess/Makefile.am
+++ b/openbsc/src/ipaccess/Makefile.am
@@ -1,26 +1,66 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS)
-AM_LDFLAGS =  $(COVERAGE_LDFLAGS)
-OSMO_LIBS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOABIS_LIBS)
+AM_CPPFLAGS = \
+	$(all_includes) \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir) \
+	$(NULL)
 
-bin_PROGRAMS = abisip-find ipaccess-config ipaccess-proxy
+AM_CFLAGS = \
+	-Wall \
+	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOGSM_CFLAGS) \
+	$(LIBOSMOABIS_CFLAGS) \
+	$(COVERAGE_CFLAGS) \
+	$(NULL)
 
-abisip_find_LDADD = $(top_builddir)/src/libbsc/libbsc.a \
-		      $(top_builddir)/src/libtrau/libtrau.a \
-		      $(top_builddir)/src/libcommon/libcommon.a \
-		      $(OSMO_LIBS)
-abisip_find_SOURCES = abisip-find.c
+AM_LDFLAGS = \
+	$(COVERAGE_LDFLAGS) \
+	$(NULL)
 
-ipaccess_config_SOURCES = ipaccess-config.c ipaccess-firmware.c network_listen.c
+OSMO_LIBS = \
+	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOGSM_LIBS) \
+	$(LIBOSMOABIS_LIBS) \
+	$(NULL)
+
+bin_PROGRAMS = \
+	abisip-find \
+	ipaccess-config \
+	ipaccess-proxy \
+	$(NULL)
+
+abisip_find_LDADD = \
+	$(top_builddir)/src/libbsc/libbsc.a \
+	$(top_builddir)/src/libtrau/libtrau.a \
+	$(top_builddir)/src/libcommon/libcommon.a \
+	$(OSMO_LIBS) \
+	$(NULL)
+
+abisip_find_SOURCES = \
+	abisip-find.c \
+	$(NULL)
+
+ipaccess_config_SOURCES = \
+	ipaccess-config.c \
+	ipaccess-firmware.c \
+	network_listen.c \
+	$(NULL)
 
 # FIXME: resolve the bogus dependencies patched around here:
-ipaccess_config_LDADD = $(top_builddir)/src/libbsc/libbsc.a \
-			$(top_builddir)/src/libtrau/libtrau.a \
-			$(top_builddir)/src/libcommon/libcommon.a \
-			$(LIBCRYPT) $(OSMO_LIBS)
+ipaccess_config_LDADD = \
+	$(top_builddir)/src/libbsc/libbsc.a \
+	$(top_builddir)/src/libtrau/libtrau.a \
+	$(top_builddir)/src/libcommon/libcommon.a \
+	$(LIBCRYPT) \
+	$(OSMO_LIBS) \
+	$(NULL)
 
-ipaccess_proxy_SOURCES = ipaccess-proxy.c
-ipaccess_proxy_LDADD = $(top_builddir)/src/libbsc/libbsc.a \
-		       $(top_builddir)/src/libtrau/libtrau.a \
-		       $(top_builddir)/src/libcommon/libcommon.a \
-		       $(OSMO_LIBS)
+ipaccess_proxy_SOURCES = \
+	ipaccess-proxy.c \
+	$(NULL)
+
+ipaccess_proxy_LDADD = \
+	$(top_builddir)/src/libbsc/libbsc.a \
+	$(top_builddir)/src/libtrau/libtrau.a \
+	$(top_builddir)/src/libcommon/libcommon.a \
+	$(OSMO_LIBS) \
+	$(NULL)