diff --git a/Makefile.am b/Makefile.am
index 1e7ed65..b6871d0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,13 +16,21 @@
 	errors.cpp \
 	functor.cpp \
 	manager.cpp
-libmanagercommon_la_LIBADD = $(SDBUSPLUS_LIBS) $(PHOSPHOR_DBUS_INTERFACES_LIBS) $(PHOSPHOR_LOGGING_LIBS)
-libmanagercommon_la_CFLAGS = $(SDBUSPLUS_CFLAGS) $(PHOSPHOR_DBUS_INTERACES_CFLAGS) $(PHOSPHOR_LOGGING_CFLAGS)
+libmanagercommon_la_LIBADD = \
+	$(SDBUSPLUS_LIBS) \
+	$(PHOSPHOR_DBUS_INTERFACES_LIBS) \
+	$(PHOSPHOR_LOGGING_LIBS)
+libmanagercommon_la_CFLAGS = \
+	$(SDBUSPLUS_CFLAGS) \
+	$(PHOSPHOR_DBUS_INTERACES_CFLAGS) \
+	$(PHOSPHOR_LOGGING_CFLAGS)
 
 libmanager_la_SOURCES = \
 	extra_ifaces.cpp \
 	generated.cpp
-libmanager_la_LIBADD = libmanagercommon.la $(SDBUSPLUS_LIBS)
+libmanager_la_LIBADD = \
+	libmanagercommon.la \
+	$(SDBUSPLUS_LIBS)
 
 clean-local: clean-extra
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 07f8453..974623d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -11,13 +11,17 @@
 
 phosphor_inventory_test_SOURCES = test.cpp
 phosphor_inventory_test_LDADD = libtest.la
-phosphor_inventory_test_LDFLAGS = $(SDBSUPLUS_LIBS) $(PTHREAD_CFLAGS)
+phosphor_inventory_test_LDFLAGS = \
+	$(SDBSUPLUS_LIBS) \
+	$(PTHREAD_CFLAGS)
 phosphor_inventory_test_CFLAGS = $(SDBUSPLUS_CFLAGS)
 
 libtest_la_SOURCES = \
 	extra_ifaces.cpp \
 	generated.cpp
-libtest_la_LIBADD = $(top_builddir)/libmanagercommon.la $(SDBUSPLUS_LIBS)
+libtest_la_LIBADD = \
+	$(top_builddir)/libmanagercommon.la \
+	$(SDBUSPLUS_LIBS)
 
 clean-local: clean-extra