diff options
| -rw-r--r-- | Makefile.am | 86 | ||||
| -rw-r--r-- | softoff/Makefile.am | 40 |
2 files changed, 75 insertions, 51 deletions
diff --git a/Makefile.am b/Makefile.am index 7024a26..c9ce2ff 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,20 +18,21 @@ libipmi20_BUILT_LIST = \ channel-gen.cpp BUILT_SOURCES = \ - ipmiwhitelist.cpp \ - $(libipmi20_BUILT_LIST) - + ipmiwhitelist.cpp \ + $(libipmi20_BUILT_LIST) CLEANFILES = $(BUILT_SOURCES) -BOOST_CXX = -DBOOST_ERROR_CODE_HEADER_ONLY \ - -DBOOST_SYSTEM_NO_DEPRECATED \ - -DBOOST_ALL_NO_LIB +BOOST_CXX = \ + -DBOOST_ERROR_CODE_HEADER_ONLY \ + -DBOOST_SYSTEM_NO_DEPRECATED \ + -DBOOST_ALL_NO_LIB + ipmid_CXXFLAGS = \ - $(BOOST_CXX) \ - $(PHOSPHOR_LOGGING_CFLAGS) \ - $(PHOSPHOR_DBUS_INTERFACES_CFLAGS) \ - -flto + $(BOOST_CXX) \ + $(PHOSPHOR_LOGGING_CFLAGS) \ + $(PHOSPHOR_DBUS_INTERFACES_CFLAGS) \ + -flto ipmid_LDFLAGS = \ $(SYSTEMD_LIBS) \ $(libmapper_LIBS) \ @@ -70,11 +71,20 @@ libuserlayer_la_SOURCES = \ user_channel/channel_mgmt.cpp \ user_channel/channel_layer.cpp -libuserlayer_la_LDFLAGS = $(SYSTEMD_LIBS) $(libmapper_LIBS) \ - $(PHOSPHOR_LOGGING_LIBS) $(PHOSPHOR_DBUS_INTERFACES_LIBS) -lstdc++fs \ - $(LIBPAM) $(LIBCRYPT) -lpam_misc -lssl -version-info 0:0:0 -shared -libuserlayer_la_CXXFLAGS = $(SYSTEMD_CFLAGS) $(libmapper_CFLAGS) \ - $(PHOSPHOR_LOGGING_CFLAGS) $(PHOSPHOR_DBUS_INTERFACES_CFLAGS) +libuserlayer_la_LDFLAGS = \ + $(SYSTEMD_LIBS) \ + $(libmapper_LIBS) \ + $(PHOSPHOR_LOGGING_LIBS) \ + $(PHOSPHOR_DBUS_INTERFACES_LIBS) \ + -lstdc++fs \ + $(LIBPAM) $(LIBCRYPT) -lpam_misc -lssl \ + -version-info 0:0:0 -shared +libuserlayer_la_CXXFLAGS = \ + $(SYSTEMD_CFLAGS) \ + $(libmapper_CFLAGS) \ + $(PHOSPHOR_LOGGING_CFLAGS) \ + $(PHOSPHOR_DBUS_INTERFACES_CFLAGS) + libipmi20dir = ${libdir}/ipmid-providers libipmi20_LTLIBRARIES = libipmi20.la libipmi20_la_DEPENDENCIES = libuserlayer.la @@ -110,11 +120,19 @@ XFAIL_TESTS = TESTS = $(check_PROGRAMS) -libipmi20_la_LDFLAGS = $(SYSTEMD_LIBS) $(libmapper_LIBS) \ - $(PHOSPHOR_LOGGING_LIBS) $(PHOSPHOR_DBUS_INTERFACES_LIBS) -lstdc++fs \ - -luserlayer -version-info 0:0:0 -shared -libipmi20_la_CXXFLAGS = $(SYSTEMD_CFLAGS) $(libmapper_CFLAGS) \ - $(BOOST_CXX) $(PHOSPHOR_LOGGING_CFLAGS) \ +libipmi20_la_LDFLAGS = \ + $(SYSTEMD_LIBS) \ + $(libmapper_LIBS) \ + $(PHOSPHOR_LOGGING_LIBS) \ + $(PHOSPHOR_DBUS_INTERFACES_LIBS) \ + -lstdc++fs \ + -luserlayer \ + -version-info 0:0:0 -shared +libipmi20_la_CXXFLAGS = \ + $(SYSTEMD_CFLAGS) \ + $(libmapper_CFLAGS) \ + $(BOOST_CXX) \ + $(PHOSPHOR_LOGGING_CFLAGS) \ $(PHOSPHOR_DBUS_INTERFACES_CFLAGS) \ -flto @@ -123,19 +141,21 @@ libsysintfcmds_LTLIBRARIES = libsysintfcmds.la libsysintfcmds_la_SOURCES = \ systemintfcmds.cpp \ host-interface.cpp -libsysintfcmds_la_LDFLAGS = $(SYSTEMD_LIBS) \ - $(libmapper_LIBS) \ - $(PHOSPHOR_DBUS_INTERFACES_LIBS) \ - $(PHOSPHOR_LOGGING_LIBS) \ - $(SDBUSPLUS_LIBS) \ - -version-info 0:0:0 -shared -libsysintfcmds_la_CXXFLAGS = $(SYSTEMD_CFLAGS) \ - $(BOOST_CXX) \ - $(libmapper_CFLAGS) \ - $(PHOSPHOR_DBUS_INTERFACES_CFLAGS) \ - $(PHOSPHOR_LOGGING_CFLAGS) \ - $(SDBUSPLUS_CFLAGS) \ - -flto +libsysintfcmds_la_LDFLAGS = \ + $(SYSTEMD_LIBS) \ + $(libmapper_LIBS) \ + $(PHOSPHOR_DBUS_INTERFACES_LIBS) \ + $(PHOSPHOR_LOGGING_LIBS) \ + $(SDBUSPLUS_LIBS) \ + -version-info 0:0:0 -shared +libsysintfcmds_la_CXXFLAGS = \ + $(SYSTEMD_CFLAGS) \ + $(BOOST_CXX) \ + $(libmapper_CFLAGS) \ + $(PHOSPHOR_DBUS_INTERFACES_CFLAGS) \ + $(PHOSPHOR_LOGGING_CFLAGS) \ + $(SDBUSPLUS_CFLAGS) \ + -flto nobase_include_HEADERS = \ host-ipmid/iana.hpp \ diff --git a/softoff/Makefile.am b/softoff/Makefile.am index ecd8f86..bbe7b6e 100644 --- a/softoff/Makefile.am +++ b/softoff/Makefile.am @@ -5,28 +5,32 @@ sbin_PROGRAMS = phosphor-softpoweroff # Using ../ instead of $(top_srcdir) due to automake bug in version 1.15. # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=13928 phosphor_softpoweroff_SOURCES = \ - softoff.cpp \ - mainapp.cpp \ - xyz/openbmc_project/Ipmi/Internal/SoftPowerOff/server.cpp \ - ../utils.cpp + softoff.cpp \ + mainapp.cpp \ + xyz/openbmc_project/Ipmi/Internal/SoftPowerOff/server.cpp \ + ../utils.cpp -BUILT_SOURCES = xyz/openbmc_project/Ipmi/Internal/SoftPowerOff/server.cpp \ - xyz/openbmc_project/Ipmi/Internal/SoftPowerOff/server.hpp +BUILT_SOURCES = \ + xyz/openbmc_project/Ipmi/Internal/SoftPowerOff/server.cpp \ + xyz/openbmc_project/Ipmi/Internal/SoftPowerOff/server.hpp nodist_include_HEADERS = xyz/openbmc_project/Ipmi/Internal/SoftPowerOff/server.hpp -CLEANFILES = xyz/openbmc_project/Ipmi/Internal/SoftPowerOff/server.cpp \ - xyz/openbmc_project/Ipmi/Internal/SoftPowerOff/server.hpp +CLEANFILES = \ + xyz/openbmc_project/Ipmi/Internal/SoftPowerOff/server.cpp \ + xyz/openbmc_project/Ipmi/Internal/SoftPowerOff/server.hpp -phosphor_softpoweroff_LDFLAGS = $(SYSTEMD_LIBS) \ - $(SDBUSPLUS_LIBS) \ - $(SDEVENTPLUS_LIBS) \ - $(PHOSPHOR_LOGGING_LIBS) \ - $(PHOSPHOR_DBUS_INTERFACES_LIBS) -phosphor_softpoweroff_CXXFLAGS = $(SYSTEMD_CFLAGS) \ - $(SDBUSPLUS_CFLAGS) \ - $(SDEVENTPLUS_CFLAGS) \ - $(PHOSPHOR_LOGGING_CFLAGS) \ - $(PHOSPHOR_DBUS_INTERFACES_CFLAGS) +phosphor_softpoweroff_LDFLAGS = \ + $(SYSTEMD_LIBS) \ + $(SDBUSPLUS_LIBS) \ + $(SDEVENTPLUS_LIBS) \ + $(PHOSPHOR_LOGGING_LIBS) \ + $(PHOSPHOR_DBUS_INTERFACES_LIBS) +phosphor_softpoweroff_CXXFLAGS = \ + $(SYSTEMD_CFLAGS) \ + $(SDBUSPLUS_CFLAGS) \ + $(SDEVENTPLUS_CFLAGS) \ + $(PHOSPHOR_LOGGING_CFLAGS) \ + $(PHOSPHOR_DBUS_INTERFACES_CFLAGS) xyz/openbmc_project/Ipmi/Internal/SoftPowerOff/server.cpp: ${top_srcdir}/xyz/openbmc_project/Ipmi/Internal/SoftPowerOff.interface.yaml @mkdir -p `dirname $@` |
