diff --git a/Makefile.am b/Makefile.am
index 3e25794..98487ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -97,9 +97,7 @@
 	app/watchdog_service.cpp \
 	apphandler.cpp \
 	sys_info_param.cpp \
-	sensorhandler.cpp \
 	entity_map_json.cpp \
-	storagehandler.cpp \
 	chassishandler.cpp \
 	dcmihandler.cpp \
 	ipmisensor.cpp \
@@ -115,6 +113,13 @@
 	$(libipmi20_la_TRANSPORTOEM) \
 	$(libipmi20_BUILT_LIST)
 
+if FEATURE_DYNAMIC_SENSORS
+else
+libipmi20_la_SOURCES += \
+	sensorhandler.cpp \
+	storagehandler.cpp
+endif
+
 check_PROGRAMS =
 XFAIL_TESTS =