From 74d93589a9de6c6c5158f122a2f73f6877a6317f Mon Sep 17 00:00:00 2001
From: Guo Wenxue <guowenxue@gmail.com>
Date: Wed, 26 Jun 2019 00:50:03 +0800
Subject: [PATCH] update mqttd program, fix rpi build bug for strcasestr()

---
 mqttd/makefile |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/mqttd/makefile b/mqttd/makefile
index 9dbd850..e29019b 100644
--- a/mqttd/makefile
+++ b/mqttd/makefile
@@ -34,11 +34,14 @@
 export AS=${CROSS_COMPILE}as
 export RANLIB=${CROSS_COMPILE}ranlib
 export STRIP=${CROSS_COMPILE}strip
-export CFLAGS
+export CFLAGS+=-D_GNU_SOURCE
 export LDFLAGS
 
-CFLAGS+=-Ihal -IcJSON
-LDFLAGS+=-L hal -lhal -LcJSON -lcJSON
+
+CFLAGS+=-Ihal -Ietc -Ilylib 
+LDFLAGS+=-L hal -lhal -Letc -letc -Llylib -llylib
+
+LDFLAGS+=-lmosquitto -lpthread -lm
 
 SRCFILES = $(wildcard *.c)
 IMAGE_NAME=$(shell basename ${PWD})
@@ -52,7 +55,8 @@
 
 modules:
 	make -C hal
-	make -C cJSON
+	make -C lylib
+	make -C etc
 	cd ${MQTT_LIBPATH} && bash build.sh
 
 binary:  ${SRCFILES}
@@ -68,7 +72,8 @@
 
 clean: 
 	@make clean -C hal
-	@make clean -C cJSON
+	@make clean -C etc
+	@make clean -C lylib
 	@rm -f version.h 
 	@rm -f *.o $(IMAGE_NAME) 
 	@rm -rf *.gdb *.a *.so *.elf*

--
Gitblit v1.9.1