d0kuhn/mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix mosquitto_ctrl Makefile build yes/no based on deps.

Browse Source
This commit is contained in:
Roger A. Light 2020-12-02 10:31:25 +00:00
parent df1802d8f1
commit d291effdcf
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/mosquitto_ctrl/Makefile
View File

@ -9,6 +9,7 @@ LIBMOSQ:=../../lib/libmosquitto.a
endif endif
LOCAL_CPPFLAGS:=-I/usr/include/cjson -I/usr/local/include/cjson -I../mosquitto_passwd LOCAL_CPPFLAGS:=-I/usr/include/cjson -I/usr/local/include/cjson -I../mosquitto_passwd
LOCAL_LDFLAGS:=-L/usr/local/lib
OBJS= mosquitto_ctrl.o \ OBJS= mosquitto_ctrl.o \
client.o \ client.o \
@ -25,23 +26,21 @@ OBJS= mosquitto_ctrl.o \
EXAMPLE_OBJS= example.o EXAMPLE_OBJS= example.o
ifeq ($(WITH_TLS),yes) ifeq ($(WITH_TLS),yes)
ifeq ($(WITH_CJSON),yes)
ifeq ($(WITH_SHARED_LIBRARIES),yes) ifeq ($(WITH_CJSON),yes)
TARGET:=mosquitto_ctrl mosquitto_ctrl_example.so TARGET:=mosquitto_ctrl mosquitto_ctrl_example.so
else else
ifeq ($(WITH_STATIC_LIBRARIES),yes) TARGET:=
TARGET:=mosquitto_ctrl mosquitto_ctrl_example.so
endif
endif endif
endif else
TARGET:=
endif endif
all : $(TARGET) all : $(TARGET)
mosquitto_ctrl : ${OBJS} mosquitto_ctrl : ${OBJS}
${CROSS_COMPILE}${CC} ${APP_LDFLAGS} $^ -o $@ $(PASSWD_LDADD) $(LIBMOSQ) -lcjson -ldl ${CROSS_COMPILE}${CC} ${APP_LDFLAGS} $^ -o $@ $(PASSWD_LDADD) $(LOCAL_LDFLAGS) $(LIBMOSQ) -lcjson -ldl
mosquitto_ctrl_example.so : ${EXAMPLE_OBJS} mosquitto_ctrl_example.so : ${EXAMPLE_OBJS}
$(CROSS_COMPILE)$(CC) $(PLUGIN_CPPFLAGS) $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) -shared $< -o $@ $(CROSS_COMPILE)$(CC) $(PLUGIN_CPPFLAGS) $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) -shared $< -o $@