From 1382fded00fa0f77d1eb04a3e0279ee3a0500681 Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Thu, 3 Nov 2022 22:39:39 +0000 Subject: [PATCH] Compile picohttpparser only once --- lib/Makefile | 4 ++-- src/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index 6affa58b..6811dc9e 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -55,7 +55,7 @@ MOSQ_OBJS=mosquitto.o \ will_mosq.o ifeq ($(WITH_WEBSOCKETS),yes) - MOSQ_OBJS+=picohttpparser.o + MOSQ_OBJS+=${R}/deps/picohttpparser/picohttpparser.o endif ALL_DEPS:= @@ -194,7 +194,7 @@ net_mosq.o : net_mosq.c net_mosq.h password_mosq.o : ${R}/common/password_mosq.c net_mosq.h ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) -c $< -o $@ -picohttpparser.o : ${R}/deps/picohttpparser/picohttpparser.c ${R}/deps/picohttpparser/picohttpparser.h +${R}/deps/picohttpparser/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 diff --git a/src/Makefile b/src/Makefile index 3a0ee070..a5833bed 100644 --- a/src/Makefile +++ b/src/Makefile @@ -106,7 +106,7 @@ OBJS= mosquitto.o \ xtreport.o ifeq ($(WITH_WEBSOCKETS),yes) - OBJS+=picohttpparser.o + OBJS+=${R}/deps/picohttpparser/picohttpparser.o endif mosquitto : ${OBJS} @@ -259,7 +259,7 @@ packet_datatypes.o : ${R}/lib/packet_datatypes.c ${R}/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 : ${R}/deps/picohttpparser/picohttpparser.c ${R}/deps/picohttpparser/picohttpparser.h +${R}/deps/picohttpparser/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