From c7685f9912e89509acff5d2db54f9b3e955df2ee Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Sun, 10 Apr 2022 17:38:45 +0800
Subject: [PATCH] Update mosquitto build shell script to fix install bug

---
 mqttd/makefile |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/mqttd/makefile b/mqttd/makefile
index 0cf60b5..9bdc1c6 100644
--- a/mqttd/makefile
+++ b/mqttd/makefile
@@ -34,25 +34,34 @@
 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 -Ietc -Ilylib 
+LIBS+=-L hal -lhal -Letc -letc -Llylib -llylib
+
+LIBS+=-lmosquitto -lpthread -lm
 
 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 lylib
+	make -C etc
 	cd ${MQTT_LIBPATH} && bash build.sh
+
+binary:  ${SRCFILES}
+	$(CC) $(CFLAGS) -o ${IMAGE_NAME} $^ ${LDFLAGS} ${LIBS}
+	@echo " Compile over"
 
 tag: 
 	@ctags --c-kinds=+defglmnstuvx --langmap=c:.c.h.ho.hem.het.hec.hev.him.hit.hic.hiv -R .  
@@ -62,6 +71,9 @@
 	@cp $(IMAGE_NAME) ${INSTPATH}
 
 clean: 
+	@make clean -C hal
+	@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