From 667685432eeb078df1f6ccb0892b5b243145f47b Mon Sep 17 00:00:00 2001 From: "RichardAsh1981@gmail.com" Date: Sun, 29 Dec 2013 13:55:46 +0000 Subject: [PATCH] extract the flags required from main audacity sources more reliably by running config.status from there, rather than relying on sed expressions on the generated Makefile --- lib-src/mod-nyq-bench/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib-src/mod-nyq-bench/Makefile b/lib-src/mod-nyq-bench/Makefile index 76a03caf2..a80da48de 100644 --- a/lib-src/mod-nyq-bench/Makefile +++ b/lib-src/mod-nyq-bench/Makefile @@ -24,8 +24,11 @@ CXXFLAGS += -Wall -O9 # ----------------------------------------------------------------------------- CXXFLAGS += -DAUDACITY_DLL_API= -I$(AUDACITY_DIR)/src -CXXFLAGS += ${shell set -x ; sed -e '/override CXXFLAGS/!d;s/override CXXFLAGS += //;s@$$(top_srcdir)@$(AUDACITY_DIR)@g' $(AUDACITY_DIR)/src/Makefile} -LDFLAGS += ${shell sed -e '/^LIBS/!d;s/LIBS *=//' $(AUDACITY_DIR)/src/Makefile} +CXXFLAGS += ${shell echo @CPPFLAGS@ | ../../config.status --file=- } +CXXFLAGS += ${shell echo @CXXFLAGS@ | ../../config.status --file=- | sed -e 's@$$(top_srcdir)@$(AUDACITY_DIR)@g' } +CXXFLAGS += ${shell echo @LIBNYQUIST_CFLAGS@ | ../../config.status --file=- | sed -e 's@$$(top_srcdir)@$(AUDACITY_DIR)@g' } +CXXFLAGS += ${shell echo @WX_CXXFLAGS@ | ../../config.status --file=- } +LDFLAGS += ${shell echo @LIBS@ | ../../config.status --file=- } SYS = $(shell uname -s)