Index: test/lib/cpp/Makefile
--- test/lib/cpp/Makefile.orig
+++ test/lib/cpp/Makefile
@@ -1,7 +1,7 @@
 .PHONY: all test 01 02 03 04 08 09 clean reallyclean
 
 CFLAGS=-I../../../include -I../../../lib/cpp -DDEBUG
-LIBS=../../../lib/libmosquitto.so.1 ../../../lib/cpp/libmosquittopp.so.1
+LIBS=${WRKLIB} ${WRKLIBPP}
 
 all : 01 02 03 04 08 09