From 6ed7c861febafb29d9abaff6f3607ee9e7ae160e Mon Sep 17 00:00:00 2001
From: Matthias Ringwald <matthias@ringwald.ch>
Date: Fri, 21 Dec 2018 12:12:02 +0100
Subject: [PATCH] test:hfp/sbc: don't link against cpputest for pklg tools

---
 test/hfp/Makefile | 14 +++++++-------
 test/sbc/Makefile | 13 +++++++------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/test/hfp/Makefile b/test/hfp/Makefile
index 7540caaf7..3d089b951 100644
--- a/test/hfp/Makefile
+++ b/test/hfp/Makefile
@@ -52,7 +52,7 @@ CFLAGS   = -g -Wall -Wmissing-prototypes -Wnarrowing
 # CFLAGS += -Werror
 CFLAGS  += -I. -I../ -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/src/classic -I${POSIX_ROOT} -I${BTSTACK_ROOT}/include
 # CFLAGS  += -D OCTAVE_OUTPUT
-LDFLAGS += -lCppUTest -lCppUTestExt
+LDFLAGS_CPPUTEST += -lCppUTest -lCppUTestExt
 
 EXAMPLES = hfp_ag_parser_test hfp_ag_client_test hfp_hf_parser_test hfp_hf_client_test cvsd_plc_test pklg_cvsd_test
 
@@ -62,22 +62,22 @@ clean:
 	rm -rf *.o $(EXAMPLES) $(CLIENT_EXAMPLES) *.dSYM *.wav results/* pklg/*.wav
 
 hfp_ag_parser_test: ${COMMON_OBJ} hfp_gsm_model.o hfp_ag.o hfp.o hfp_ag_parser_test.c  
-	${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
+	${CC} $^ ${CFLAGS} ${LDFLAGS_CPPUTEST} -o $@
 
 hfp_hf_parser_test: ${COMMON_OBJ} hfp_hf.o hfp.o hfp_hf_parser_test.c  
-	${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
+	${CC} $^ ${CFLAGS} ${LDFLAGS_CPPUTEST} -o $@
 
 hfp_hf_client_test: ${MOCK_OBJ} hfp_hf.o hfp.o hfp_hf_client_test.c  
-	${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
+	${CC} $^ ${CFLAGS} ${LDFLAGS_CPPUTEST} -o $@
 
 hfp_ag_client_test: ${MOCK_OBJ} hfp_gsm_model.o hfp_ag.o hfp.o hfp_ag_client_test.c  
-	${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
+	${CC} $^ ${CFLAGS} ${LDFLAGS_CPPUTEST} -o $@
 
 cvsd_plc_test: ${COMMON_OBJ} btstack_cvsd_plc.o wav_util.o cvsd_plc_test.c  
-	${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
+	${CC} $^ ${CFLAGS} ${LDFLAGS_CPPUTEST} -o $@
 
 pklg_cvsd_test: hci_dump.o btstack_util.o btstack_cvsd_plc.o wav_util.o pklg_cvsd_test.o
-	${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
+	${CC} $^ ${CFLAGS} -o $@
 
 test: all
 	mkdir -p results
diff --git a/test/sbc/Makefile b/test/sbc/Makefile
index 436fa1974..ddf6e915c 100644
--- a/test/sbc/Makefile
+++ b/test/sbc/Makefile
@@ -19,7 +19,7 @@ CFLAGS += -I${SBC_ENCODER_ROOT}/include
 CFLAGS += -Werror=unused-parameter
 # CFLAGS += -D OCTAVE_OUTPUT 
 #CFLAGS += -D PRINT_SAMPLES -D PRINT_SCALEFACTORS -D OI_DEBUG -D TRACE_EXECUTION 
-LDFLAGS += -lCppUTest -lCppUTestExt
+LDFLAGS_CPPUTEST += -lCppUTest -lCppUTestExt
 VPATH += ${SBC_DECODER_ROOT}/srce 
 VPATH += ${SBC_ENCODER_ROOT}/srce
 VPATH += ${BTSTACK_ROOT}/src
@@ -41,13 +41,16 @@ SBC_TESTS = sbc_decoder_test msbc_encoder_test pklg_msbc_test
 all: ${SBC_TESTS}
 
 sbc_decoder_test: ${SBC_DECODER_OBJ} ${SBC_ENCODER_OBJ} ${COMMON_OBJ} sbc_decoder_test.o  
-	${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
+	${CC} $^ ${CFLAGS} ${LDFLAGS_CPPUTEST} -o $@
 
 msbc_encoder_test: ${SBC_DECODER_OBJ} ${SBC_ENCODER_OBJ} ${COMMON_OBJ} msbc_encoder_test.o  
-	${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
+	${CC} $^ ${CFLAGS} ${LDFLAGS_CPPUTEST} -o $@
 
 pklg_msbc_test: ${SBC_DECODER_OBJ} hci_dump.o btstack_util.o wav_util.o pklg_msbc_test.o  
-	${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
+	${CC} $^ ${CFLAGS} -o $@
+
+sbc_decoder_sine: ${SBC_DECODER_OBJ} ${SBC_ENCODER_OBJ} ${COMMON_OBJ} sbc_decoder_sine.o data_sine_stereo_sbc.h
+	${CC} $(filter-out data_sine_stereo_sbc.h,$^) ${CFLAGS} ${LDFLAGS_CPPUTEST} -o $@
 
 data_sine_stereo_sbc.h: data/sine-stereo.sbc
 	xxd -i -l 14800 $^ > $@
@@ -55,8 +58,6 @@ data_sine_stereo_sbc.h: data/sine-stereo.sbc
 data_fanfare_8sb_stereo_sbc.h: data/fanfare-8sb-stereo.sbc
 	xxd -i $^ > $@
 
-sbc_decoder_sine: ${SBC_DECODER_OBJ} ${SBC_ENCODER_OBJ} ${COMMON_OBJ} sbc_decoder_sine.o data_sine_stereo_sbc.h
-	${CC} $(filter-out data_sine_stereo_sbc.h,$^) ${CFLAGS} ${LDFLAGS} -o $@
 
 test: all
 	./sbc_decoder_test data/avdtp_sink sbc 0 0