From d5899e7e0c1bfc0b69a9f5bc69267642ad6c038c Mon Sep 17 00:00:00 2001 From: Tom Joseph Date: Fri, 5 May 2017 11:20:34 +0530 Subject: Makefile changes for generating inventory-sensor-gen.cpp Provide capability for the recipe to pass the config yaml as a configurable output. Fallback to inventory-sensor-example.yaml in case no config yaml is passed. Change-Id: I6a069b0925c3e4c4d56bd1c9767b8fadcdf433b4 Signed-off-by: Tom Joseph --- Makefile.am | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 2a51d2f..e0412b6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,7 @@ sbin_PROGRAMS = \ ipmid_SOURCES = \ ipmid.cpp nodist_ipmid_SOURCES = ipmiwhitelist.cpp -BUILT_SOURCES = ipmiwhitelist.cpp sensor-gen.cpp +BUILT_SOURCES = ipmiwhitelist.cpp sensor-gen.cpp inventory-sensor-gen.cpp CLEANFILES = $(BUILT_SOURCES) #TODO - Make this path a configure option (bitbake parameter) @@ -21,6 +21,9 @@ ipmiwhitelist.cpp: ${srcdir}/generate_whitelist.sh $(WHITELIST_CONF) sensor-gen.cpp: $(AM_V_GEN)@SENSORGEN@ -o $(top_builddir) generate-cpp +inventory-sensor-gen.cpp: + $(AM_V_GEN)@INVSENSORGEN@ -o $(top_builddir) generate-cpp + libapphandlerdir = ${libdir}/ipmid-providers libapphandler_LTLIBRARIES = libapphandler.la libapphandler_la_SOURCES = \ @@ -35,7 +38,8 @@ libapphandler_la_SOURCES = \ globalhandler.cpp \ groupext.cpp \ sensor-gen.cpp \ - utils.cpp + utils.cpp \ + inventory-sensor-gen.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) -- cgit v1.2.1