summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorWilliam A. Kennington III <wak@google.com>2018-12-10 15:56:24 -0800
committerTom Joseph <tomjoseph@in.ibm.com>2018-12-20 10:43:14 +0000
commit343d0611277a7506bfb4aba9be6a4028b3f80a13 (patch)
tree3c265e9c4e2e9395f9b77c8f32cd64b0ae698f38 /Makefile.am
parent06df8765c586d03211177efd4aa095a5418dbf91 (diff)
downloadphosphor-host-ipmid-343d0611277a7506bfb4aba9be6a4028b3f80a13.tar.gz
phosphor-host-ipmid-343d0611277a7506bfb4aba9be6a4028b3f80a13.zip
libipmi: Decouple user commands
This makes them an optional, separate provider like the sysfs cmds. Tested: Ran on real hardware that included libusercmds.so in /usr/lib/host-ipmid and on a machine that did not include it. Ran ipmitool on the host to verify that the user commands were present when expected. Change-Id: I07b3af5ae603c3e5f1ea41f0afc309329f4e185d Signed-off-by: William A. Kennington III <wak@google.com>
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am17
1 files changed, 13 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index 6ced8fc..63718f9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,7 +66,6 @@ channel-gen.cpp:
$(AM_V_GEN)@CHANNELGEN@ -o $(top_builddir) generate-cpp
providers_LTLIBRARIES += libipmi20.la
-libipmi20_la_LIBADD = user_channel/libuserlayer.la
libipmi20_la_SOURCES = \
net.cpp \
app/channel.cpp \
@@ -88,8 +87,6 @@ libipmi20_la_SOURCES = \
ipmi_fru_info_area.cpp \
read_fru_data.cpp \
sensordatahandler.cpp \
- user_channel/usercommands.cpp \
- user_channel/channelcommands.cpp \
$(libipmi20_BUILT_LIST)
@CODE_COVERAGE_RULES@
@@ -104,7 +101,6 @@ libipmi20_la_LDFLAGS = \
$(libmapper_LIBS) \
$(PHOSPHOR_LOGGING_LIBS) \
$(PHOSPHOR_DBUS_INTERFACES_LIBS) \
- $(LIBS) \
-lstdc++fs \
-version-info 0:0:0 -shared
libipmi20_la_CXXFLAGS = \
@@ -115,6 +111,19 @@ libipmi20_la_CXXFLAGS = \
$(PHOSPHOR_DBUS_INTERFACES_CFLAGS) \
-flto
+providers_LTLIBRARIES += libusercmds.la
+libusercmds_la_LIBADD = user_channel/libuserlayer.la
+libusercmds_la_SOURCES = \
+ user_channel/usercommands.cpp \
+ user_channel/channelcommands.cpp
+libusercmds_la_LDFLAGS = \
+ $(PHOSPHOR_LOGGING_LIBS) \
+ $(LIBS) \
+ -version-info 0:0:0 -shared
+libusercmds_la_CXXFLAGS = \
+ $(PHOSPHOR_LOGGING_CFLAGS) \
+ -flto
+
providers_LTLIBRARIES += libsysintfcmds.la
libsysintfcmds_la_SOURCES = \
systemintfcmds.cpp \
OpenPOWER on IntegriCloud