diff options
| author | Matthew Barth <msbarth@us.ibm.com> | 2017-04-12 13:54:26 -0500 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2017-05-15 16:58:22 -0400 |
| commit | b0b82be89c328ff8205821803592ba08963464ee (patch) | |
| tree | affe20d484cb85cadb40c60990707a72029f6190 | |
| parent | 240bf332d20c31be5abe066945012542d94f5333 (diff) | |
| download | phosphor-dbus-monitor-b0b82be89c328ff8205821803592ba08963464ee.tar.gz phosphor-dbus-monitor-b0b82be89c328ff8205821803592ba08963464ee.zip | |
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>
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/monitor.cpp | 6 |
2 files changed, 3 insertions, 7 deletions
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 @@ AM_CPPFLAGS = -iquote ${top_srcdir} 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 dbus 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) { |
