diff options
| author | Adriana Kobylak <anoo@us.ibm.com> | 2017-02-19 09:53:34 -0600 |
|---|---|---|
| committer | Adriana Kobylak <anoo@us.ibm.com> | 2017-02-28 10:47:36 -0600 |
| commit | f4690738e8bab23fef814ad0b19132128983a363 (patch) | |
| tree | 8bd8cd1d3e9eca20850cb6ddf1fe14fa5bbfe1a9 /Makefile.am | |
| parent | 1a7508bbfd10ab9b97cfff757e57a88b7a34c576 (diff) | |
| download | phosphor-logging-f4690738e8bab23fef814ad0b19132128983a363.tar.gz phosphor-logging-f4690738e8bab23fef814ad0b19132128983a363.zip | |
elog-gen.py: Support subdirs
Add ability for elog-gen.py to find yaml files under subdirectories
so that yaml files found in Error/Callout/ and Error/IIC/ for
example can be found by the caller just passing the Error/ directory.
Change-Id: I91dcd523d2a75deea6266a3ea6885b88cd788206
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index f56fc37..3f10b0e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,20 +68,20 @@ xyz/openbmc_project/Logging/Internal/Manager/server.hpp: xyz/openbmc_project/Log 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/ +ELOG_YAML_DIR ?= ${abs_srcdir}/tools/example/ +ELOG_TEMPLATE_DIR ?= ${abs_srcdir}/tools/phosphor-logging/templates/ REQ_FILES_TO_GEN ?= ${abs_srcdir}/tools/elog-gen.py\ - ${abs_srcdir}/$(ELOG_YAML_DIR)/$(ELOG_YAML)\ - ${abs_srcdir}/${ELOG_TEMPLATE_DIR}/$(ELOG_MAKO) + $(ELOG_YAML_DIR)/$(ELOG_YAML)\ + ${ELOG_TEMPLATE_DIR}/$(ELOG_MAKO) # Be sure to package up the required script, yaml, and mako template to # generate the header file EXTRA_DIST = $(REQ_FILES_TO_GEN) elog-gen.hpp: $(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 $(ELOG_MAKO) -o ${abs_srcdir}/elog-gen.hpp + $(AM_V_at)$(PYTHON) ${abs_srcdir}/tools/elog-gen.py -y ${ELOG_YAML_DIR} -t ${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 + $(AM_V_at)$(PYTHON) ${abs_srcdir}/tools/elog-gen.py -y ${ELOG_YAML_DIR} -t ${ELOG_TEMPLATE_DIR} -m $(LOOKUP_MAKO) -o ${abs_srcdir}/elog-lookup.cpp pkgconfiglibdir = ${libdir}/pkgconfig pkgconfiglib_DATA = phosphor-logging.pc |
