Build fixes

This commit is contained in:
Roger A. Light 2020-12-02 10:36:00 +00:00
parent d291effdcf
commit 42f09b8add
2 changed files with 3 additions and 1 deletions

View File

@ -367,6 +367,7 @@ ifeq ($(WITH_CJSON),yes)
CLIENT_CFLAGS:=$(CLIENT_CFLAGS) -DWITH_CJSON -I/usr/include/cjson -I/usr/local/include/cjson CLIENT_CFLAGS:=$(CLIENT_CFLAGS) -DWITH_CJSON -I/usr/include/cjson -I/usr/local/include/cjson
CLIENT_LDADD:=$(CLIENT_LDADD) -lcjson CLIENT_LDADD:=$(CLIENT_LDADD) -lcjson
CLIENT_STATIC_LDADD:=$(CLIENT_STATIC_LDADD) -lcjson CLIENT_STATIC_LDADD:=$(CLIENT_STATIC_LDADD) -lcjson
CLIENT_LDFLAGS:=$(CLIENT_LDFLAGS) -L/usr/local/lib
endif endif
ifeq ($(WITH_XTREPORT),yes) ifeq ($(WITH_XTREPORT),yes)

View File

@ -4,6 +4,7 @@ include ../../config.mk
PLUGIN_NAME=mosquitto_dynamic_security PLUGIN_NAME=mosquitto_dynamic_security
LOCAL_CPPFLAGS=-I/usr/include/cjson -I/usr/local/include/cjson -I../../src/ LOCAL_CPPFLAGS=-I/usr/include/cjson -I/usr/local/include/cjson -I../../src/
LOCAL_LDFLAGS=-L/usr/local/lib
OBJS= \ OBJS= \
acl.o \ acl.o \
@ -32,7 +33,7 @@ all : ${ALL_DEPS}
binary : ${PLUGIN_NAME}.so binary : ${PLUGIN_NAME}.so
${PLUGIN_NAME}.so : ${OBJS} ${PLUGIN_NAME}.so : ${OBJS}
${CROSS_COMPILE}${CC} $(PLUGIN_LDFLAGS) -fPIC -shared $^ -o $@ -lcjson ${CROSS_COMPILE}${CC} $(PLUGIN_LDFLAGS) $(LOCAL_LDFLAGS) -fPIC -shared $^ -o $@ -lcjson
acl.o : acl.c dynamic_security.h acl.o : acl.c dynamic_security.h
${CROSS_COMPILE}${CC} $(LOCAL_CPPFLAGS) $(PLUGIN_CPPFLAGS) $(PLUGIN_CFLAGS) -c $< -o $@ ${CROSS_COMPILE}${CC} $(LOCAL_CPPFLAGS) $(PLUGIN_CPPFLAGS) $(PLUGIN_CFLAGS) -c $< -o $@