diff options
| author | Adriana Kobylak <anoo@us.ibm.com> | 2017-01-24 12:21:50 -0600 |
|---|---|---|
| committer | Adriana Kobylak <anoo@us.ibm.com> | 2017-01-30 12:57:24 -0600 |
| commit | 7298dc2320ff8b18b16acfb66a06c328c786dd87 (patch) | |
| tree | 6c33e9245d08c45d2b9ffc2d2c41a687fe0c3395 /Makefile.am | |
| parent | 7d0692ab33bee41f2525ebd454d948fc9d351822 (diff) | |
| download | phosphor-logging-7298dc2320ff8b18b16acfb66a06c328c786dd87.tar.gz phosphor-logging-7298dc2320ff8b18b16acfb66a06c328c786dd87.zip | |
logging: Commit: Use transaction id and metadata lookup
Add the lookup mako target to the makefile to get it built.
Use the lookup map to find the metadata that needs to be
added to the error log. Use the transaction id to filter
for the desired journal entries.
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
Change-Id: Ia57dc83aab4f7ee35f8de32a799c862be28113f7
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 49c54f0..8487a74 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,10 +14,12 @@ phosphor_log_manager_SOURCES = \ log_manager.cpp \ log_manager_main.cpp -# Be sure to build elog-gen.hpp before compiling -BUILT_SOURCES = elog-gen.hpp +# Be sure to build needed files before compiling +BUILT_SOURCES = elog-gen.hpp elog-lookup.cpp -CLEANFILES=elog-gen.hpp +CLEANFILES = \ + elog-gen.hpp \ + elog-lookup.cpp # systemd required for journal interfaces logging_test_LDFLAGS = $(SYSTEMD_LIBS) $(SDBUSPLUS_LIBS) @@ -26,6 +28,7 @@ phosphor_log_manager_LDFLAGS = $(SYSTEMD_LIBS) $(SDBUSPLUS_LIBS) phosphor_log_manager_CXXFLAGS = $(SYSTEMD_CFLAGS) $(SDBUSPLUS_CFLAGS) ELOG_MAKO ?= elog-gen-template.mako.hpp +LOOKUP_MAKO ?= elog-lookup-template.mako.cpp ELOG_YAML_DIR ?= tools/example/xyz/openbmc_project/Example/ ELOG_TEMPLATE_DIR ?= tools/phosphor-logging/templates/ REQ_FILES_TO_GEN ?= ${abs_srcdir}/tools/elog-gen.py\ @@ -37,6 +40,8 @@ REQ_FILES_TO_GEN ?= ${abs_srcdir}/tools/elog-gen.py\ EXTRA_DIST = $(REQ_FILES_TO_GEN) elog-gen.hpp: $(REQ_FILES_TO_GEN) - $(AM_V_at)${abs_srcdir}/tools/elog-gen.py -y ${abs_srcdir}/${ELOG_YAML_DIR} -t ${abs_srcdir}/${ELOG_TEMPLATE_DIR} -m $(ELOG_MAKO) -o ${abs_srcdir}/elog-gen.hpp + $(AM_V_at)$(PYTHON) ${abs_srcdir}/tools/elog-gen.py -y ${abs_srcdir}/${ELOG_YAML_DIR} -t ${abs_srcdir}/${ELOG_TEMPLATE_DIR} -m $(ELOG_MAKO) -o ${abs_srcdir}/elog-gen.hpp +elog-lookup.cpp: $(REQ_FILES_TO_GEN) + $(AM_V_at)$(PYTHON) ${abs_srcdir}/tools/elog-gen.py -y ${abs_srcdir}/${ELOG_YAML_DIR} -t ${abs_srcdir}/${ELOG_TEMPLATE_DIR} -m $(LOOKUP_MAKO) -o ${abs_srcdir}/elog-lookup.cpp SUBDIRS = test |
