commit 8c8f53dd6a2cde412f5ecd4ad6c30a1218b8685a
author Matthew Barth <msbarth@us.ibm.com> Tue Feb 18 09:40:13 2020 -0600
committer Matthew Barth <msbarth@us.ibm.com> Fri Mar 13 15:11:00 2020 -0500
tree d626ade27ade6f0f70228e79c24270a55ddcb473
parent 005ff2ff2194195003bb3126c88570a1d8d9f05b

Output generated source to builddir

Fix fan monitor and fan control generated source output to be put in the
designated build directory. This corrects the issue where the files are
not regenerated after another compile is instantiated.

Tested:
    Files regenerated after `bitbake -c compile phosphor-fan`

Change-Id: I4a07920196cf525e41da316f790e0c19508ea4e9
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>

configure.ac

diff --git a/configure.ac b/configure.ac
index 07b7449..d60cd2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -151,21 +151,13 @@
       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="\${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 \${top_srcdir}/control/gen-fan-zone-defs.py \
+      AC_SUBST([GEN_FAN_ZONE_DEFS],
+               ["$PYTHON \${top_srcdir}/control/gen-fan-zone-defs.py \
                          -f $FAN_DEF_YAML_FILE \
                          -z $FAN_ZONE_YAML_FILE \
                          -e $ZONE_EVENTS_YAML_FILE \
-                         -c $ZONE_CONDITIONS_YAML_FILE \
-                         -o $FAN_ZONE_OUTPUT_DIR"])
-       AC_CONFIG_FILES([control/Makefile])
+                         -c $ZONE_CONDITIONS_YAML_FILE"])
+      AC_CONFIG_FILES([control/Makefile])
 ])
 
 AS_IF([test "x$enable_cooling_type" != "xno"], [
@@ -176,21 +168,13 @@
        AC_ARG_VAR(FAN_MONITOR_YAML_FILE,
                   [The fan monitor definition file to use])
        AS_IF([test "x$FAN_MONITOR_YAML_FILE" == "x"],
-             [FAN_MONITOR_YAML_FILE="${srcdir}/monitor/example/monitor.yaml"])
+             [FAN_MONITOR_YAML_FILE="\${top_srcdir}/monitor/example/monitor.yaml"])
        AC_DEFINE_UNQUOTED([FAN_MONITOR_YAML_FILE], ["$FAN_MONITOR_YAML_FILE"],
                           [The fan monitor definition file to use])
 
-       AC_ARG_VAR(FAN_MONITOR_OUTPUT_DIR,
-                  [The output directory for the generated fan monitor data file])
-       AS_IF([test "x$FAN_MONITOR_OUTPUT_DIR" == "x"],
-             [FAN_MONITOR_OUTPUT_DIR="${srcdir}/monitor/"])
-       AC_DEFINE_UNQUOTED([FAN_MONITOR_OUTPUT_DIR], ["$FAN_MONITOR_OUTPUT_DIR"],
-                          [The output directory for the generated fan monitor data file])
-
        AC_SUBST([GEN_FAN_MONITOR_DEFS],
-                [$PYTHON ${srcdir}/monitor/gen-fan-monitor-defs.py \
-                         -m $FAN_MONITOR_YAML_FILE \
-                         -o $FAN_MONITOR_OUTPUT_DIR])
+                ["$PYTHON \${top_srcdir}/monitor/gen-fan-monitor-defs.py \
+                         -m $FAN_MONITOR_YAML_FILE"])
 
        AC_CONFIG_FILES([monitor/Makefile])
 ])