diff --git a/Makefile.am b/Makefile.am
index ee6e7a8..7bfb12a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,17 @@
 sbin_PROGRAMS = phosphor-hwmon-readd
 
 phosphor_hwmon_readd_SOURCES = readd.cpp
-phosphor_hwmon_readd_LDADD = libhwmon.la
-phosphor_hwmon_readd_LDFLAGS = $(SDBUSPLUS_LIBS)
-phosphor_hwmon_readd_CFLAGS = $(SDBUSPLUS_CFLAGS)
+phosphor_hwmon_readd_LDADD = $(SDBUSPLUS_LIBS) libhwmon.la
+phosphor_hwmon_readd_CXXFLAGS = $(SDBUSPLUS_CFLAGS)
 
 noinst_LTLIBRARIES = libhwmon.la
-libhwmon_la_LDFLAGS = \
+libhwmon_la_LDFLAGS = -static
+libhwmon_la_LIBADD = \
 	$(SDBUSPLUS_LIBS) \
 	$(PHOSPHOR_DBUS_INTERFACES_LIBS) \
 	$(PHOSPHOR_LOGGING_LIBS)
-libhwmon_la_CFLAGS = $(SDBUSPLUS_CFLAGS) \
+libhwmon_la_CXXFLAGS = \
+	$(SDBUSPLUS_CFLAGS) \
 	$(PHOSPHOR_DBUS_INTERFACES_CFLAGS) \
 	$(PHOSPHOR_LOGGING_CFLAGS)
 
diff --git a/configure.ac b/configure.ac
index c7bfa46..b717976 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@
 AC_CHECK_HEADER(sdbusplus/server.hpp, ,[AC_MSG_ERROR([Could not find sdbusplus/server.hpp...sdbusplus developement package required])])
 
 # Checks for library functions.
-LT_INIT([shared])
+LT_INIT
 
 # Check/set gtest specific functions.
 AX_PTHREAD([GTEST_CPPFLAGS="-DGTEST_HAS_PTHREAD=1"],[GTEST_CPPFLAGS="-DGTEST_HAS_PTHREAD=0"])
diff --git a/test/Makefile.am b/test/Makefile.am
index 0d7d7a0..2092964 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -3,6 +3,11 @@
 
 phosphor_hwmon_test_SOURCES = \
 	test.cpp
-phosphor_hwmon_test_LDFLAGS = $(SDBUSPLUS_LIBS) $(PTHREAD_CFLAGS)
-phosphor_hwmon_test_CFLAGS = $(SDBUSPLUS_CFLAGS)
-phosphor_hwmon_test_LDADD = ${top_builddir}/libhwmon.la
+phosphor_hwmon_test_LDADD = \
+	${top_builddir}/libhwmon.la \
+	$(SDBUSPLUS_LIBS) \
+	$(PTHREAD_LIBS)
+
+phosphor_hwmon_test_CXXFLAGS = \
+	$(SDBUSPLUS_CFLAGS) \
+	$(PTHREAD_CFLAGS)