From 86ba51a33c96fa56f2f6b9b88e5632bfb7489543 Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Fri, 26 Apr 2019 13:09:34 +0100 Subject: [PATCH] Build fixes around CFLAGS et al. - Split CFLAGS and CPPFLAGS, and LDFLAGS and LDADD/LIBADD. - test/unit now respects CPPFLAGS and LDFLAGS. Closes #1232. Thanks to Greg Troxel. --- ChangeLog.txt | 2 + client/Makefile | 20 +++---- config.mk | 115 ++++++++++++++++++++------------------- lib/Makefile | 84 ++++++++++++++--------------- lib/cpp/Makefile | 4 +- src/Makefile | 130 ++++++++++++++++++++++----------------------- test/unit/Makefile | 38 ++++++------- 7 files changed, 201 insertions(+), 192 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 7034edbee5..ffe8f9676b 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,8 @@ Clients: Build: - Add `make check` target and document testing procedure. Closes #1230. - Document bundled dependencies and how to disable. Closes #1231. +- Split CFLAGS and CPPFLAGS, and LDFLAGS and LDADD/LIBADD. +- test/unit now respects CPPFLAGS and LDFLAGS. Closes #1232. 1.6 - 20190417 diff --git a/client/Makefile b/client/Makefile index 60de4df469..54bb9edda1 100644 --- a/client/Makefile +++ b/client/Makefile @@ -30,34 +30,34 @@ static_rr : rr_client.o client_props.o client_shared.o pub_shared.o sub_client_o ${CROSS_COMPILE}${CC} $^ -o mosquitto_rr ${CLIENT_LDFLAGS} ${STATIC_LIB_DEPS} mosquitto_pub : pub_client.o pub_shared.o client_shared.o client_props.o - ${CROSS_COMPILE}${CC} $^ -o $@ ${CLIENT_LDFLAGS} + ${CROSS_COMPILE}${CC} $(CLIENT_LDFLAGS) $^ -o $@ $(CLIENT_LDADD) mosquitto_sub : sub_client.o sub_client_output.o client_shared.o client_props.o - ${CROSS_COMPILE}${CC} $^ -o $@ ${CLIENT_LDFLAGS} + ${CROSS_COMPILE}${CC} $(CLIENT_LDFLAGS) $^ -o $@ $(CLIENT_LDADD) mosquitto_rr : rr_client.o client_shared.o client_props.o pub_shared.o sub_client_output.o - ${CROSS_COMPILE}${CC} $^ -o $@ ${CLIENT_LDFLAGS} + ${CROSS_COMPILE}${CC} $(CLIENT_LDFLAGS) $^ -o $@ $(CLIENT_LDADD) pub_client.o : pub_client.c ${SHARED_DEP} - ${CROSS_COMPILE}${CC} -c $< -o $@ ${CLIENT_CFLAGS} + ${CROSS_COMPILE}${CC} $(CLIENT_CPPFLAGS) $(CLIENT_CFLAGS) -c $< -o $@ pub_shared.o : pub_shared.c ${SHARED_DEP} - ${CROSS_COMPILE}${CC} -c $< -o $@ ${CLIENT_CFLAGS} + ${CROSS_COMPILE}${CC} $(CLIENT_CPPFLAGS) $(CLIENT_CFLAGS) -c $< -o $@ sub_client.o : sub_client.c ${SHARED_DEP} - ${CROSS_COMPILE}${CC} -c $< -o $@ ${CLIENT_CFLAGS} + ${CROSS_COMPILE}${CC} $(CLIENT_CPPFLAGS) $(CLIENT_CFLAGS) -c $< -o $@ sub_client_output.o : sub_client_output.c ${SHARED_DEP} - ${CROSS_COMPILE}${CC} -c $< -o $@ ${CLIENT_CFLAGS} + ${CROSS_COMPILE}${CC} $(CLIENT_CPPFLAGS) $(CLIENT_CFLAGS) -c $< -o $@ rr_client.o : rr_client.c ${SHARED_DEP} - ${CROSS_COMPILE}${CC} -c $< -o $@ ${CLIENT_CFLAGS} + ${CROSS_COMPILE}${CC} $(CLIENT_CPPFLAGS) $(CLIENT_CFLAGS) -c $< -o $@ client_shared.o : client_shared.c client_shared.h - ${CROSS_COMPILE}${CC} -c $< -o $@ ${CLIENT_CFLAGS} + ${CROSS_COMPILE}${CC} $(CLIENT_CPPFLAGS) $(CLIENT_CFLAGS) -c $< -o $@ client_props.o : client_props.c client_shared.h - ${CROSS_COMPILE}${CC} -c $< -o $@ ${CLIENT_CFLAGS} + ${CROSS_COMPILE}${CC} $(CLIENT_CPPFLAGS) $(CLIENT_CFLAGS) -c $< -o $@ ../lib/libmosquitto.so.${SOVERSION} : $(MAKE) -C ../lib diff --git a/config.mk b/config.mk index 48dc7b24d5..14266dad40 100644 --- a/config.mk +++ b/config.mk @@ -129,30 +129,39 @@ else endif STATIC_LIB_DEPS:= -LIB_CFLAGS:=${CFLAGS} ${CPPFLAGS} -I. -I.. -I../lib -I../src/deps -LIB_CXXFLAGS:=$(CFLAGS) ${CPPFLAGS} -I. -I.. -I../lib -LIB_LDFLAGS:=${LDFLAGS} -BROKER_CFLAGS:=${LIB_CFLAGS} ${CPPFLAGS} -DVERSION="\"${VERSION}\"" -DWITH_BROKER +LIB_CPPFLAGS=$(CPPFLAGS) -I. -I.. -I../lib -I../src/deps +LIB_CFLAGS:=$(CFLAGS) +LIB_CXXFLAGS:=$(CXXFLAGS) +LIB_LDFLAGS:=$(LDFLAGS) +LIB_LIBADD:=$(LIBADD) + +BROKER_CPPFLAGS:=$(LIB_CPPFLAGS) +BROKER_CFLAGS:=${CFLAGS} -DVERSION="\"${VERSION}\"" -DWITH_BROKER BROKER_LDFLAGS:=${LDFLAGS} -CLIENT_CFLAGS:=${CFLAGS} ${CPPFLAGS} -I.. -I../lib -DVERSION="\"${VERSION}\"" +BROKER_LDADD:= + +CLIENT_CPPFLAGS:=$(CPPFLAGS) -I.. -I../lib +CLIENT_CFLAGS:=${CFLAGS} -DVERSION="\"${VERSION}\"" +CLIENT_LDFLAGS:=-L../lib +CLIENT_LDADD:= + +PASSWD_LDADD:= ifneq ($(or $(findstring $(UNAME),FreeBSD), $(findstring $(UNAME),OpenBSD), $(findstring $(UNAME),NetBSD)),) - BROKER_LIBS:=-lm + BROKER_LDADD:=$(BROKER_LDADD) -lm else - BROKER_LIBS:=-ldl -lm + BROKER_LDADD:=$(BROKER_LDADD) -ldl -lm endif -LIB_LIBS:= -PASSWD_LIBS:= ifeq ($(UNAME),Linux) - BROKER_LIBS:=$(BROKER_LIBS) -lrt -Wl,--dynamic-list=linker.syms - LIB_LIBS:=$(LIB_LIBS) -lrt + BROKER_LDADD:=$(BROKER_LDADD) -lrt + BROKER_LDFLAGS:=$(BROKER_LDFLAGS) -Wl,--dynamic-list=linker.syms + LIB_LIBADD:=$(LIB_LIBADD) -lrt endif -CLIENT_LDFLAGS:=$(LDFLAGS) -L../lib ifeq ($(WITH_SHARED_LIBRARIES),yes) - CLIENT_LDFLAGS:=${CLIENT_LDFLAGS} ../lib/libmosquitto.so.${SOVERSION} + CLIENT_LDADD:=${CLIENT_LDADD} ../lib/libmosquitto.so.${SOVERSION} endif ifeq ($(UNAME),SunOS) @@ -177,89 +186,85 @@ ifneq ($(UNAME),SunOS) endif ifeq ($(UNAME),QNX) - BROKER_LIBS:=$(BROKER_LIBS) -lsocket - LIB_LIBS:=$(LIB_LIBS) -lsocket + BROKER_LDADD:=$(BROKER_LDADD) -lsocket + LIB_LIBADD:=$(LIB_LIBADD) -lsocket endif ifeq ($(WITH_WRAP),yes) - BROKER_LIBS:=$(BROKER_LIBS) -lwrap - BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_WRAP + BROKER_LDADD:=$(BROKER_LDADD) -lwrap + BROKER_CPPFLAGS:=$(BROKER_CPPFLAGS) -DWITH_WRAP endif ifeq ($(WITH_TLS),yes) - BROKER_LIBS:=$(BROKER_LIBS) -lssl -lcrypto - LIB_LIBS:=$(LIB_LIBS) -lssl -lcrypto - BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_TLS - LIB_CFLAGS:=$(LIB_CFLAGS) -DWITH_TLS - PASSWD_LIBS:=-lcrypto - CLIENT_CFLAGS:=$(CLIENT_CFLAGS) -DWITH_TLS + BROKER_LDADD:=$(BROKER_LDADD) -lssl -lcrypto + LIB_LIBADD:=$(LIB_LIBADD) -lssl -lcrypto + BROKER_CPPFLAGS:=$(BROKER_CPPFLAGS) -DWITH_TLS + LIB_CPPFLAGS:=$(LIB_CPPFLAGS) -DWITH_TLS + PASSWD_LDADD:=$(PASSWD_LDADD) -lcrypto + CLIENT_CPPFLAGS:=$(CLIENT_CPPFLAGS) -DWITH_TLS STATIC_LIB_DEPS:=$(STATIC_LIB_DEPS) -lssl -lcrypto ifeq ($(WITH_TLS_PSK),yes) - BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_TLS_PSK - LIB_CFLAGS:=$(LIB_CFLAGS) -DWITH_TLS_PSK - CLIENT_CFLAGS:=$(CLIENT_CFLAGS) -DWITH_TLS_PSK + BROKER_CPPFLAGS:=$(BROKER_CPPFLAGS) -DWITH_TLS_PSK + LIB_CPPFLAGS:=$(LIB_CPPFLAGS) -DWITH_TLS_PSK + CLIENT_CPPFLAGS:=$(CLIENT_CPPFLAGS) -DWITH_TLS_PSK endif endif ifeq ($(WITH_THREADING),yes) - LIB_LIBS:=$(LIB_LIBS) -lpthread - LIB_CFLAGS:=$(LIB_CFLAGS) -DWITH_THREADING - CLIENT_CFLAGS:=$(CLIENT_CFLAGS) -DWITH_THREADING + LIB_LIBADD:=$(LIB_LIBADD) -lpthread + LIB_CPPFLAGS:=$(LIB_CPPFLAGS) -DWITH_THREADING + CLIENT_CPPFLAGS:=$(CLIENT_CPPFLAGS) -DWITH_THREADING STATIC_LIB_DEPS:=$(STATIC_LIB_DEPS) -lpthread endif ifeq ($(WITH_SOCKS),yes) - LIB_CFLAGS:=$(LIB_CFLAGS) -DWITH_SOCKS - CLIENT_CFLAGS:=$(CLIENT_CFLAGS) -DWITH_SOCKS + LIB_CPPFLAGS:=$(LIB_CPPFLAGS) -DWITH_SOCKS + CLIENT_CPPFLAGS:=$(CLIENT_CPPFLAGS) -DWITH_SOCKS endif ifeq ($(WITH_BRIDGE),yes) - BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_BRIDGE + BROKER_CPPFLAGS:=$(BROKER_CPPFLAGS) -DWITH_BRIDGE endif ifeq ($(WITH_PERSISTENCE),yes) - BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_PERSISTENCE + BROKER_CPPFLAGS:=$(BROKER_CPPFLAGS) -DWITH_PERSISTENCE endif ifeq ($(WITH_MEMORY_TRACKING),yes) ifneq ($(UNAME),SunOS) - BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_MEMORY_TRACKING + BROKER_CPPFLAGS:=$(BROKER_CPPFLAGS) -DWITH_MEMORY_TRACKING endif endif -#ifeq ($(WITH_DB_UPGRADE),yes) -# BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_DB_UPGRADE -#endif - ifeq ($(WITH_SYS_TREE),yes) - BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_SYS_TREE + BROKER_CPPFLAGS:=$(BROKER_CPPFLAGS) -DWITH_SYS_TREE endif ifeq ($(WITH_SYSTEMD),yes) - BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_SYSTEMD - BROKER_LIBS:=$(BROKER_LIBS) -lsystemd + BROKER_CPPFLAGS:=$(BROKER_CPPFLAGS) -DWITH_SYSTEMD + BROKER_LDADD:=$(BROKER_LDADD) -lsystemd endif ifeq ($(WITH_SRV),yes) - LIB_CFLAGS:=$(LIB_CFLAGS) -DWITH_SRV - LIB_LIBS:=$(LIB_LIBS) -lcares - CLIENT_CFLAGS:=$(CLIENT_CFLAGS) -DWITH_SRV + LIB_CPPFLAGS:=$(LIB_CPPFLAGS) -DWITH_SRV + LIB_LIBADD:=$(LIB_LIBADD) -lcares + CLIENT_CPPFLAGS:=$(CLIENT_CPPFLAGS) -DWITH_SRV STATIC_LIB_DEPS:=$(STATIC_LIB_DEPS) -lcares endif ifeq ($(UNAME),SunOS) - BROKER_LIBS:=$(BROKER_LIBS) -lsocket -lnsl - LIB_LIBS:=$(LIB_LIBS) -lsocket -lnsl + BROKER_LDADD:=$(BROKER_LDADD) -lsocket -lnsl + LIB_LIBADD:=$(LIB_LIBADD) -lsocket -lnsl endif ifeq ($(WITH_EC),yes) - BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_EC + BROKER_CPPFLAGS:=$(BROKER_CPPFLAGS) -DWITH_EC endif ifeq ($(WITH_ADNS),yes) - BROKER_LIBS:=$(BROKER_LIBS) -lanl - BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_ADNS + BROKER_LDADD:=$(BROKER_LDADD) -lanl + BROKER_CPPFLAGS:=$(BROKER_CPPFLAGS) -DWITH_ADNS endif MAKE_ALL:=mosquitto @@ -268,13 +273,13 @@ ifeq ($(WITH_DOCS),yes) endif ifeq ($(WITH_WEBSOCKETS),yes) - BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_WEBSOCKETS - BROKER_LIBS:=$(BROKER_LIBS) -lwebsockets + BROKER_CPPFLAGS:=$(BROKER_CPPFLAGS) -DWITH_WEBSOCKETS + BROKER_LDADD:=$(BROKER_LDADD) -lwebsockets endif ifeq ($(WITH_WEBSOCKETS),static) - BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_WEBSOCKETS - BROKER_LIBS:=$(BROKER_LIBS) -static -lwebsockets + BROKER_CPPFLAGS:=$(BROKER_CPPFLAGS) -DWITH_WEBSOCKETS + BROKER_LDADD:=$(BROKER_LDADD) -static -lwebsockets endif INSTALL?=install @@ -291,12 +296,12 @@ endif ifeq ($(WITH_EPOLL),yes) ifeq ($(UNAME),Linux) - BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_EPOLL + BROKER_CPPFLAGS:=$(BROKER_CPPFLAGS) -DWITH_EPOLL endif endif ifeq ($(WITH_BUNDLED_DEPS),yes) - BROKER_CFLAGS:=$(BROKER_CFLAGS) -Ideps + BROKER_CPPFLAGS:=$(BROKER_CPPFLAGS) -Ideps endif ifeq ($(WITH_COVERAGE),yes) diff --git a/lib/Makefile b/lib/Makefile index eaf1b4b060..e3800b2d48 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -90,131 +90,131 @@ clean : $(MAKE) -C cpp clean libmosquitto.so.${SOVERSION} : ${MOSQ_OBJS} - ${CROSS_COMPILE}$(CC) -shared $(LIB_LDFLAGS) $^ -o $@ ${LIB_LIBS} + ${CROSS_COMPILE}$(CC) -shared $(LIB_LDFLAGS) $^ -o $@ ${LIB_LIBADD} libmosquitto.a : ${MOSQ_OBJS} ${CROSS_COMPILE}$(AR) cr $@ $^ mosquitto.o : mosquitto.c mosquitto.h mosquitto_internal.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ actions.o : actions.c mosquitto.h mosquitto_internal.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ callbacks.o : callbacks.c mosquitto.h mosquitto_internal.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ connect.o : connect.c mosquitto.h mosquitto_internal.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ handle_auth.o : handle_auth.c read_handle.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ handle_connack.o : handle_connack.c read_handle.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ handle_disconnect.o : handle_disconnect.c read_handle.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ handle_publish.o : handle_publish.c read_handle.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ handle_ping.o : handle_ping.c read_handle.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ handle_pubackcomp.o : handle_pubackcomp.c read_handle.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ handle_pubrec.o : handle_pubrec.c read_handle.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ handle_pubrel.o : handle_pubrel.c read_handle.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ handle_suback.o : handle_suback.c read_handle.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ handle_unsuback.o : handle_unsuback.c read_handle.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ helpers.o : helpers.c - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ logging_mosq.o : logging_mosq.c logging_mosq.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ loop.o : loop.c mosquitto.h mosquitto_internal.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ messages_mosq.o : messages_mosq.c messages_mosq.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ memory_mosq.o : memory_mosq.c memory_mosq.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ net_mosq_ocsp.o : net_mosq_ocsp.c net_mosq.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ net_mosq.o : net_mosq.c net_mosq.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ options.o : options.c mosquitto.h mosquitto_internal.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ packet_datatypes.o : packet_datatypes.c packet_mosq.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ packet_mosq.o : packet_mosq.c packet_mosq.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ property_mosq.o : property_mosq.c property_mosq.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ read_handle.o : read_handle.c read_handle.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ send_connect.o : send_connect.c send_mosq.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ send_disconnect.o : send_disconnect.c send_mosq.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ send_mosq.o : send_mosq.c send_mosq.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ send_publish.o : send_publish.c send_mosq.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ send_subscribe.o : send_subscribe.c send_mosq.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ send_unsubscribe.o : send_unsubscribe.c send_mosq.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ socks_mosq.o : socks_mosq.c - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ srv_mosq.o : srv_mosq.c - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ thread_mosq.o : thread_mosq.c - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ time_mosq.o : time_mosq.c - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ tls_mosq.o : tls_mosq.c - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ utf8_mosq.o : utf8_mosq.c - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ util_mosq.o : util_mosq.c util_mosq.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ util_topic.o : util_topic.c util_mosq.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ will_mosq.o : will_mosq.c will_mosq.h - ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ diff --git a/lib/cpp/Makefile b/lib/cpp/Makefile index 87d6e05700..8606da70b5 100644 --- a/lib/cpp/Makefile +++ b/lib/cpp/Makefile @@ -38,11 +38,11 @@ clean : -rm -f *.o libmosquittopp.so.${SOVERSION} libmosquittopp.a libmosquittopp.so.${SOVERSION} : mosquittopp.o - ${CROSS_COMPILE}$(CXX) -shared $(LIB_LDFLAGS) $< -o $@ ../libmosquitto.so.${SOVERSION} + ${CROSS_COMPILE}$(CXX) -shared $(LIB_LDFLAGS) $< -o $@ ../libmosquitto.so.${SOVERSION} $(LIB_LIDADD) libmosquittopp.a : mosquittopp.o ${CROSS_COMPILE}$(AR) cr $@ $^ mosquittopp.o : mosquittopp.cpp mosquittopp.h - ${CROSS_COMPILE}$(CXX) $(LIB_CXXFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CXX) $(LIB_CPPFLAGS) $(LIB_CXXFLAGS) -c $< -o $@ diff --git a/src/Makefile b/src/Makefile index 138dd99809..2517cb6509 100644 --- a/src/Makefile +++ b/src/Makefile @@ -72,199 +72,199 @@ OBJS= mosquitto.o \ will_mosq.o mosquitto : ${OBJS} - ${CROSS_COMPILE}${CC} $^ -o $@ ${BROKER_LDFLAGS} $(BROKER_LIBS) + ${CROSS_COMPILE}${CC} ${BROKER_LDFLAGS} $^ -o $@ $(BROKER_LDADD) mosquitto.o : mosquitto.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ alias_mosq.o : ../lib/alias_mosq.c ../lib/alias_mosq.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ bridge.o : bridge.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ conf.o : conf.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ conf_includedir.o : conf_includedir.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ context.o : context.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ database.o : database.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ handle_auth.o : handle_auth.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ handle_connack.o : handle_connack.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ handle_connect.o : handle_connect.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ handle_disconnect.o : handle_disconnect.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ handle_ping.o : ../lib/handle_ping.c ../lib/read_handle.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ handle_pubackcomp.o : ../lib/handle_pubackcomp.c ../lib/read_handle.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ handle_publish.o : handle_publish.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ handle_pubrec.o : ../lib/handle_pubrec.c ../lib/read_handle.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ handle_pubrel.o : ../lib/handle_pubrel.c ../lib/read_handle.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ handle_suback.o : ../lib/handle_suback.c ../lib/read_handle.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ handle_subscribe.o : handle_subscribe.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ handle_unsuback.o : ../lib/handle_unsuback.c ../lib/read_handle.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ handle_unsubscribe.o : handle_unsubscribe.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ logging.o : logging.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ loop.o : loop.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ memory_mosq.o : ../lib/memory_mosq.c ../lib/memory_mosq.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ net.o : net.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ net_mosq_ocsp.o : ../lib/net_mosq_ocsp.c ../lib/net_mosq.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ net_mosq.o : ../lib/net_mosq.c ../lib/net_mosq.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ persist_read.o : persist_read.c persist.h mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ persist_read_v234.o : persist_read_v234.c persist.h mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ persist_read_v5.o : persist_read_v5.c persist.h mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ persist_write.o : persist_write.c persist.h mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ persist_write_v5.o : persist_write_v5.c persist.h mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ packet_datatypes.o : ../lib/packet_datatypes.c ../lib/packet_mosq.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ packet_mosq.o : ../lib/packet_mosq.c ../lib/packet_mosq.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ property_broker.o : property_broker.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ property_mosq.o : ../lib/property_mosq.c ../lib/property_mosq.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ plugin.o : plugin.c mosquitto_plugin.h mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ read_handle.o : read_handle.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ security.o : security.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ security_default.o : security_default.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ send_auth.o : send_auth.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ send_connect.o : ../lib/send_connect.c ../lib/send_mosq.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ send_disconnect.o : ../lib/send_disconnect.c ../lib/send_mosq.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ send_connack.o : send_connack.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ send_mosq.o : ../lib/send_mosq.c ../lib/send_mosq.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ send_publish.o : ../lib/send_publish.c ../lib/send_mosq.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ send_suback.o : send_suback.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ send_subscribe.o : ../lib/send_subscribe.c ../lib/send_mosq.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ send_unsuback.o : send_unsuback.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ send_unsubscribe.o : ../lib/send_unsubscribe.c ../lib/send_mosq.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ service.o : service.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ session_expiry.o : session_expiry.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ signals.o : signals.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ subs.o : subs.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ sys_tree.o : sys_tree.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ time_mosq.o : ../lib/time_mosq.c ../lib/time_mosq.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ tls_mosq.o : ../lib/tls_mosq.c - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ util_mosq.o : ../lib/util_mosq.c ../lib/util_mosq.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ util_topic.o : ../lib/util_topic.c ../lib/util_mosq.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ utf8_mosq.o : ../lib/utf8_mosq.c - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ websockets.o : websockets.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ will_delay.o : will_delay.c mosquitto_broker_internal.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ will_mosq.o : ../lib/will_mosq.c ../lib/will_mosq.h - ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@ mosquitto_passwd : mosquitto_passwd.o - ${CROSS_COMPILE}${CC} $^ -o $@ ${LDFLAGS} $(PASSWD_LIBS) + ${CROSS_COMPILE}${CC} ${LDFLAGS} $^ -o $@ $(PASSWD_LDADD) mosquitto_passwd.o : mosquitto_passwd.c - ${CROSS_COMPILE}${CC} -I.. $(CFLAGS) ${CPPFLAGS} -c $< -o $@ + ${CROSS_COMPILE}${CC} -I.. $(CPPFLAGS) $(CFLAGS) -c $< -o $@ plugin_defer.so : plugin_defer.c mosquitto_plugin.h mosquitto_broker.h mosquitto_broker_internal.h ${CROSS_COMPILE}${CC} -I. -I../lib -fPIC -shared $< -o $@ diff --git a/test/unit/Makefile b/test/unit/Makefile index c0758fa777..9d422428d0 100644 --- a/test/unit/Makefile +++ b/test/unit/Makefile @@ -2,8 +2,10 @@ include ../../config.mk .PHONY: all check test test-broker test-lib clean coverage -CFLAGS=-I../.. -I../../lib -I../../src -I../../src/deps -coverage -Wall -ggdb -TEST_LDFLAGS=-lcunit -coverage +CPPFLAGS:=$(CPPFLAGS) -I../.. -I../../lib -I../../src -I../../src/deps +CFLAGS:=$(CFLAGS) -coverage -Wall -ggdb +LDFLAGS:=$(LDFLAGS) -coverage +LDADD:=$(LDADD) -lcunit TEST_OBJS = test.o \ datatype_read.o \ @@ -59,53 +61,53 @@ all : test check : test mosq_test : ${TEST_OBJS} ${LIB_OBJS} - $(CROSS_COMPILE)$(CC) -o $@ $^ ${TEST_LDFLAGS} + $(CROSS_COMPILE)$(CC) $(LDFLAGS) -o $@ $^ $(LDADD) persist_read_test : ${PERSIST_READ_TEST_OBJS} ${PERSIST_READ_OBJS} - $(CROSS_COMPILE)$(CC) -o $@ $^ ${TEST_LDFLAGS} + $(CROSS_COMPILE)$(CC) $(LDFLAGS) -o $@ $^ $(LDADD) persist_write_test : ${PERSIST_WRITE_TEST_OBJS} ${PERSIST_WRITE_OBJS} - $(CROSS_COMPILE)$(CC) -o $@ $^ ${TEST_LDFLAGS} + $(CROSS_COMPILE)$(CC) $(LDFLAGS) -o $@ $^ $(LDADD) database.o : ../../src/database.c - $(CROSS_COMPILE)$(CC) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^ + $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^ memory_mosq.o : ../../lib/memory_mosq.c - $(CROSS_COMPILE)$(CC) $(CFLAGS) -c -o $@ $^ + $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^ packet_datatypes.o : ../../lib/packet_datatypes.c - $(CROSS_COMPILE)$(CC) $(CFLAGS) -c -o $@ $^ + $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^ persist_read.o : ../../src/persist_read.c - $(CROSS_COMPILE)$(CC) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^ + $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^ persist_read_v234.o : ../../src/persist_read_v234.c - $(CROSS_COMPILE)$(CC) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^ + $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^ persist_read_v5.o : ../../src/persist_read_v5.c - $(CROSS_COMPILE)$(CC) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^ + $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^ persist_write.o : ../../src/persist_write.c - $(CROSS_COMPILE)$(CC) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^ + $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^ persist_write_v5.o : ../../src/persist_write_v5.c - $(CROSS_COMPILE)$(CC) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^ + $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^ property_mosq.o : ../../lib/property_mosq.c - $(CROSS_COMPILE)$(CC) $(CFLAGS) -c -o $@ $^ + $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^ subs.o : ../../src/subs.c - $(CROSS_COMPILE)$(CC) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^ + $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^ util_mosq.o : ../../lib/util_mosq.c - $(CROSS_COMPILE)$(CC) $(CFLAGS) -c -o $@ $^ + $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^ util_topic.o : ../../lib/util_topic.c - $(CROSS_COMPILE)$(CC) $(CFLAGS) -c -o $@ $^ + $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^ utf8_mosq.o : ../../lib/utf8_mosq.c - $(CROSS_COMPILE)$(CC) $(CFLAGS) -c -o $@ $^ + $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^ test-lib : mosq_test ./mosq_test