From fbbb2d0b2aba4ddc42651096b20dd4a7ca4a33f2 Mon Sep 17 00:00:00 2001
From: Guo Wenxue <guowenxue@gmail.com>
Date: Wed, 21 Sep 2022 23:04:57 +0800
Subject: [PATCH] Merge branch 'master' of ssh://master.iot-yun.club:2280/raspberrypi
---
mqttd/makefile | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/mqttd/makefile b/mqttd/makefile
index 31257c4..9bdc1c6 100644
--- a/mqttd/makefile
+++ b/mqttd/makefile
@@ -34,31 +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
-LDFLAGS+=-L hal -lhal
+
+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 Modules binary
+all: entry modules binary
entry:
@echo " ";
@echo " =========================================================";
@echo " ** Compile \"${BINARIES}\" for ${ARCH} ";
@echo " =========================================================";
-Modules:
+modules:
make -C hal
+ make -C lylib
+ make -C etc
+ cd ${MQTT_LIBPATH} && bash build.sh
binary: ${SRCFILES}
- $(CC) $(CFLAGS) -o ${IMAGE_NAME} $^ ${LDFLAGS}
+ $(CC) $(CFLAGS) -o ${IMAGE_NAME} $^ ${LDFLAGS} ${LIBS}
@echo " Compile over"
-
-MQTT:
- cd ${MQTT_LIBPATH} && bash build.sh
tag:
@ctags --c-kinds=+defglmnstuvx --langmap=c:.c.h.ho.hem.het.hec.hev.him.hit.hic.hiv -R .
@@ -69,6 +72,8 @@
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