diff options
author | Brandon Wyman <bjwyman@gmail.com> | 2017-07-25 16:31:57 -0500 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2017-07-30 11:30:09 +0000 |
commit | c5f5351d985cf9d5d7d19de4b0d9a7ec083a4f55 (patch) | |
tree | bb97ff331ac544d8eac55d18f4b353eff0279e3d | |
parent | f2fb89922902369e2a136b94aafa1395192ea1e6 (diff) | |
download | phosphor-fan-presence-c5f5351d985cf9d5d7d19de4b0d9a7ec083a4f55.tar.gz phosphor-fan-presence-c5f5351d985cf9d5d7d19de4b0d9a7ec083a4f55.zip |
Changes to auto generate fan_zone_defs.cpp
If the control/fan_zone_defs.cpp is removed, an attempt to rebuild from
the phosphor-fan-presence top directory will fail due to that file being
missing.
These changes fix that so that 'make' will redo the configure step.
Change-Id: Ia774677ec2e3e62c9ba6939f2bfac63d64613886
Signed-off-by: Brandon Wyman <bjwyman@gmail.com>
-rw-r--r-- | configure.ac | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index cd85d39..f4c321d 100644 --- a/configure.ac +++ b/configure.ac @@ -89,43 +89,45 @@ AS_IF([test "x$enable_control" != "xno"], [ AC_ARG_VAR(FAN_DEF_YAML_FILE, [The fan definition file to use]) AS_IF([test "x$FAN_DEF_YAML_FILE" == "x"], - [FAN_DEF_YAML_FILE="${srcdir}/control/example/fans.yaml"]) + [FAN_DEF_YAML_FILE="\${top_srcdir}/control/example/fans.yaml"]) AC_DEFINE_UNQUOTED([FAN_DEF_YAML_FILE], ["$FAN_DEF_YAML_FILE"], [The fan definition file to use]) AC_ARG_VAR(FAN_ZONE_YAML_FILE, [The fan zone definition file to use]) AS_IF([test "x$FAN_ZONE_YAML_FILE" == "x"], - [FAN_ZONE_YAML_FILE="${srcdir}/control/example/zones.yaml"]) + [FAN_ZONE_YAML_FILE="\${top_srcdir}/control/example/zones.yaml"]) AC_DEFINE_UNQUOTED([FAN_ZONE_YAML_FILE], ["$FAN_ZONE_YAML_FILE"], [The fan zone definition file to use]) AC_ARG_VAR(ZONE_EVENTS_YAML_FILE, [The zone events definition file to use]) - AS_IF([test "x$ZONE_EVENTS_YAML_FILE" != "x"], [ - AC_SUBST([ZONE_EVENTS_ARG], ["-e ${ZONE_EVENTS_YAML_FILE}"]) - ]) + AS_IF([test "x$ZONE_EVENTS_YAML_FILE" == "x"], + [ZONE_EVENTS_YAML_FILE="\${top_srcdir}/control/example/events.yaml"]) + AC_DEFINE_UNQUOTED([ZONE_EVENTS_YAML_FILE], ["$ZONE_EVENTS_YAML_FILE"], + [The zone events definition file to use]) AC_ARG_VAR(ZONE_CONDITIONS_YAML_FILE, [The zone conditions definition file to use]) - AS_IF([test "x$ZONE_CONDITIONS_YAML_FILE" != "x"], [ - AC_SUBST([ZONE_CONDITIONS_ARG], ["-c ${ZONE_CONDITIONS_YAML_FILE}"]) - ]) + AS_IF([test "x$ZONE_CONDITIONS_YAML_FILE" == "x"], + [ZONE_CONDITIONS_YAML_FILE="\${top_srcdir}/control/example/zone_conditions.yaml"]) + AC_DEFINE_UNQUOTED([ZONE_CONDITIONS_YAML_FILE], ["$ZONE_CONDITIONS_YAML_FILE"], + [The zone conditions definition file to use]) AC_ARG_VAR(FAN_ZONE_OUTPUT_DIR, [The output directory for the generated fan zone data file]) AS_IF([test "x$FAN_ZONE_OUTPUT_DIR" == "x"], - [FAN_ZONE_OUTPUT_DIR="${srcdir}/control/"]) + [FAN_ZONE_OUTPUT_DIR="\${top_srcdir}/control/"]) AC_DEFINE_UNQUOTED([FAN_ZONE_OUTPUT_DIR], ["$FAN_ZONE_OUTPUT_DIR"], [The output directory for the generated fan zone data file]) AC_SUBST([GEN_FAN_ZONE_DEFS], - [$PYTHON ${srcdir}/control/gen-fan-zone-defs.py \ + ["$PYTHON \${top_srcdir}/control/gen-fan-zone-defs.py \ -f $FAN_DEF_YAML_FILE \ -z $FAN_ZONE_YAML_FILE \ - $ZONE_EVENTS_ARG \ - $ZONE_CONDITIONS_ARG \ - -o $FAN_ZONE_OUTPUT_DIR]) + -e $ZONE_EVENTS_YAML_FILE \ + -c $ZONE_CONDITIONS_YAML_FILE \ + -o $FAN_ZONE_OUTPUT_DIR"]) AC_CONFIG_FILES([control/Makefile]) ]) |