From 985548471892c5f2a7430c5f7b4c03fe39f0134f Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Tue, 25 Jun 2019 21:55:18 +0800
Subject: [PATCH] Update mqttd program, add cJSON parser and test ok with memory leak

---
 mqttd/makefile |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/mqttd/makefile b/mqttd/makefile
index 684dac6..050907b 100644
--- a/mqttd/makefile
+++ b/mqttd/makefile
@@ -18,6 +18,8 @@
 CFLAGS+=-I${PWD}
 #CFLAGS+=-Wall -Werror
 
+MQTT_LIBPATH=mosquitto
+
 LDFLAGS+=-lwiringPi
 LDFLAGS+=-lpthread
 
@@ -35,18 +37,29 @@
 export CFLAGS
 export LDFLAGS
 
+
+CFLAGS+=-Ihal -Ilylib
+LDFLAGS+=-L hal -lhal -Llylib -llylib
+
+LDFLAGS+=-lmosquitto -lpthread -lm
+
 SRCFILES = $(wildcard *.c)
 IMAGE_NAME=$(shell basename ${PWD})
 
-all: entry binary
+all: entry modules binary
 entry: 
 	@echo " ";
 	@echo " =========================================================";
 	@echo " **        Compile \"${BINARIES}\" for ${ARCH}         ";
 	@echo " =========================================================";
 
+modules:
+	make -C hal
+	make -C lylib
+	cd ${MQTT_LIBPATH} && bash build.sh
+
 binary:  ${SRCFILES}
-	$(CC) $(CFLAGS) -o ${IMAGE_NAME} $^  ${LDFLAGS}
+	$(CC) $(CFLAGS) -o ${IMAGE_NAME} $^ ${LDFLAGS}
 	@echo " Compile over"
 
 tag: 
@@ -57,6 +70,8 @@
 	@cp $(IMAGE_NAME) ${INSTPATH}
 
 clean: 
+	@make clean -C hal
+	@make clean -C lylib
 	@rm -f version.h 
 	@rm -f *.o $(IMAGE_NAME) 
 	@rm -rf *.gdb *.a *.so *.elf*

--
Gitblit v1.9.1