Install error YAML files
Install YAML files when installing the package.
Change-Id: I1e80db477441c4360b7f26d5739c4641f6ffeb2a
Signed-off-by: Marri Devender Rao <devenrao@in.ibm.com>
diff --git a/Makefile.am b/Makefile.am
index 9b54f9e..bc4a6e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,7 @@
AM_DEFAULT_SOURCE_EXT = .cpp
+
+# For target build
+if !INSTALL_ERROR_YAML
sbin_PROGRAMS = checkstop_app \
watchdog_timeout
@@ -38,4 +41,10 @@
org/open_power/Host/error.cpp: ${top_srcdir}/org/open_power/Host.errors.yaml
@mkdir -p `dirname $@`
$(SDBUSPLUSPLUS) -r $(srcdir) error exception-cpp org.open_power.Host > $@
-
+else
+# For native build
+# Export error YAML to shared location
+yamldir = ${datadir}/phosphor-dbus-yaml/yaml
+nobase_yaml_DATA = \
+ org/open_power/Host.errors.yaml
+endif #INSTALL_ERROR_YAML
diff --git a/configure.ac b/configure.ac
index d862a43..2802742 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,25 +11,33 @@
AC_PROG_INSTALL
AC_PROG_MAKE_SET
-# Checks for typedefs, structures, and compiler characteristics.
-AX_CXX_COMPILE_STDCXX_14([noext])
-AX_APPEND_COMPILE_FLAGS([-Wall -Werror], [CXXFLAGS])
+# Check for compiler, packages only during target build.
+# As the packages are not available on the host do not
+# perform checks during native build.
+AC_ARG_ENABLE([install_error_yaml],
+ AS_HELP_STRING([--enable-install_error_yaml], [Enable installing error yaml file]),
+ [], [install_error_yaml=no])
+AM_CONDITIONAL([INSTALL_ERROR_YAML], [test "x$enable_install_error_yaml" = "xyes"])
+AS_IF([test "x$enable_install_error_yaml" != "xyes"], [
+ # Checks for typedefs, structures, and compiler characteristics.
+ AX_CXX_COMPILE_STDCXX_14([noext])
+ AX_APPEND_COMPILE_FLAGS([-Wall -Werror], [CXXFLAGS])
-# Check for sdbus++
-AC_PATH_PROG([SDBUSPLUSPLUS], [sdbus++])
-AS_IF([test "x$SDBUSPLUSPLUS" == "x"],
- AC_MSG_ERROR(["Requires sdbus++"]))
+ # Check for sdbus++
+ AC_PATH_PROG([SDBUSPLUSPLUS], [sdbus++])
+ AS_IF([test "x$SDBUSPLUSPLUS" == "x"],
+ AC_MSG_ERROR(["Requires sdbus++"]))
-LT_INIT
+ LT_INIT
-# Checks for libraries.
-AX_PKG_CHECK_MODULES([SYSTEMD], [], [libsystemd >= 221], [],
-[AC_MSG_ERROR(["systemd required and not found."])])
+ # Checks for libraries.
+ AX_PKG_CHECK_MODULES([SYSTEMD], [], [libsystemd >= 221], [],
+ [AC_MSG_ERROR(["systemd required and not found."])])
-# Checks for modules
-PKG_CHECK_MODULES([PHOSPHOR_LOGGING], [phosphor-logging],,
- [AC_MSG_ERROR([Could not find phosphor-logging...openbmc/phosphor-logging package required])])
-
+ # Checks for modules
+ PKG_CHECK_MODULES([PHOSPHOR_LOGGING], [phosphor-logging],,
+ [AC_MSG_ERROR([Could not find phosphor-logging...openbmc/phosphor-logging package required])])
+])
# Create configured output
AC_CONFIG_FILES([Makefile ])
AC_OUTPUT