diff --git a/bmc/Makefile.am b/bmc/Makefile.am
index 993b881..4592bbd 100644
--- a/bmc/Makefile.am
+++ b/bmc/Makefile.am
@@ -1,105 +1,21 @@
 AM_DEFAULT_SOURCE_EXT = .cpp
+noinst_LTLIBRARIES = libbmc_common.la
 
-pkgdatadir = $(datadir)/phosphor-ipmi-flash
-dist_pkgdata_DATA =
-
-# reboot update is only effective for static layout
-# static layout is also possible with a tarball+bmc-code-mgmt
-#
-# the bmc-code-mgmt will reboot for us or if we need to support this
-# variation (via the ApplyTime to immediate) (only currently supported for
-# ubi).
-if ENABLE_STATIC_LAYOUT
-if ENABLE_REBOOT_UPDATE
-dist_pkgdata_DATA += config-static-bmc-reboot.json
-else
-if ENABLE_UPDATE_STATUS
-dist_pkgdata_DATA += config-static-bmc-with-update-status.json
-else
-dist_pkgdata_DATA += config-static-bmc.json
-endif
-endif
-endif
-
-if ENABLE_HOST_BIOS
-dist_pkgdata_DATA += config-bios.json
-endif
-
-if HAVE_SYSTEMD
-systemdsystemunit_DATA = \
-	phosphor-ipmi-flash-bmc-prepare.target \
-	phosphor-ipmi-flash-bmc-verify.target \
-	phosphor-ipmi-flash-bmc-update.target
-if ENABLE_HOST_BIOS
-systemdsystemunit_DATA += \
-	phosphor-ipmi-flash-bios-prepare.target \
-	phosphor-ipmi-flash-bios-verify.target \
-	phosphor-ipmi-flash-bios-update.target
-endif
-endif
-
-noinst_LTLIBRARIES = libfirmwareblob_common.la
-libfirmwareblob_common_la_SOURCES = \
-	buildjson.cpp \
-	fs.cpp \
-	firmware_handler.cpp \
+# shared functionality between firmware and version blob handlers
+libbmc_common_la_SOURCES = \
 	file_handler.cpp \
+	fs.cpp \
 	general_systemd.cpp \
-	lpc_handler.cpp \
 	skip_action.cpp
 
-if ENABLE_ASPEED_LPC
-libfirmwareblob_common_la_SOURCES += lpc_aspeed.cpp
-endif
-
-if ENABLE_NUVOTON_LPC
-libfirmwareblob_common_la_SOURCES += lpc_nuvoton.cpp
-endif
-
-if ENABLE_ASPEED_P2A
-libfirmwareblob_common_la_SOURCES += pci_handler.cpp
-endif
-
-if ENABLE_NUVOTON_P2A_VGA
-libfirmwareblob_common_la_SOURCES += pci_nuvoton_handler.cpp
-endif
-
-if ENABLE_NUVOTON_P2A_MBOX
-libfirmwareblob_common_la_SOURCES += pci_nuvoton_handler.cpp
-endif
-
-if ENABLE_NET_BRIDGE
-libfirmwareblob_common_la_SOURCES += net_handler.cpp
-endif
-
-libfirmwareblob_common_la_CXXFLAGS = \
+libbmc_common_la_CXXFLAGS = \
 	-I$(top_srcdir) \
 	$(SDBUSPLUS_CFLAGS) \
         $(PHOSPHOR_LOGGING_CFLAGS) \
         $(CODE_COVERAGE_CXXFLAGS) \
         -flto
-libfirmwareblob_common_la_LDFLAGS = \
+libbmc_common_la_LDFLAGS = \
         $(SDBUSPLUS_LIBS) \
         $(PHOSPHOR_LOGGING_LIBS) \
         $(CODE_COVERAGE_LIBS) \
         -lstdc++fs
-libfirmwareblob_common_la_LIBADD = $(top_builddir)/libfirmware_common.la
-
-libfirmwareblobdir = ${libdir}/ipmid-providers
-libfirmwareblob_LTLIBRARIES = libfirmwareblob.la
-libfirmwareblob_la_SOURCES = main.cpp
-libfirmwareblob_la_LIBADD = libfirmwareblob_common.la
-libfirmwareblob_la_LDFLAGS = \
-	$(SDBUSPLUS_LIBS) \
-	$(PHOSPHOR_LOGGING_LIBS) \
-	$(CODE_COVERAGE_LIBS) \
-	-lstdc++fs \
-	-version-info 0:0:0 -shared
-libfirmwareblob_la_CXXFLAGS = \
-	-I$(top_srcdir) \
-	$(SDBUSPLUS_CFLAGS) \
-	$(PHOSPHOR_LOGGING_CFLAGS) \
-	$(CODE_COVERAGE_CXXFLAGS) \
-	-flto
-
-SUBDIRS = . test