From 25d02d183ea556bb5a57699e7497152fce6ab882 Mon Sep 17 00:00:00 2001 From: Mike Brady Date: Mon, 13 Aug 2018 14:04:22 +0100 Subject: [PATCH] Use CXXFLAGS etc. to ensure they can be overridden properly. Turn off ABI-changed warnings. --- Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index b8da42b2..83fc2132 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,14 +6,14 @@ bin_PROGRAMS = shairport-sync shairport_sync_SOURCES = shairport.c rtsp.c mdns.c mdns_external.c common.c rtp.c player.c alac.c audio.c loudness.c -AM_CFLAGS = -Wno-multichar -Wall -Wextra -Wno-clobbered -pthread -DSYSCONFDIR=\"$(sysconfdir)\" +AM_CFLAGS = -Wno-multichar -Wall -Wextra -Wno-clobbered -Wno-psabi -pthread -DSYSCONFDIR=\"$(sysconfdir)\" if BUILD_FOR_FREEBSD - AM_CPPFLAGS = -I/usr/local/include -Wno-multichar -Wall -Wextra -Wno-clobbered -DSYSCONFDIR=\"$(sysconfdir)\" -O2 + AM_CXXFLAGS = -I/usr/local/include -Wno-multichar -Wall -Wextra -Wno-clobbered -Wno-psabi -pthread -DSYSCONFDIR=\"$(sysconfdir)\" -O2 else if BUILD_FOR_OPENBSD - AM_CPPFLAGS = -I/usr/local/include -Wno-multichar -Wall -Wextra -Wno-clobbered -DSYSCONFDIR=\"$(sysconfdir)\" + AM_CXXFLAGS = -I/usr/local/include -Wno-multichar -Wall -Wextra -Wno-clobbered -Wno-psabi -pthread -DSYSCONFDIR=\"$(sysconfdir)\" else - AM_CPPFLAGS = -Wno-multichar -Wall -Wextra -Wno-clobbered -DSYSCONFDIR=\"$(sysconfdir)\" + AM_CXXFLAGS = -Wno-multichar -Wall -Wextra -Wno-clobbered -Wno-psabi -pthread -DSYSCONFDIR=\"$(sysconfdir)\" endif endif @@ -68,7 +68,7 @@ endif if USE_CONVOLUTION shairport_sync_SOURCES += FFTConvolver/AudioFFT.cpp FFTConvolver/FFTConvolver.cpp FFTConvolver/Utilities.cpp FFTConvolver/convolver.cpp -AM_CXXFLAGS = -std=c++11 +AM_CXXFLAGS += -std=c++11 endif if USE_DNS_SD