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 | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/mqttd/makefile b/mqttd/makefile
index 684dac6..e29019b 100644
--- a/mqttd/makefile
+++ b/mqttd/makefile
@@ -18,6 +18,8 @@
CFLAGS+=-I${PWD}
#CFLAGS+=-Wall -Werror
+MQTT_LIBPATH=mosquitto
+
LDFLAGS+=-lwiringPi
LDFLAGS+=-lpthread
@@ -32,21 +34,33 @@
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
+LDFLAGS+=-L hal -lhal -Letc -letc -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
+ make -C etc
+ 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 +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