diff options
-rw-r--r-- | Makefile.am | 32 | ||||
-rw-r--r-- | user_channel/Makefile.am | 17 |
2 files changed, 24 insertions, 25 deletions
diff --git a/Makefile.am b/Makefile.am index 63718f9..48aa48f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,16 +26,19 @@ BUILT_SOURCES = \ CLEANFILES = $(BUILT_SOURCES) -BOOST_CXX = \ +COMMON_CXX = \ + -flto \ + -Wno-psabi \ + $(SYSTEMD_CFLAGS) \ + $(libmapper_CFLAGS) \ + $(SDBUSPLUS_CFLAGS) \ + $(PHOSPHOR_LOGGING_CFLAGS) \ + $(PHOSPHOR_DBUS_INTERFACES_CFLAGS) \ -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 +ipmid_CXXFLAGS = $(COMMON_CXX) ipmid_LDFLAGS = \ $(SYSTEMD_LIBS) \ $(libmapper_LIBS) \ @@ -103,13 +106,7 @@ libipmi20_la_LDFLAGS = \ $(PHOSPHOR_DBUS_INTERFACES_LIBS) \ -lstdc++fs \ -version-info 0:0:0 -shared -libipmi20_la_CXXFLAGS = \ - $(SYSTEMD_CFLAGS) \ - $(libmapper_CFLAGS) \ - $(BOOST_CXX) \ - $(PHOSPHOR_LOGGING_CFLAGS) \ - $(PHOSPHOR_DBUS_INTERFACES_CFLAGS) \ - -flto +libipmi20_la_CXXFLAGS = $(COMMON_CXX) providers_LTLIBRARIES += libusercmds.la libusercmds_la_LIBADD = user_channel/libuserlayer.la @@ -135,14 +132,7 @@ libsysintfcmds_la_LDFLAGS = \ $(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_CXXFLAGS = $(COMMON_CXX) nobase_include_HEADERS = \ host-ipmid/iana.hpp \ diff --git a/user_channel/Makefile.am b/user_channel/Makefile.am index 58a652f..b9b6ad9 100644 --- a/user_channel/Makefile.am +++ b/user_channel/Makefile.am @@ -1,3 +1,15 @@ +COMMON_CXX = \ + -flto \ + -Wno-psabi \ + $(SYSTEMD_CFLAGS) \ + $(libmapper_CFLAGS) \ + $(SDBUSPLUS_CFLAGS) \ + $(PHOSPHOR_LOGGING_CFLAGS) \ + $(PHOSPHOR_DBUS_INTERFACES_CFLAGS) \ + -DBOOST_ERROR_CODE_HEADER_ONLY \ + -DBOOST_SYSTEM_NO_DEPRECATED \ + -DBOOST_ALL_NO_LIB + lib_LTLIBRARIES = libuserlayer.la libuserlayer_la_SOURCES = \ user_layer.cpp \ @@ -15,7 +27,4 @@ libuserlayer_la_LDFLAGS = \ -version-info 0:0:0 -shared libuserlayer_la_CXXFLAGS = \ -I$(top_srcdir) \ - $(SYSTEMD_CFLAGS) \ - $(libmapper_CFLAGS) \ - $(PHOSPHOR_LOGGING_CFLAGS) \ - $(PHOSPHOR_DBUS_INTERFACES_CFLAGS) + $(COMMON_CXX) |