From 809c78de808ed5563e9af4a56227965974ec25fa Mon Sep 17 00:00:00 2001
From: Guo Wenxue <guowenxue@gmail.com>
Date: Mon, 24 Jun 2019 22:39:42 +0800
Subject: [PATCH] add cJSON, update mosquitto to 1.6.3 and update the makefile
---
mqttd/makefile | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/mqttd/makefile b/mqttd/makefile
index 0cf60b5..9dbd850 100644
--- a/mqttd/makefile
+++ b/mqttd/makefile
@@ -37,22 +37,27 @@
export CFLAGS
export LDFLAGS
+CFLAGS+=-Ihal -IcJSON
+LDFLAGS+=-L hal -lhal -LcJSON -lcJSON
+
SRCFILES = $(wildcard *.c)
IMAGE_NAME=$(shell basename ${PWD})
-all: entry MQTT binary
+all: entry modules binary
entry:
@echo " ";
@echo " =========================================================";
@echo " ** Compile \"${BINARIES}\" for ${ARCH} ";
@echo " =========================================================";
-binary: ${SRCFILES}
- $(CC) $(CFLAGS) -o ${IMAGE_NAME} $^ ${LDFLAGS}
- @echo " Compile over"
-
-MQTT:
+modules:
+ make -C hal
+ make -C cJSON
cd ${MQTT_LIBPATH} && bash build.sh
+
+binary: ${SRCFILES}
+ $(CC) $(CFLAGS) -o ${IMAGE_NAME} $^ ${LDFLAGS}
+ @echo " Compile over"
tag:
@ctags --c-kinds=+defglmnstuvx --langmap=c:.c.h.ho.hem.het.hec.hev.him.hit.hic.hiv -R .
@@ -62,6 +67,8 @@
@cp $(IMAGE_NAME) ${INSTPATH}
clean:
+ @make clean -C hal
+ @make clean -C cJSON
@rm -f version.h
@rm -f *.o $(IMAGE_NAME)
@rm -rf *.gdb *.a *.so *.elf*
--
Gitblit v1.9.1