From b7d4cc615c3281263f4f4735a0f7fd21589250bd Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Mon, 24 Jun 2019 20:54:00 +0800
Subject: [PATCH] update mqttd makefile

---
 mqttd/hal/makefile |    4 +++-
 mqttd/makefile     |   11 +++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/mqttd/hal/makefile b/mqttd/hal/makefile
index a08725c..c1200cf 100644
--- a/mqttd/hal/makefile
+++ b/mqttd/hal/makefile
@@ -1,11 +1,13 @@
 
+PWD=$(shell pwd )
 LIBNAME=$(shell basename ${PWD} )
 
 all: clean
+	@rm -f *.o
 	${CROSS_COMPILE}gcc -c *.c 
 	${CROSS_COMPILE}ar -rcs  lib${LIBNAME}.a *.o
 
 clean:
-	@rm -f *.o 
+	@rm -f *.o
 	@rm -f *.a
 
diff --git a/mqttd/makefile b/mqttd/makefile
index 0cf60b5..31257c4 100644
--- a/mqttd/makefile
+++ b/mqttd/makefile
@@ -37,18 +37,24 @@
 export CFLAGS
 export LDFLAGS
 
+CFLAGS+=-Ihal
+LDFLAGS+=-L hal -lhal
+
 SRCFILES = $(wildcard *.c)
 IMAGE_NAME=$(shell basename ${PWD})
 
-all: entry MQTT binary
+all: entry MQTT Modules binary
 entry: 
 	@echo " ";
 	@echo " =========================================================";
 	@echo " **        Compile \"${BINARIES}\" for ${ARCH}         ";
 	@echo " =========================================================";
 
+Modules:
+	make -C hal
+
 binary:  ${SRCFILES}
-	$(CC) $(CFLAGS) -o ${IMAGE_NAME} $^  ${LDFLAGS}
+	$(CC) $(CFLAGS) -o ${IMAGE_NAME} $^ ${LDFLAGS}
 	@echo " Compile over"
 
 MQTT:
@@ -62,6 +68,7 @@
 	@cp $(IMAGE_NAME) ${INSTPATH}
 
 clean: 
+	@make clean -C hal
 	@rm -f version.h 
 	@rm -f *.o $(IMAGE_NAME) 
 	@rm -rf *.gdb *.a *.so *.elf*

--
Gitblit v1.9.1