version-handler: Refactor handler construction
Instead of requiring callers to build maps and info blobs, take the
minimal required amount of information about the blob configuration and
build required datastructures internally.
This reduces the amount of code, and nearly eliminates all of the
untested code in main.cpp.
Change-Id: Iaa398eb404814e9263e6707b71b38a9831d96697
Signed-off-by: William A. Kennington III <wak@google.com>
diff --git a/bmc/version-handler/Makefile.am b/bmc/version-handler/Makefile.am
index 7230193..dec3ff1 100644
--- a/bmc/version-handler/Makefile.am
+++ b/bmc/version-handler/Makefile.am
@@ -11,13 +11,9 @@
libversionblob_common_la_CXXFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/bmc \
- $(SDBUSPLUS_CFLAGS) \
- $(PHOSPHOR_LOGGING_CFLAGS) \
$(CODE_COVERAGE_CXXFLAGS) \
-flto
libversionblob_common_la_LDFLAGS = \
- $(SDBUSPLUS_LIBS) \
- $(PHOSPHOR_LOGGING_LIBS) \
$(CODE_COVERAGE_LIBS) \
-lstdc++fs
libversionblob_common_la_LIBADD = $(top_builddir)/libfirmware_common.la
@@ -29,16 +25,13 @@
main.cpp
libversionblob_la_LIBADD = libversionblob_common.la
libversionblob_la_LDFLAGS = \
- $(SDBUSPLUS_LIBS) \
- $(PHOSPHOR_LOGGING_LIBS) \
$(CODE_COVERAGE_LIBS) \
-lstdc++fs \
-version-info 0:0:0 -shared
libversionblob_la_CXXFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/bmc \
- $(SDBUSPLUS_CFLAGS) \
- $(PHOSPHOR_LOGGING_CFLAGS) \
$(CODE_COVERAGE_CXXFLAGS) \
-flto
+
SUBDIRS = . test