Build dbus monitor using generated source
Have dbus monitoring application build under phosphor-hwmon and use
the generated events source
Change-Id: Ic3f74192a3c65a79c4bc2657d42f196c15840cff
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
diff --git a/src/Makefile.am b/src/Makefile.am
index b9c857c..8c57553 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,8 +4,10 @@
sbin_PROGRAMS = phosphor-dbus-monitor
phosphor_dbus_monitor_SOURCES = \
+ functor.cpp \
main.cpp \
- monitor.cpp
+ monitor.cpp \
+ generated.cpp
phosphor_dbus_monitor_LDADD = \
$(SDBUSPLUS_LIBS) \
$(PHOSPHOR_LOGGING_LIBS)
diff --git a/src/monitor.cpp b/src/monitor.cpp
index aeb1fe5..093b8e7 100644
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -7,12 +7,6 @@
namespace monitoring
{
-// TODO Remove when generated.cpp included
-const std::vector<std::tuple<std::vector<std::shared_ptr<Event>>,
- std::vector<Action>>>
- Monitor::events
-{};
-
Monitor::Monitor(sdbusplus::bus::bus& bus) :
bus(bus)
{