Use path vars in Makefiles.

4 years ago · 5a3b42d4a4
parent aae7c406fe
commit 5a3b42d4a4
36 changed files with 243 additions and 209 deletions
--- a/apps/db_dump/Makefile
+++ b/apps/db_dump/Makefile
@ -1,6 +1,7 @@
-include ../../config.mk
+R=../..
+include ${R}/config.mk

-CFLAGS_FINAL=${CFLAGS} -I../../include -I../../ -I../../lib -I../../src -I../../deps -DWITH_BROKER -DWITH_PERSISTENCE
+CFLAGS_FINAL=${CFLAGS} -I${R}/include -I${R}/ -I${R}/lib -I${R}/src -I${R}/deps -DWITH_BROKER -DWITH_PERSISTENCE

 OBJS = \
 	   db_dump.o \
@ -27,55 +28,55 @@ all : mosquitto_db_dump
 mosquitto_db_dump : ${OBJS}
 	${CROSS_COMPILE}${CC} $^ -o $@ ${LDFLAGS} ${LIBS}

-db_dump.o : db_dump.c db_dump.h ../../src/persist.h
+db_dump.o : db_dump.c db_dump.h ${R}/src/persist.h
 	${CROSS_COMPILE}${CC} $(CFLAGS_FINAL) -c $< -o $@

-print.o : print.c db_dump.h ../../src/persist.h
+print.o : print.c db_dump.h ${R}/src/persist.h
 	${CROSS_COMPILE}${CC} $(CFLAGS_FINAL) -c $< -o $@

-memory_mosq.o : ../../lib/memory_mosq.c ../../lib/memory_mosq.h
+memory_mosq.o : ${R}/lib/memory_mosq.c ${R}/lib/memory_mosq.h
 	${CROSS_COMPILE}${CC} $(CFLAGS_FINAL) -c $< -o $@

-memory_public.o : ../../src/memory_public.c
+memory_public.o : ${R}/src/memory_public.c
 	${CROSS_COMPILE}${CC} $(CFLAGS_FINAL) -c $< -o $@

-net_mosq.o : ../../lib/net_mosq.c ../../lib/net_mosq.h
+net_mosq.o : ${R}/lib/net_mosq.c ${R}/lib/net_mosq.h
 	${CROSS_COMPILE}${CC} $(CFLAGS_FINAL) -c $< -o $@

-packet_datatypes.o : ../../lib/packet_datatypes.c ../../lib/packet_mosq.h
+packet_datatypes.o : ${R}/lib/packet_datatypes.c ${R}/lib/packet_mosq.h
 	${CROSS_COMPILE}${CC} $(CFLAGS_FINAL) -c $< -o $@

-packet_mosq.o : ../../lib/packet_mosq.c ../../lib/packet_mosq.h
+packet_mosq.o : ${R}/lib/packet_mosq.c ${R}/lib/packet_mosq.h
 	${CROSS_COMPILE}${CC} $(CFLAGS_FINAL) -c $< -o $@

-persist_read.o : ../../src/persist_read.c ../../src/persist.h ../../src/mosquitto_broker_internal.h
+persist_read.o : ${R}/src/persist_read.c ${R}/src/persist.h ${R}/src/mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(CFLAGS_FINAL) -c $< -o $@

-persist_read_v234.o : ../../src/persist_read_v234.c ../../src/persist.h ../../src/mosquitto_broker_internal.h
+persist_read_v234.o : ${R}/src/persist_read_v234.c ${R}/src/persist.h ${R}/src/mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(CFLAGS_FINAL) -c $< -o $@

-persist_read_v5.o : ../../src/persist_read_v5.c ../../src/persist.h ../../src/mosquitto_broker_internal.h
+persist_read_v5.o : ${R}/src/persist_read_v5.c ${R}/src/persist.h ${R}/src/mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(CFLAGS_FINAL) -c $< -o $@

-property_mosq.o : ../../lib/property_mosq.c ../../lib/property_mosq.h
+property_mosq.o : ${R}/lib/property_mosq.c ${R}/lib/property_mosq.h
 	${CROSS_COMPILE}${CC} $(CFLAGS_FINAL) -c $< -o $@

-read_handle.o : ../../src/read_handle.c
+read_handle.o : ${R}/src/read_handle.c
 	${CROSS_COMPILE}${CC} $(CFLAGS_FINAL) -c $< -o $@

 stubs.o : stubs.c
 	${CROSS_COMPILE}${CC} $(CFLAGS_FINAL) -c $< -o $@

-send_disconnect.o : ../../lib/send_disconnect.c
+send_disconnect.o : ${R}/lib/send_disconnect.c
 	${CROSS_COMPILE}${CC} $(CFLAGS_FINAL) -c $< -o $@

-time_mosq.o : ../../lib/time_mosq.c
+time_mosq.o : ${R}/lib/time_mosq.c
 	${CROSS_COMPILE}${CC} $(CFLAGS_FINAL) -c $< -o $@

-topic_tok.o : ../../src/topic_tok.c
+topic_tok.o : ${R}/src/topic_tok.c
 	${CROSS_COMPILE}${CC} $(CFLAGS_FINAL) -c $< -o $@

-utf8_mosq.o : ../../lib/utf8_mosq.c
+utf8_mosq.o : ${R}/lib/utf8_mosq.c
 	${CROSS_COMPILE}${CC} $(CFLAGS_FINAL) -c $< -o $@

 reallyclean: clean
--- a/apps/mosquitto_ctrl/Makefile
+++ b/apps/mosquitto_ctrl/Makefile
@ -1,5 +1,4 @@
 R=../..
-
 include ${R}/config.mk

 .PHONY: all install uninstall clean reallyclean
--- a/apps/mosquitto_passwd/Makefile
+++ b/apps/mosquitto_passwd/Makefile
@ -1,4 +1,5 @@
-include ../../config.mk
+R=../..
+include ${R}/config.mk

 .PHONY: all install uninstall clean reallyclean

@ -25,19 +26,19 @@ mosquitto_passwd.o : mosquitto_passwd.c
 get_password.o : get_password.c
 	${CROSS_COMPILE}${CC} $(APP_CPPFLAGS) $(APP_CFLAGS) -c $< -o $@

-base64_mosq.o : ../../lib/base64_mosq.c ../../lib/base64_mosq.h
+base64_mosq.o : ${R}/lib/base64_mosq.c ${R}/lib/base64_mosq.h
 	${CROSS_COMPILE}${CC} $(APP_CPPFLAGS) $(APP_CFLAGS) -c $< -o $@

-memory_mosq.o : ../../lib/memory_mosq.c
+memory_mosq.o : ${R}/lib/memory_mosq.c
 	${CROSS_COMPILE}${CC} $(APP_CPPFLAGS) $(APP_CFLAGS) -c $< -o $@

-memory_public.o : ../../src/memory_public.c
+memory_public.o : ${R}/src/memory_public.c
 	${CROSS_COMPILE}${CC} $(APP_CPPFLAGS) $(APP_CFLAGS) -c $< -o $@

-misc_mosq.o : ../../lib/misc_mosq.c ../../lib/misc_mosq.h
+misc_mosq.o : ${R}/lib/misc_mosq.c ${R}/lib/misc_mosq.h
 	${CROSS_COMPILE}${CC} $(APP_CPPFLAGS) $(APP_CFLAGS) -c $< -o $@

-password_mosq.o : ../../src/password_mosq.c ../../src/password_mosq.h
+password_mosq.o : ${R}/src/password_mosq.c ${R}/src/password_mosq.h
 	${CROSS_COMPILE}${CC} $(APP_CPPFLAGS) $(APP_CFLAGS) -c $< -o $@

 install : all
--- a/client/Makefile
+++ b/client/Makefile
@ -1,9 +1,10 @@
-include ../config.mk
+R=..
+include ${R}/config.mk

 .PHONY: all install uninstall reallyclean clean static static_pub static_sub static_rr

 ifeq ($(WITH_SHARED_LIBRARIES),yes)
-SHARED_DEP:=../lib/libmosquitto.so.${SOVERSION}
+SHARED_DEP:=${R}/lib/libmosquitto.so.${SOVERSION}
 endif

 ifeq ($(WITH_SHARED_LIBRARIES),yes)
@ -20,13 +21,13 @@ static : static_pub static_sub static_rr
 	# This makes mosquitto_pub/sub/rr versions that are statically linked with
 	# libmosquitto only.

-static_pub : pub_client.o pub_shared.o client_props.o client_shared.o ../lib/libmosquitto.a
+static_pub : pub_client.o pub_shared.o client_props.o client_shared.o ${R}/lib/libmosquitto.a
 	${CROSS_COMPILE}${CC} $^ -o mosquitto_pub ${CLIENT_LDFLAGS} ${STATIC_LIB_DEPS} ${CLIENT_STATIC_LDADD}

-static_sub : sub_client.o sub_client_output.o client_props.o client_shared.o ../lib/libmosquitto.a
+static_sub : sub_client.o sub_client_output.o client_props.o client_shared.o ${R}/lib/libmosquitto.a
 	${CROSS_COMPILE}${CC} $^ -o mosquitto_sub ${CLIENT_LDFLAGS} ${STATIC_LIB_DEPS} ${CLIENT_STATIC_LDADD}

-static_rr : rr_client.o client_props.o client_shared.o pub_shared.o sub_client_output.o ../lib/libmosquitto.a
+static_rr : rr_client.o client_props.o client_shared.o pub_shared.o sub_client_output.o ${R}/lib/libmosquitto.a
 	${CROSS_COMPILE}${CC} $^ -o mosquitto_rr ${CLIENT_LDFLAGS} ${STATIC_LIB_DEPS} ${CLIENT_STATIC_LDADD}

 mosquitto_pub : pub_client.o pub_shared.o client_shared.o client_props.o
@ -68,11 +69,11 @@ testing.o : testing.c
 	${CROSS_COMPILE}${CC} $(CLIENT_CPPFLAGS) $(CLIENT_CFLAGS) -c $< -o $@


-../lib/libmosquitto.so.${SOVERSION} :
-	$(MAKE) -C ../lib
+${R}/lib/libmosquitto.so.${SOVERSION} :
+	$(MAKE) -C ${R}/lib

-../lib/libmosquitto.a :
-	$(MAKE) -C ../lib libmosquitto.a
+${R}/lib/libmosquitto.a :
+	$(MAKE) -C ${R}/lib libmosquitto.a

 install : all
 	$(INSTALL) -d "${DESTDIR}$(prefix)/bin"
--- a/examples/mysql_log/Makefile
+++ b/examples/mysql_log/Makefile
@ -1,5 +1,6 @@
+R=../..
 CFLAGS=-Wall -ggdb
-LDFLAGS=../../lib/libmosquitto.so.1 -lmysqlclient
+LDFLAGS=${R}/lib/libmosquitto.so.1 -lmysqlclient

 .PHONY: all clean

@ -9,7 +10,7 @@ mosquitto_mysql_log : mysql_log.o
 	${CC} $^ -o $@ ${LDFLAGS}

 mysql_log.o : mysql_log.c
-	${CC} -c $^ -o $@ ${CFLAGS} -I../../lib
+	${CC} -c $^ -o $@ ${CFLAGS} -I${R}/lib

 clean :
 	-rm -f *.o mosquitto_mysql_log
--- a/examples/publish/Makefile
+++ b/examples/publish/Makefile
@ -1,23 +1,24 @@
-include ../../config.mk
+R=../..
+include ${R}/config.mk

 .PHONY: all

 all : basic-1 basic-websockets-1

 basic-1 : basic-1.o
-	${CROSS_COMPILE}${CC} $^ -o $@ ../../lib/libmosquitto.so.${SOVERSION}
+	${CROSS_COMPILE}${CC} $^ -o $@ ${R}/lib/libmosquitto.so.${SOVERSION}

 basic-websockets-1 : basic-websockets-1.o
-	${CROSS_COMPILE}${CC} $^ -o $@ ../../lib/libmosquitto.so.${SOVERSION}
+	${CROSS_COMPILE}${CC} $^ -o $@ ${R}/lib/libmosquitto.so.${SOVERSION}

-basic-1.o : basic-1.c ../../lib/libmosquitto.so.${SOVERSION}
-	${CROSS_COMPILE}${CC} -c $< -o $@ -I../../include ${CPPFLAGS} ${CFLAGS}
+basic-1.o : basic-1.c ${R}/lib/libmosquitto.so.${SOVERSION}
+	${CROSS_COMPILE}${CC} -c $< -o $@ -I${R}/include ${CPPFLAGS} ${CFLAGS}

-basic-websockets-1.o : basic-websockets-1.c ../../lib/libmosquitto.so.${SOVERSION}
-	${CROSS_COMPILE}${CC} -c $< -o $@ -I../../include ${CPPFLAGS} ${CFLAGS}
+basic-websockets-1.o : basic-websockets-1.c ${R}/lib/libmosquitto.so.${SOVERSION}
+	${CROSS_COMPILE}${CC} -c $< -o $@ -I${R}/include ${CPPFLAGS} ${CFLAGS}

-../../lib/libmosquitto.so.${SOVERSION} :
-	$(MAKE) -C ../../lib
+${R}/lib/libmosquitto.so.${SOVERSION} :
+	$(MAKE) -C ${R}/lib

 clean :
 	-rm -f *.o sub_single sub_multiple
--- a/examples/subscribe_simple/Makefile
+++ b/examples/subscribe_simple/Makefile
@ -1,29 +1,30 @@
-include ../../config.mk
+R=../..
+include ${R}/config.mk

 .PHONY: all

 all : sub_callback sub_single sub_multiple

 sub_callback : callback.o
-	${CROSS_COMPILE}${CC} $^ -o $@ ../../lib/libmosquitto.so.${SOVERSION}
+	${CROSS_COMPILE}${CC} $^ -o $@ ${R}/lib/libmosquitto.so.${SOVERSION}

 sub_single : single.o
-	${CROSS_COMPILE}${CC} $^ -o $@ ../../lib/libmosquitto.so.${SOVERSION}
+	${CROSS_COMPILE}${CC} $^ -o $@ ${R}/lib/libmosquitto.so.${SOVERSION}

 sub_multiple : multiple.o
-	${CROSS_COMPILE}${CC} $^ -o $@ ../../lib/libmosquitto.so.${SOVERSION}
+	${CROSS_COMPILE}${CC} $^ -o $@ ${R}/lib/libmosquitto.so.${SOVERSION}

-callback.o : callback.c ../../lib/libmosquitto.so.${SOVERSION}
-	${CROSS_COMPILE}${CC} -c $< -o $@ -I../../lib ${CFLAGS}
+callback.o : callback.c ${R}/lib/libmosquitto.so.${SOVERSION}
+	${CROSS_COMPILE}${CC} -c $< -o $@ -I${R}/lib ${CFLAGS}

-single.o : single.c ../../lib/libmosquitto.so.${SOVERSION}
-	${CROSS_COMPILE}${CC} -c $< -o $@ -I../../lib ${CFLAGS}
+single.o : single.c ${R}/lib/libmosquitto.so.${SOVERSION}
+	${CROSS_COMPILE}${CC} -c $< -o $@ -I${R}/lib ${CFLAGS}

-multiple.o : multiple.c ../../lib/libmosquitto.so.${SOVERSION}
-	${CROSS_COMPILE}${CC} -c $< -o $@ -I../../lib ${CFLAGS}
+multiple.o : multiple.c ${R}/lib/libmosquitto.so.${SOVERSION}
+	${CROSS_COMPILE}${CC} -c $< -o $@ -I${R}/lib ${CFLAGS}

-../../lib/libmosquitto.so.${SOVERSION} :
-	$(MAKE) -C ../../lib
+${R}/lib/libmosquitto.so.${SOVERSION} :
+	$(MAKE) -C ${R}/lib

 clean :
 	-rm -f *.o sub_single sub_multiple
--- a/examples/temperature_conversion/Makefile
+++ b/examples/temperature_conversion/Makefile
@ -1,5 +1,6 @@
-CFLAGS=-Wall -ggdb -I../../lib -I../../lib/cpp
-LDFLAGS=-L../../lib ../../lib/cpp/libmosquittopp.so.1 ../../lib/libmosquitto.so.1
+R=../..
+CFLAGS=-Wall -ggdb -I${R}/lib -I${R}/lib/cpp
+LDFLAGS=-L${R}/lib ${R}/lib/cpp/libmosquittopp.so.1 ${R}/lib/libmosquitto.so.1

 .PHONY: all clean

--- a/lib/Makefile
+++ b/lib/Makefile
@ -1,4 +1,5 @@
-include ../config.mk
+R=..
+include ${R}/config.mk

 .PHONY : really clean install

@ -82,10 +83,10 @@ ifeq ($(WITH_STATIC_LIBRARIES),yes)
 	$(INSTALL) ${STRIP_OPTS} libmosquitto.a "${DESTDIR}${libdir}/libmosquitto.a"
 endif
 	$(INSTALL) -d "${DESTDIR}${incdir}/"
-	$(INSTALL) ../include/mosquitto.h "${DESTDIR}${incdir}/mosquitto.h"
-	$(INSTALL) ../include/mqtt_protocol.h "${DESTDIR}${incdir}/mqtt_protocol.h"
+	$(INSTALL) ${R}/include/mosquitto.h "${DESTDIR}${incdir}/mosquitto.h"
+	$(INSTALL) ${R}/include/mqtt_protocol.h "${DESTDIR}${incdir}/mqtt_protocol.h"
 	$(INSTALL) -d "${DESTDIR}${libdir}/pkgconfig"
-	$(INSTALL) -m644 ../libmosquitto.pc.in "${DESTDIR}${libdir}/pkgconfig/libmosquitto.pc"
+	$(INSTALL) -m644 ${R}/libmosquitto.pc.in "${DESTDIR}${libdir}/pkgconfig/libmosquitto.pc"
 	sed ${SEDINPLACE} -e "s#@CMAKE_INSTALL_PREFIX@#${prefix}#" -e "s#@VERSION@#${VERSION}#" "${DESTDIR}${libdir}/pkgconfig/libmosquitto.pc"
 ifeq ($(WITH_SHARED_LIBRARIES),yes)
 	$(MAKE) -C cpp install
@ -109,28 +110,28 @@ libmosquitto.so.${SOVERSION} : ${MOSQ_OBJS}
 libmosquitto.a : ${MOSQ_OBJS}
 	${CROSS_COMPILE}$(AR) cr $@ $^

-mosquitto.o : mosquitto.c ../include/mosquitto.h mosquitto_internal.h
+mosquitto.o : mosquitto.c ${R}/include/mosquitto.h mosquitto_internal.h
 	${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@

-actions_publish.o : actions_publish.c ../include/mosquitto.h mosquitto_internal.h
+actions_publish.o : actions_publish.c ${R}/include/mosquitto.h mosquitto_internal.h
 	${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@

-actions_subscribe.o : actions_subscribe.c ../include/mosquitto.h mosquitto_internal.h
+actions_subscribe.o : actions_subscribe.c ${R}/include/mosquitto.h mosquitto_internal.h
 	${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@

-actions_unsubscribe.o : actions_unsubscribe.c ../include/mosquitto.h mosquitto_internal.h
+actions_unsubscribe.o : actions_unsubscribe.c ${R}/include/mosquitto.h mosquitto_internal.h
 	${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@

-alias_mosq.o : alias_mosq.c alias_mosq.h ../include/mosquitto.h mosquitto_internal.h
+alias_mosq.o : alias_mosq.c alias_mosq.h ${R}/include/mosquitto.h mosquitto_internal.h
 	${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@

-callbacks.o : callbacks.c ../include/mosquitto.h mosquitto_internal.h
+callbacks.o : callbacks.c ${R}/include/mosquitto.h mosquitto_internal.h
 	${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@

 base64_mosq.o : base64_mosq.c base64_mosq.h
 	${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@

-connect.o : connect.c ../include/mosquitto.h mosquitto_internal.h
+connect.o : connect.c ${R}/include/mosquitto.h mosquitto_internal.h
 	${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@

 handle_auth.o : handle_auth.c read_handle.h
@ -172,7 +173,7 @@ http_client.o : http_client.c http_client.h mosquitto_internal.h
 logging_mosq.o : logging_mosq.c logging_mosq.h
 	${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@

-loop.o : loop.c ../include/mosquitto.h mosquitto_internal.h
+loop.o : loop.c ${R}/include/mosquitto.h mosquitto_internal.h
 	${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@

 messages_mosq.o : messages_mosq.c messages_mosq.h
@ -190,16 +191,16 @@ net_mosq_ocsp.o : net_mosq_ocsp.c net_mosq.h
 net_mosq.o : net_mosq.c net_mosq.h
 	${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@

-password_mosq.o : ../src/password_mosq.c net_mosq.h
+password_mosq.o : ${R}/src/password_mosq.c net_mosq.h
 	${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@

-picohttpparser.o : ../deps/picohttpparser/picohttpparser.c ../deps/picohttpparser/picohttpparser.h
+picohttpparser.o : ${R}/deps/picohttpparser/picohttpparser.c ${R}/deps/picohttpparser/picohttpparser.h
 	${CROSS_COMPILE}${CC} $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@

 net_ws.o : net_ws.c net_mosq.h
 	${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@

-options.o : options.c ../include/mosquitto.h mosquitto_internal.h
+options.o : options.c ${R}/include/mosquitto.h mosquitto_internal.h
 	${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@

 packet_datatypes.o : packet_datatypes.c packet_mosq.h
--- a/lib/cpp/Makefile
+++ b/lib/cpp/Makefile
@ -1,4 +1,5 @@
-include ../../config.mk
+R=../..
+include ${R}/config.mk

 ifneq ($(UNAME),SunOS)
 	LIB_LDFLAGS:=$(LDFLAGS) -Wl,-soname,libmosquittopp.so.${SOVERSION}
@ -25,7 +26,7 @@ endif
 	$(INSTALL) -d "${DESTDIR}${incdir}/"
 	$(INSTALL) mosquittopp.h "${DESTDIR}${incdir}/mosquittopp.h"
 	$(INSTALL) -d "${DESTDIR}${libdir}/pkgconfig/"
-	$(INSTALL) -m644 ../../libmosquittopp.pc.in "${DESTDIR}${libdir}/pkgconfig/libmosquittopp.pc"
+	$(INSTALL) -m644 ${R}/libmosquittopp.pc.in "${DESTDIR}${libdir}/pkgconfig/libmosquittopp.pc"
 	sed ${SEDINPLACE} -e "s#@CMAKE_INSTALL_PREFIX@#${prefix}#" -e "s#@VERSION@#${VERSION}#" "${DESTDIR}${libdir}/pkgconfig/libmosquittopp.pc"

 uninstall :
--- a/man/Makefile
+++ b/man/Makefile
@ -1,4 +1,5 @@
-include ../config.mk
+R=..
+include ${R}/config.mk

 .PHONY : all clean install uninstall dist

--- a/plugins/dynamic-security/Makefile
+++ b/plugins/dynamic-security/Makefile
@ -1,11 +1,12 @@
-include ../../config.mk
+R=../..
+include ${R}/config.mk

 .PHONY : all binary check clean reallyclean test install uninstall

 PLUGIN_NAME=mosquitto_dynamic_security
-LOCAL_CPPFLAGS=-I../../lib/ -I../../src/ -I../shared -DWITH_CJSON -DWITH_TLS
+LOCAL_CPPFLAGS=-I${R}/lib/ -I${R}/src/ -I${R}/plugins/shared -DWITH_CJSON -DWITH_TLS
 ifeq ($(WITH_BUNDLED_DEPS),yes)
-	LOCAL_CPPFLAGS:=$(LOCAL_CPPFLAGS) -I../deps
+	LOCAL_CPPFLAGS:=$(LOCAL_CPPFLAGS) -I${R}/deps
 endif

 OBJS=	\
@ -51,7 +52,7 @@ acl.o : acl.c dynamic_security.h
 auth.o : auth.c dynamic_security.h
 	${CROSS_COMPILE}${CC} $(LOCAL_CPPFLAGS) $(PLUGIN_CPPFLAGS) $(PLUGIN_CFLAGS) -c $< -o $@

-base64_mosq.o : ../../lib/base64_mosq.c ../../lib/base64_mosq.h
+base64_mosq.o : ${R}/lib/base64_mosq.c ${R}/lib/base64_mosq.h
 	${CROSS_COMPILE}${CC} $(LOCAL_CPPFLAGS) $(PLUGIN_CPPFLAGS) $(PLUGIN_CFLAGS) -c $< -o $@

 clients.o : clients.c dynamic_security.h
@ -81,19 +82,19 @@ grouplist.o : grouplist.c dynamic_security.h
 hash.o : hash.c dynamic_security.h
 	${CROSS_COMPILE}${CC} $(LOCAL_CPPFLAGS) $(PLUGIN_CPPFLAGS) $(PLUGIN_CFLAGS) -c $< -o $@

-json_help.o : ../shared/json_help.c ../shared/json_help.h
+json_help.o : ${R}/plugins/shared/json_help.c ${R}/plugins/shared/json_help.h
 	${CROSS_COMPILE}${CC} $(LOCAL_CPPFLAGS) $(PLUGIN_CPPFLAGS) $(PLUGIN_CFLAGS) -c $< -o $@

-misc_mosq.o : ../../lib/misc_mosq.c dynamic_security.h
+misc_mosq.o : ${R}/lib/misc_mosq.c dynamic_security.h
 	${CROSS_COMPILE}${CC} $(LOCAL_CPPFLAGS) $(PLUGIN_CPPFLAGS) $(PLUGIN_CFLAGS) -c $< -o $@

-password_mosq.o : ../../src/password_mosq.c dynamic_security.h
+password_mosq.o : ${R}/src/password_mosq.c dynamic_security.h
 	${CROSS_COMPILE}${CC} $(LOCAL_CPPFLAGS) $(PLUGIN_CPPFLAGS) $(PLUGIN_CFLAGS) -c $< -o $@

 plugin.o : plugin.c dynamic_security.h
 	${CROSS_COMPILE}${CC} $(LOCAL_CPPFLAGS) $(PLUGIN_CPPFLAGS) $(PLUGIN_CFLAGS) -c $< -o $@

-plugin_shared.o : ../shared/plugin_shared.c dynamic_security.h
+plugin_shared.o : ${R}/plugins/shared/plugin_shared.c dynamic_security.h
 	${CROSS_COMPILE}${CC} $(LOCAL_CPPFLAGS) $(PLUGIN_CPPFLAGS) $(PLUGIN_CFLAGS) -c $< -o $@

 roles.o : roles.c dynamic_security.h
--- a/plugins/examples/add-properties/Makefile
+++ b/plugins/examples/add-properties/Makefile
@ -1,9 +1,10 @@
-include ../../../config.mk
+R=../../..
+include ${R}/config.mk

 .PHONY : all binary check clean reallyclean test install uninstall

 PLUGIN_NAME=mosquitto_add_properties
-PLUGIN_CFLAGS+=-I../../../include -I../../../
+PLUGIN_CFLAGS+=-I${R}/include -I${R}/

 all : binary

--- a/plugins/examples/auth-by-ip/Makefile
+++ b/plugins/examples/auth-by-ip/Makefile
@ -1,9 +1,10 @@
-include ../../../config.mk
+R=../../..
+include ${R}/config.mk

 .PHONY : all binary check clean reallyclean test install uninstall

 PLUGIN_NAME=mosquitto_auth_by_ip
-PLUGIN_CFLAGS+=-I../../../include -I../../../
+PLUGIN_CFLAGS+=-I${R}/include -I${R}/

 all : binary

--- a/plugins/examples/client-lifetime-stats/Makefile
+++ b/plugins/examples/client-lifetime-stats/Makefile
@ -1,9 +1,10 @@
-include ../../../config.mk
+R=../../..
+include ${R}/config.mk

 .PHONY : all binary check clean reallyclean test install uninstall

 PLUGIN_NAME=mosquitto_client_lifetime_stats
-PLUGIN_CFLAGS+=-I../../../include -I../../../ -I../../../deps
+PLUGIN_CFLAGS+=-I${R}/include -I${R}/ -I${R}/deps

 all : binary

--- a/plugins/examples/client-properties/Makefile
+++ b/plugins/examples/client-properties/Makefile
@ -1,9 +1,10 @@
-include ../../../config.mk
+R=../../..
+include ${R}/config.mk

 .PHONY : all binary check clean reallyclean test install uninstall

 PLUGIN_NAME=mosquitto_client_properties
-PLUGIN_CFLAGS+=-I../../../include -I../../../
+PLUGIN_CFLAGS+=-I${R}/include -I${R}/

 all : binary

--- a/plugins/examples/connection-state/Makefile
+++ b/plugins/examples/connection-state/Makefile
@ -1,9 +1,10 @@
-include ../../../config.mk
+R=../../..
+include ${R}/config.mk

 .PHONY : all binary check clean reallyclean test install uninstall

 PLUGIN_NAME=mosquitto_connection_state
-PLUGIN_CFLAGS+=-I../../../include -I../../../
+PLUGIN_CFLAGS+=-I${R}/include -I${R}/

 all : binary

--- a/plugins/examples/delayed-auth/Makefile
+++ b/plugins/examples/delayed-auth/Makefile
@ -1,11 +1,12 @@
-include ../../../config.mk
+R=../../..
+include ${R}/config.mk

 .PHONY : all binary check clean reallyclean test install uninstall

 PLUGIN_NAME=mosquitto_delayed_auth
-PLUGIN_CPPFLAGS+=-I../../../include -I../../../
+PLUGIN_CPPFLAGS+=-I${R}/include -I${R}/
 ifeq ($(WITH_BUNDLED_DEPS),yes)
-PLUGIN_CPPFLAGS+=-I../../../deps
+PLUGIN_CPPFLAGS+=-I${R}/deps
 endif

 all : binary
--- a/plugins/examples/force-retain/Makefile
+++ b/plugins/examples/force-retain/Makefile
@ -1,9 +1,10 @@
-include ../../../config.mk
+R=../../..
+include ${R}/config.mk

 .PHONY : all binary check clean reallyclean test install uninstall

 PLUGIN_NAME=mosquitto_force_retain
-PLUGIN_CFLAGS+=-I../../../include -I../../../
+PLUGIN_CFLAGS+=-I${R}/include -I${R}/

 all : binary

--- a/plugins/examples/message-timestamp/Makefile
+++ b/plugins/examples/message-timestamp/Makefile
@ -1,9 +1,10 @@
-include ../../../config.mk
+R=../../..
+include ${R}/config.mk

 .PHONY : all binary check clean reallyclean test install uninstall

 PLUGIN_NAME=mosquitto_message_timestamp
-PLUGIN_CFLAGS+=-I../../../include -I../../../
+PLUGIN_CFLAGS+=-I${R}/include -I${R}/

 all : binary

--- a/plugins/examples/payload-modification/Makefile
+++ b/plugins/examples/payload-modification/Makefile
@ -1,9 +1,10 @@
-include ../../../config.mk
+R=../../..
+include ${R}/config.mk

 .PHONY : all binary check clean reallyclean test install uninstall

 PLUGIN_NAME=mosquitto_payload_modification
-PLUGIN_CFLAGS+=-I../../../include -I../../../
+PLUGIN_CFLAGS+=-I${R}/include -I${R}/

 all : binary

--- a/plugins/examples/payload-size-stats/Makefile
+++ b/plugins/examples/payload-size-stats/Makefile
@ -1,9 +1,10 @@
-include ../../../config.mk
+R=../../..
+include ${R}/config.mk

 .PHONY : all binary check clean reallyclean test install uninstall

 PLUGIN_NAME=mosquitto_payload_size_stats
-PLUGIN_CFLAGS+=-I../../../include -I../../../
+PLUGIN_CFLAGS+=-I${R}/include -I${R}/

 all : binary

--- a/plugins/examples/print-ip-on-publish/Makefile
+++ b/plugins/examples/print-ip-on-publish/Makefile
@ -1,9 +1,10 @@
-include ../../../config.mk
+R=../../..
+include ${R}/config.mk

 .PHONY : all binary check clean reallyclean test install uninstall

 PLUGIN_NAME=mosquitto_print_ip_on_publish
-PLUGIN_CFLAGS+=-I../../../include -I../../../
+PLUGIN_CFLAGS+=-I${R}/include -I${R}/

 all : binary

--- a/plugins/examples/topic-modification/Makefile
+++ b/plugins/examples/topic-modification/Makefile
@ -1,9 +1,10 @@
-include ../../../config.mk
+R=../../..
+include ${R}/config.mk

 .PHONY : all binary check clean reallyclean test install uninstall

 PLUGIN_NAME=mosquitto_topic_modification
-PLUGIN_CFLAGS+=-I../../../include -I../../../
+PLUGIN_CFLAGS+=-I${R}/include -I${R}/

 all : binary

--- a/plugins/examples/wildcard-temp/Makefile
+++ b/plugins/examples/wildcard-temp/Makefile
@ -1,11 +1,12 @@
-include ../../../config.mk
+R=../../..
+include ${R}/config.mk

 .PHONY : all binary check clean reallyclean test install uninstall

 PLUGIN_NAME=mosquitto_wildcard_temp
-PLUGIN_CPPFLAGS+=-I../../../include -I../../../
+PLUGIN_CPPFLAGS+=-I${R}/include -I${R}/
 ifeq ($(WITH_BUNDLED_DEPS),yes)
-PLUGIN_CPPFLAGS+=-I../../../deps
+PLUGIN_CPPFLAGS+=-I${R}/deps
 endif

 all : binary
--- a/plugins/persist-sqlite/Makefile
+++ b/plugins/persist-sqlite/Makefile
@ -1,9 +1,10 @@
-include ../../config.mk
+R=../..
+include ${R}/config.mk

 .PHONY : all binary check clean reallyclean test install uninstall

 PLUGIN_NAME=mosquitto_persist_sqlite
-LOCAL_CPPFLAGS=-I../../src/
+LOCAL_CPPFLAGS=-I${R}/src/

 OBJS=	\
 		clients.o \
--- a/src/Makefile
+++ b/src/Makefile
@ -1,4 +1,5 @@
-include ../config.mk
+R=..
+include ${R}/config.mk

 .PHONY: all install uninstall clean reallyclean

@ -112,10 +113,10 @@ mosquitto : ${OBJS}
 mosquitto.o : mosquitto.c mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-alias_mosq.o : ../lib/alias_mosq.c ../lib/alias_mosq.h
+alias_mosq.o : ${R}/lib/alias_mosq.c ${R}/lib/alias_mosq.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-base64_mosq.o : ../lib/base64_mosq.c ../lib/base64_mosq.h
+base64_mosq.o : ${R}/lib/base64_mosq.c ${R}/lib/base64_mosq.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

 bridge.o : bridge.c mosquitto_broker_internal.h
@ -154,28 +155,28 @@ handle_connect.o : handle_connect.c mosquitto_broker_internal.h
 handle_disconnect.o : handle_disconnect.c mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-handle_ping.o : ../lib/handle_ping.c ../lib/read_handle.h
+handle_ping.o : ${R}/lib/handle_ping.c ${R}/lib/read_handle.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-handle_pubackcomp.o : ../lib/handle_pubackcomp.c ../lib/read_handle.h
+handle_pubackcomp.o : ${R}/lib/handle_pubackcomp.c ${R}/lib/read_handle.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

 handle_publish.o : handle_publish.c mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-handle_pubrec.o : ../lib/handle_pubrec.c ../lib/read_handle.h
+handle_pubrec.o : ${R}/lib/handle_pubrec.c ${R}/lib/read_handle.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-handle_pubrel.o : ../lib/handle_pubrel.c ../lib/read_handle.h
+handle_pubrel.o : ${R}/lib/handle_pubrel.c ${R}/lib/read_handle.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-handle_suback.o : ../lib/handle_suback.c ../lib/read_handle.h
+handle_suback.o : ${R}/lib/handle_suback.c ${R}/lib/read_handle.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

 handle_subscribe.o : handle_subscribe.c mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-handle_unsuback.o : ../lib/handle_unsuback.c ../lib/read_handle.h
+handle_unsuback.o : ${R}/lib/handle_unsuback.c ${R}/lib/read_handle.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

 handle_unsubscribe.o : handle_unsubscribe.c mosquitto_broker_internal.h
@ -199,13 +200,13 @@ logging.o : logging.c mosquitto_broker_internal.h
 loop.o : loop.c mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-memory_mosq.o : ../lib/memory_mosq.c ../lib/memory_mosq.h
+memory_mosq.o : ${R}/lib/memory_mosq.c ${R}/lib/memory_mosq.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

 memory_public.o : memory_public.c mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-misc_mosq.o : ../lib/misc_mosq.c ../lib/misc_mosq.h
+misc_mosq.o : ${R}/lib/misc_mosq.c ${R}/lib/misc_mosq.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

 mux.o : mux.c mosquitto_broker_internal.h
@ -223,13 +224,13 @@ mux_poll.o : mux_poll.c mosquitto_broker_internal.h
 net.o : net.c mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-net_mosq_ocsp.o : ../lib/net_mosq_ocsp.c ../lib/net_mosq.h
+net_mosq_ocsp.o : ${R}/lib/net_mosq_ocsp.c ${R}/lib/net_mosq.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-net_mosq.o : ../lib/net_mosq.c ../lib/net_mosq.h
+net_mosq.o : ${R}/lib/net_mosq.c ${R}/lib/net_mosq.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-net_ws.o : ../lib/net_ws.c ../lib/net_mosq.h
+net_ws.o : ${R}/lib/net_ws.c ${R}/lib/net_mosq.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

 password_mosq.o : password_mosq.c password_mosq.h mosquitto_broker_internal.h
@ -250,70 +251,70 @@ persist_write.o : persist_write.c persist.h mosquitto_broker_internal.h
 persist_write_v5.o : persist_write_v5.c persist.h mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-packet_datatypes.o : ../lib/packet_datatypes.c ../lib/packet_mosq.h
+packet_datatypes.o : ${R}/lib/packet_datatypes.c ${R}/lib/packet_mosq.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-packet_mosq.o : ../lib/packet_mosq.c ../lib/packet_mosq.h
+packet_mosq.o : ${R}/lib/packet_mosq.c ${R}/lib/packet_mosq.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-picohttpparser.o : ../deps/picohttpparser/picohttpparser.c ../deps/picohttpparser/picohttpparser.h
+picohttpparser.o : ${R}/deps/picohttpparser/picohttpparser.c ${R}/deps/picohttpparser/picohttpparser.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

 property_broker.o : property_broker.c mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-property_mosq.o : ../lib/property_mosq.c ../lib/property_mosq.h
+property_mosq.o : ${R}/lib/property_mosq.c ${R}/lib/property_mosq.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-plugin_callbacks.o : plugin_callbacks.c ../include/mosquitto_plugin.h mosquitto_broker_internal.h
+plugin_callbacks.o : plugin_callbacks.c ${R}/include/mosquitto_plugin.h mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-plugin_v2.o : plugin_v2.c ../include/mosquitto_plugin.h mosquitto_broker_internal.h
+plugin_v2.o : plugin_v2.c ${R}/include/mosquitto_plugin.h mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-plugin_v3.o : plugin_v3.c ../include/mosquitto_plugin.h mosquitto_broker_internal.h
+plugin_v3.o : plugin_v3.c ${R}/include/mosquitto_plugin.h mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-plugin_v4.o : plugin_v4.c ../include/mosquitto_plugin.h mosquitto_broker_internal.h
+plugin_v4.o : plugin_v4.c ${R}/include/mosquitto_plugin.h mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-plugin_v5.o : plugin_v5.c ../include/mosquitto_plugin.h mosquitto_broker_internal.h
+plugin_v5.o : plugin_v5.c ${R}/include/mosquitto_plugin.h mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-plugin_acl_check.o : plugin_acl_check.c ../include/mosquitto_plugin.h mosquitto_broker_internal.h
+plugin_acl_check.o : plugin_acl_check.c ${R}/include/mosquitto_plugin.h mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-plugin_basic_auth.o : plugin_basic_auth.c ../include/mosquitto_plugin.h mosquitto_broker_internal.h
+plugin_basic_auth.o : plugin_basic_auth.c ${R}/include/mosquitto_plugin.h mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-plugin_cleanup.o : plugin_cleanup.c ../include/mosquitto_plugin.h mosquitto_broker_internal.h
+plugin_cleanup.o : plugin_cleanup.c ${R}/include/mosquitto_plugin.h mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-plugin_connect.o : plugin_connect.c ../include/mosquitto_plugin.h mosquitto_broker_internal.h
+plugin_connect.o : plugin_connect.c ${R}/include/mosquitto_plugin.h mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-plugin_disconnect.o : plugin_disconnect.c ../include/mosquitto_plugin.h mosquitto_broker_internal.h
+plugin_disconnect.o : plugin_disconnect.c ${R}/include/mosquitto_plugin.h mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-plugin_extended_auth.o : plugin_extended_auth.c ../include/mosquitto_plugin.h mosquitto_broker_internal.h
+plugin_extended_auth.o : plugin_extended_auth.c ${R}/include/mosquitto_plugin.h mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-plugin_init.o : plugin_init.c ../include/mosquitto_plugin.h mosquitto_broker_internal.h
+plugin_init.o : plugin_init.c ${R}/include/mosquitto_plugin.h mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-plugin_message.o : plugin_message.c ../include/mosquitto_plugin.h mosquitto_broker_internal.h
+plugin_message.o : plugin_message.c ${R}/include/mosquitto_plugin.h mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-plugin_persist.o : plugin_persist.c ../include/mosquitto_plugin.h mosquitto_broker_internal.h
+plugin_persist.o : plugin_persist.c ${R}/include/mosquitto_plugin.h mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-plugin_psk_key.o : plugin_psk_key.c ../include/mosquitto_plugin.h mosquitto_broker_internal.h
+plugin_psk_key.o : plugin_psk_key.c ${R}/include/mosquitto_plugin.h mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-plugin_public.o : plugin_public.c ../include/mosquitto_plugin.h mosquitto_broker_internal.h
+plugin_public.o : plugin_public.c ${R}/include/mosquitto_plugin.h mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-plugin_tick.o : plugin_tick.c ../include/mosquitto_plugin.h mosquitto_broker_internal.h
+plugin_tick.o : plugin_tick.c ${R}/include/mosquitto_plugin.h mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

 read_handle.o : read_handle.c mosquitto_broker_internal.h
@ -328,31 +329,31 @@ security_default.o : security_default.c mosquitto_broker_internal.h
 send_auth.o : send_auth.c mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-send_connect.o : ../lib/send_connect.c ../lib/send_mosq.h
+send_connect.o : ${R}/lib/send_connect.c ${R}/lib/send_mosq.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-send_disconnect.o : ../lib/send_disconnect.c ../lib/send_mosq.h
+send_disconnect.o : ${R}/lib/send_disconnect.c ${R}/lib/send_mosq.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

 send_connack.o : send_connack.c mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-send_mosq.o : ../lib/send_mosq.c ../lib/send_mosq.h
+send_mosq.o : ${R}/lib/send_mosq.c ${R}/lib/send_mosq.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-send_publish.o : ../lib/send_publish.c ../lib/send_mosq.h
+send_publish.o : ${R}/lib/send_publish.c ${R}/lib/send_mosq.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

 send_suback.o : send_suback.c mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-send_subscribe.o : ../lib/send_subscribe.c ../lib/send_mosq.h
+send_subscribe.o : ${R}/lib/send_subscribe.c ${R}/lib/send_mosq.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

 send_unsuback.o : send_unsuback.c mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-send_unsubscribe.o : ../lib/send_unsubscribe.c ../lib/send_mosq.h
+send_unsubscribe.o : ${R}/lib/send_unsubscribe.c ${R}/lib/send_mosq.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

 service.o : service.c mosquitto_broker_internal.h
@ -364,7 +365,7 @@ session_expiry.o : session_expiry.c mosquitto_broker_internal.h
 signals.o : signals.c mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-strings_mosq.o : ../lib/strings_mosq.c mosquitto_broker_internal.h
+strings_mosq.o : ${R}/lib/strings_mosq.c mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

 subs.o : subs.c mosquitto_broker_internal.h
@ -373,22 +374,22 @@ subs.o : subs.c mosquitto_broker_internal.h
 sys_tree.o : sys_tree.c mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-time_mosq.o : ../lib/time_mosq.c ../lib/time_mosq.h
+time_mosq.o : ${R}/lib/time_mosq.c ${R}/lib/time_mosq.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-tls_mosq.o : ../lib/tls_mosq.c
+tls_mosq.o : ${R}/lib/tls_mosq.c
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

 topic_tok.o : topic_tok.c mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-util_mosq.o : ../lib/util_mosq.c ../lib/util_mosq.h
+util_mosq.o : ${R}/lib/util_mosq.c ${R}/lib/util_mosq.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-util_topic.o : ../lib/util_topic.c ../lib/util_mosq.h
+util_topic.o : ${R}/lib/util_topic.c ${R}/lib/util_mosq.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-utf8_mosq.o : ../lib/utf8_mosq.c
+utf8_mosq.o : ${R}/lib/utf8_mosq.c
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

 websockets.o : websockets.c mosquitto_broker_internal.h
@ -397,7 +398,7 @@ websockets.o : websockets.c mosquitto_broker_internal.h
 will_delay.o : will_delay.c mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

-will_mosq.o : ../lib/will_mosq.c ../lib/will_mosq.h
+will_mosq.o : ${R}/lib/will_mosq.c ${R}/lib/will_mosq.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

 xtreport.o : xtreport.c
@ -407,8 +408,8 @@ install : all
 	$(INSTALL) -d "${DESTDIR}$(prefix)/sbin"
 	$(INSTALL) ${STRIP_OPTS} mosquitto "${DESTDIR}${prefix}/sbin/mosquitto"
 	$(INSTALL) -d "${DESTDIR}$(prefix)/include"
-	$(INSTALL) ../include/mosquitto_broker.h "${DESTDIR}${prefix}/include/mosquitto_broker.h"
-	$(INSTALL) ../include/mosquitto_plugin.h "${DESTDIR}${prefix}/include/mosquitto_plugin.h"
+	$(INSTALL) ${R}/include/mosquitto_broker.h "${DESTDIR}${prefix}/include/mosquitto_broker.h"
+	$(INSTALL) ${R}/include/mosquitto_plugin.h "${DESTDIR}${prefix}/include/mosquitto_plugin.h"

 uninstall :
 	-rm -f "${DESTDIR}${prefix}/sbin/mosquitto"
--- a/test/Makefile
+++ b/test/Makefile
@ -1,4 +1,5 @@
-include ../config.mk
+R=..
+include ${R}/config.mk

 .PHONY: all check test ptest clean

--- a/test/broker/Makefile
+++ b/test/broker/Makefile
@ -1,4 +1,5 @@
-include ../../config.mk
+R=../..
+include ${R}/config.mk

 .PHONY: all check clean test ptest seqtest
 .NOTPARALLEL:
--- a/test/broker/c/Makefile
+++ b/test/broker/c/Makefile
@ -1,6 +1,7 @@
+R=../../..
 .PHONY: all test clean reallyclean

-CFLAGS=-I../../../include -Wall -Werror
+CFLAGS=-I${R}/include -Wall -Werror

 PLUGIN_SRC = \
 	auth_plugin_acl.c \
@ -39,7 +40,7 @@ ${PLUGINS} : %.so: %.c


 ${TESTS} : %.test: %.c
-	$(CC) ${CFLAGS} $< -o $@ ../../../lib/libmosquitto.so.1
+	$(CC) ${CFLAGS} $< -o $@ ${R}/lib/libmosquitto.so.1


 reallyclean : clean
--- a/test/lib/Makefile
+++ b/test/lib/Makefile
@ -1,9 +1,10 @@
-include ../../config.mk
+R=../..
+include ${R}/config.mk

 .PHONY: all check test test-compile test-compile-c test-compile-cpp c cpp
 .NOTPARALLEL:

-LD_LIBRARY_PATH=../../lib
+LD_LIBRARY_PATH=${R}/lib

 all :

--- a/test/lib/c/Makefile
+++ b/test/lib/c/Makefile
@ -1,7 +1,8 @@
+R=../../..
 .PHONY: all clean reallyclean

-CFLAGS=-I../../../include -Werror
-LIBS=../../../lib/libmosquitto.so.1
+CFLAGS=-I${R}/include -Werror
+LIBS=${R}/lib/libmosquitto.so.1

 SRC = \
 	01-con-discon-success.c \
--- a/test/lib/cpp/Makefile
+++ b/test/lib/cpp/Makefile
@ -1,7 +1,8 @@
+R=../../..
 .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
+CFLAGS=-I${R}/include -I${R}/lib/cpp -DDEBUG
+LIBS=${R}/lib/libmosquitto.so.1 ${R}/lib/cpp/libmosquittopp.so.1

 all : 01 02 03 04 08 09

--- a/test/old/Makefile
+++ b/test/old/Makefile
@ -1,7 +1,8 @@
-include ../../config.mk
+R=../..
+include ${R}/config.mk

 CC=cc
-CFLAGS=-I../../src -I../../include -I. -I../.. -Wall -ggdb -DDEBUG -DWITH_CLIENT
+CFLAGS=-I${R}/src -I${R}/include -I. -I${R} -Wall -ggdb -DDEBUG -DWITH_CLIENT
 LDFLAGS=
 SOVERSION=1

@ -10,13 +11,13 @@ SOVERSION=1
 all : msgsps_pub msgsps_sub

 msgsps_pub : msgsps_pub.o
-	${CC} $^ -o $@ ../../lib/libmosquitto.so.${SOVERSION}
+	${CC} $^ -o $@ ${R}/lib/libmosquitto.so.${SOVERSION}

 msgsps_pub.o : msgsps_pub.c msgsps_common.h
 	${CC} $(CFLAGS) -c $< -o $@

 msgsps_sub : msgsps_sub.o
-	${CC} $^ -o $@ ../../lib/libmosquitto.so.${SOVERSION}
+	${CC} $^ -o $@ ${R}/lib/libmosquitto.so.${SOVERSION}

 msgsps_sub.o : msgsps_sub.c msgsps_common.h
 	${CC} $(CFLAGS) -c $< -o $@
--- a/test/random/Makefile
+++ b/test/random/Makefile
@ -1,23 +1,24 @@
-include ../../config.mk
+R=../..
+include ${R}/config.mk

 .PHONY: all test

 ifeq ($(WITH_SHARED_LIBRARIES),yes)
-LIB_DEP:=../../lib/libmosquitto.so.${SOVERSION}
+LIB_DEP:=${R}/lib/libmosquitto.so.${SOVERSION}
 else
-LIB_DEP:=../../lib/libmosquitto.a
+LIB_DEP:=${R}/lib/libmosquitto.a
 endif

 all : auth_plugin.so

 auth_plugin.so : auth_plugin.c
-	$(CC) ${CFLAGS} -fPIC -shared $< -o $@ -I../../lib -I../../src
+	$(CC) ${CFLAGS} -fPIC -shared $< -o $@ -I${R}/lib -I${R}/src

-../lib/libmosquitto.so.${SOVERSION} :
-	$(MAKE) -C ../../lib
+${R}/lib/libmosquitto.so.${SOVERSION} :
+	$(MAKE) -C ${R}/lib

-../lib/libmosquitto.a :
-	$(MAKE) -C ../../lib libmosquitto.a
+${R}/lib/libmosquitto.a :
+	$(MAKE) -C ${R}/lib libmosquitto.a

 clean :
 	-rm -f *.o random_client *.gcda *.gcno
--- a/test/unit/Makefile
+++ b/test/unit/Makefile
@ -1,10 +1,11 @@
-include ../../config.mk
+R=../..
+include ${R}/config.mk

 .PHONY: all check test test-broker test-lib clean coverage

-CPPFLAGS:=$(CPPFLAGS) -I../.. -I../../include -I../../lib -I../../src
+CPPFLAGS:=$(CPPFLAGS) -I${R} -I${R}/include -I${R}/lib -I${R}/src
 ifeq ($(WITH_BUNDLED_DEPS),yes)
-        CPPFLAGS:=$(CPPFLAGS) -I../../deps
+        CPPFLAGS:=$(CPPFLAGS) -I${R}/deps
 endif

 CFLAGS:=$(CFLAGS) -coverage -Wall -ggdb
@ -125,61 +126,61 @@ subs_test : ${SUBS_TEST_OBJS} ${SUBS_OBJS}
 	$(CROSS_COMPILE)$(CC) $(LDFLAGS) -o $@ $^ $(LDADD)


-bridge_topic.o : ../../src/bridge_topic.c
+bridge_topic.o : ${R}/src/bridge_topic.c
 	$(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -DWITH_BROKER -DWITH_BRIDGE -c -o $@ $^

-database.o : ../../src/database.c
+database.o : ${R}/src/database.c
 	$(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^

-memory_mosq.o : ../../lib/memory_mosq.c
+memory_mosq.o : ${R}/lib/memory_mosq.c
 	$(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^

-memory_public.o : ../../src/memory_public.c
+memory_public.o : ${R}/src/memory_public.c
 	$(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^

-misc_mosq.o : ../../lib/misc_mosq.c
+misc_mosq.o : ${R}/lib/misc_mosq.c
 	$(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^

-packet_datatypes.o : ../../lib/packet_datatypes.c
+packet_datatypes.o : ${R}/lib/packet_datatypes.c
 	$(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^

-packet_mosq.o : ../../lib/packet_mosq.c
+packet_mosq.o : ${R}/lib/packet_mosq.c
 	$(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^

-persist_read.o : ../../src/persist_read.c
+persist_read.o : ${R}/src/persist_read.c
 	$(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^

-persist_read_v234.o : ../../src/persist_read_v234.c
+persist_read_v234.o : ${R}/src/persist_read_v234.c
 	$(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^

-persist_read_v5.o : ../../src/persist_read_v5.c
+persist_read_v5.o : ${R}/src/persist_read_v5.c
 	$(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^

-persist_write.o : ../../src/persist_write.c
+persist_write.o : ${R}/src/persist_write.c
 	$(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^

-persist_write_v5.o : ../../src/persist_write_v5.c
+persist_write_v5.o : ${R}/src/persist_write_v5.c
 	$(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^

-property_mosq.o : ../../lib/property_mosq.c
+property_mosq.o : ${R}/lib/property_mosq.c
 	$(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^

-retain.o : ../../src/retain.c
+retain.o : ${R}/src/retain.c
 	$(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^

-subs.o : ../../src/subs.c
+subs.o : ${R}/src/subs.c
 	$(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^

-topic_tok.o : ../../src/topic_tok.c
+topic_tok.o : ${R}/src/topic_tok.c
 	$(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^

-util_mosq.o : ../../lib/util_mosq.c
+util_mosq.o : ${R}/lib/util_mosq.c
 	$(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^

-util_topic.o : ../../lib/util_topic.c
+util_topic.o : ${R}/lib/util_topic.c
 	$(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^

-utf8_mosq.o : ../../lib/utf8_mosq.c
+utf8_mosq.o : ${R}/lib/utf8_mosq.c
 	$(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^

 build : mosq_test bridge_topic_test keepalive_test persist_read_test persist_write_test subs_test