diff options
| author | Adriana Kobylak <anoo@us.ibm.com> | 2017-02-21 12:58:05 -0600 |
|---|---|---|
| committer | Adriana Kobylak <anoo@us.ibm.com> | 2017-02-28 10:47:36 -0600 |
| commit | 6a9db6e414a7df7b616c33f04d0bbe224689180a (patch) | |
| tree | ecbaf100190b7c966658a1532702943beb810b7b /Makefile.am | |
| parent | f4690738e8bab23fef814ad0b19132128983a363 (diff) | |
| download | phosphor-logging-6a9db6e414a7df7b616c33f04d0bbe224689180a.tar.gz phosphor-logging-6a9db6e414a7df7b616c33f04d0bbe224689180a.zip | |
elog-gen.py: Support base and test yaml directories
Add an additional argument to pass the directory where the unit
test yaml files are located. Default the base directory to None
as this argument will be passed by the recipe during build time.
Change-Id: I1276d74e383e1517595371c3f6e31fa077eac43f
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 3f10b0e..973533d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,10 +68,11 @@ 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 ?= ${abs_srcdir}/tools/example/ +ELOG_YAML_DIR ?= "None" +ELOG_YAML_DIR_TEST ?= ${abs_srcdir}/tools/ ELOG_TEMPLATE_DIR ?= ${abs_srcdir}/tools/phosphor-logging/templates/ REQ_FILES_TO_GEN ?= ${abs_srcdir}/tools/elog-gen.py\ - $(ELOG_YAML_DIR)/$(ELOG_YAML)\ + $(ELOG_YAML_DIR_TEST)/$(ELOG_YAML)\ ${ELOG_TEMPLATE_DIR}/$(ELOG_MAKO) # Be sure to package up the required script, yaml, and mako template to @@ -79,9 +80,9 @@ 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)$(PYTHON) ${abs_srcdir}/tools/elog-gen.py -y ${ELOG_YAML_DIR} -t ${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} -u ${ELOG_YAML_DIR_TEST} -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 ${ELOG_YAML_DIR} -t ${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} -u ${ELOG_YAML_DIR_TEST} -t ${ELOG_TEMPLATE_DIR} -m $(LOOKUP_MAKO) -o ${abs_srcdir}/elog-lookup.cpp pkgconfiglibdir = ${libdir}/pkgconfig pkgconfiglib_DATA = phosphor-logging.pc |
