diff options
| author | Vernon Mauery <vernon.mauery@linux.intel.com> | 2018-12-21 10:59:19 -0800 |
|---|---|---|
| committer | Vernon Mauery <vernon.mauery@linux.intel.com> | 2019-02-25 22:27:05 +0000 |
| commit | 1bb0c7fc55b21bb40b7afb567f2f938f15411ca1 (patch) | |
| tree | 85365c29e34d2b5d69a63f5d7406618e633fb0c3 | |
| parent | 99d1ba0519b313ab1306a33c7d0f7a0a1d6edb0a (diff) | |
| download | phosphor-host-ipmid-1bb0c7fc55b21bb40b7afb567f2f938f15411ca1.tar.gz phosphor-host-ipmid-1bb0c7fc55b21bb40b7afb567f2f938f15411ca1.zip | |
ipmid: move channel code from libuserlayer to libchannellayer
Separate the channel implementation from the user implementation. It is
possible to link only against the channel layer, but if code is using
the user layer, it is likely to need both user and channel code.
This makes it so that ipmid can support the notion of channels without
supporting users.
Change-Id: I3a7eb7c004e1c2f8aeb696180139cf68c2c4aac0
Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | user_channel/Makefile.am | 8 |
2 files changed, 8 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index 20af6ed..bb7bdbf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -95,6 +95,7 @@ libipmi20_la_SOURCES = \ ipmi_fru_info_area.cpp \ read_fru_data.cpp \ sensordatahandler.cpp \ + user_channel/channelcommands.cpp \ $(libipmi20_BUILT_LIST) @CODE_COVERAGE_RULES@ @@ -106,8 +107,7 @@ TESTS = $(check_PROGRAMS) libipmi20_la_LIBADD = \ libipmid/libipmid.la \ - user_channel/libchannellayer.la \ - user_channel/libuserlayer.la + user_channel/libchannellayer.la libipmi20_la_LDFLAGS = \ $(SYSTEMD_LIBS) \ $(libmapper_LIBS) \ @@ -122,15 +122,12 @@ libusercmds_la_LIBADD = \ libipmid/libipmid.la \ user_channel/libuserlayer.la libusercmds_la_SOURCES = \ - user_channel/usercommands.cpp \ - user_channel/channelcommands.cpp + user_channel/usercommands.cpp libusercmds_la_LDFLAGS = \ $(PHOSPHOR_LOGGING_LIBS) \ $(LIBS) \ -version-info 0:0:0 -shared -libusercmds_la_CXXFLAGS = \ - $(PHOSPHOR_LOGGING_CFLAGS) \ - -flto +libusercmds_la_CXXFLAGS = $(COMMON_CXX) providers_LTLIBRARIES += libsysintfcmds.la libsysintfcmds_la_LIBADD = \ diff --git a/user_channel/Makefile.am b/user_channel/Makefile.am index e57f4ad..5ec2104 100644 --- a/user_channel/Makefile.am +++ b/user_channel/Makefile.am @@ -14,9 +14,7 @@ lib_LTLIBRARIES = libuserlayer.la libchannellayer.la libuserlayer_la_SOURCES = \ user_layer.cpp \ user_mgmt.cpp \ - passwd_mgr.cpp \ - channel_mgmt.cpp \ - channel_layer.cpp + passwd_mgr.cpp libuserlayer_la_LDFLAGS = \ $(SYSTEMD_LIBS) \ $(libmapper_LIBS) \ @@ -29,7 +27,9 @@ libuserlayer_la_CXXFLAGS = \ -I$(top_srcdir) \ $(COMMON_CXX) -libchannellayer_la_SOURCES = +libchannellayer_la_SOURCES = \ + channel_mgmt.cpp \ + channel_layer.cpp libchannellayer_la_LDFLAGS = \ $(SYSTEMD_LIBS) \ $(libmapper_LIBS) \ |
