diff --git a/Makefile.am b/Makefile.am
index b6871d0..a78f45e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,10 +8,10 @@
 extra_yamldir=$(YAML_PATH)/extra_interfaces.d
 
 phosphor_inventory_SOURCES = app.cpp
-phosphor_inventory_LDADD = libmanager.la
-phosphor_inventory_LDFLAGS = $(SDBUSPLUS_LIBS)
-phosphor_inventory_CFLAGS = $(SDBUSPLUS_CFLAGS)
+phosphor_inventory_LDADD = libmanager.la $(SDBUSPLUS_LIBS)
+phosphor_inventory_CXXFLAGS = $(SDBUSPLUS_CFLAGS)
 
+libmanagercommon_la_LDFLAGS = -static
 libmanagercommon_la_SOURCES = \
 	errors.cpp \
 	functor.cpp \
@@ -20,11 +20,12 @@
 	$(SDBUSPLUS_LIBS) \
 	$(PHOSPHOR_DBUS_INTERFACES_LIBS) \
 	$(PHOSPHOR_LOGGING_LIBS)
-libmanagercommon_la_CFLAGS = \
+libmanagercommon_la_CXXFLAGS = \
 	$(SDBUSPLUS_CFLAGS) \
 	$(PHOSPHOR_DBUS_INTERACES_CFLAGS) \
 	$(PHOSPHOR_LOGGING_CFLAGS)
 
+libmanager_la_LDFLAGS = -static
 libmanager_la_SOURCES = \
 	extra_ifaces.cpp \
 	generated.cpp
diff --git a/test/Makefile.am b/test/Makefile.am
index 974623d..deda4ff 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -10,12 +10,15 @@
 extra_yamldir=$(top_srcdir)/example/extra_interfaces.d
 
 phosphor_inventory_test_SOURCES = test.cpp
-phosphor_inventory_test_LDADD = libtest.la
-phosphor_inventory_test_LDFLAGS = \
+phosphor_inventory_test_LDADD = \
+	libtest.la
 	$(SDBSUPLUS_LIBS) \
+	$(PTHREAD_LIBS)
+phosphor_inventory_test_CXXFLAGS = \
+	$(SDBUSPLUS_CFLAGS) \
 	$(PTHREAD_CFLAGS)
-phosphor_inventory_test_CFLAGS = $(SDBUSPLUS_CFLAGS)
 
+libtest_la_LDFLAGS = -static
 libtest_la_SOURCES = \
 	extra_ifaces.cpp \
 	generated.cpp