diff options
| -rw-r--r-- | Makefile.am | 15 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 14 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index ef4cdc5..2b93ae5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,8 +6,8 @@ sbin_PROGRAMS = \ ipmid_SOURCES = \ ipmid.cpp nodist_ipmid_SOURCES = ipmiwhitelist.cpp -BUILT_SOURCES = ipmiwhitelist.cpp -CLEANFILES = ipmiwhitelist.cpp +BUILT_SOURCES = ipmiwhitelist.cpp sensor-gen.cpp +CLEANFILES = $(BUILT_SOURCES) #TODO - Make this path a configure option (bitbake parameter) ipmid_CPPFLAGS = -DHOST_IPMI_LIB_PATH=\"/usr/lib/host-ipmid/\" @@ -18,6 +18,9 @@ ipmid_LDFLAGS = $(SYSTEMD_LIBS) $(libmapper_LIBS) $(LIBADD_DLOPEN) -export-dynam ipmiwhitelist.cpp: ${srcdir}/generate_whitelist.sh $(WHITELIST_CONF) $(SHELL) $^ > $@ +sensor-gen.cpp: + $(AM_V_GEN)@SENSORGEN@ -o $(top_builddir) generate-cpp + libapphandlerdir = ${libdir}/ipmid-providers libapphandler_LTLIBRARIES = libapphandler.la libapphandler_la_SOURCES = \ @@ -30,9 +33,11 @@ libapphandler_la_SOURCES = \ storageaddsel.cpp \ transporthandler.cpp \ globalhandler.cpp \ - groupext.cpp -libapphandler_la_LDFLAGS = $(SYSTEMD_LIBS) $(libmapper_LIBS) $(PHOSPHOR_LOGGING_LIBS) $(PHOSPHOR_DBUS_INTERFACES_LIBS) -version-info 0:0:0 -shared -libapphandler_la_CXXFLAGS = $(SYSTEMD_CFLAGS) $(libmapper_CFLAGS) $(PHOSPHOR_LOGGING_CFLAGS) $(PHOSPHOR_DBUS_INTERFACES_CFLAGS) + groupext.cpp \ + sensor-gen.cpp + +libapphandler_la_LDFLAGS = $(SYSTEMD_LIBS) $(libmapper_LIBS) $(PHOSPHOR_LOGGING_LIBS) -version-info 0:0:0 -shared +libapphandler_la_CXXFLAGS = $(SYSTEMD_CFLAGS) $(libmapper_CFLAGS) $(PHOSPHOR_LOGGING_CFLAGS) libsysintfcmdsdir = ${libdir}/ipmid-providers libsysintfcmds_LTLIBRARIES = libsysintfcmds.la diff --git a/configure.ac b/configure.ac index 4ffc554..b43adaf 100644 --- a/configure.ac +++ b/configure.ac @@ -57,6 +57,10 @@ if test -z "$WHITELIST_CONF"; then WHITELIST_CONF=${srcdir}/host-ipmid-whitelist.conf fi +AS_IF([test "x$SENSOR_YAML_GEN" == "x"], [SENSOR_YAML_GEN="sensor-example.yaml"]) +SENSORGEN="$PYTHON ${srcdir}/scripts/sensor_gen.py -i $SENSOR_YAML_GEN" +AC_SUBST(SENSORGEN) + # Create configured output AC_CONFIG_FILES([Makefile test/Makefile]) AC_OUTPUT |
