From 3cec54bf5ff7a07c62cfd2a04b205fce8301c157 Mon Sep 17 00:00:00 2001
From: lr <1234@qq.com>
Date: Thu, 16 May 2024 15:48:48 +0800
Subject: [PATCH] modify makefile

---
 Ubiquitous/XiZi_AIoT/services/net/net_server/Makefile          | 2 +-
 Ubiquitous/XiZi_AIoT/services/net/net_server/api/Makefile      | 3 +--
 Ubiquitous/XiZi_AIoT/services/net/net_server/core/Makefile     | 3 ++-
 .../XiZi_AIoT/services/net/net_server/core/ipv4/Makefile       | 3 +--
 Ubiquitous/XiZi_AIoT/services/net/net_server/include/arch/cc.h | 2 +-
 Ubiquitous/XiZi_AIoT/services/net/net_server/netif/Makefile    | 2 +-
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Ubiquitous/XiZi_AIoT/services/net/net_server/Makefile b/Ubiquitous/XiZi_AIoT/services/net/net_server/Makefile
index f2d5f1e39..090d09f42 100644
--- a/Ubiquitous/XiZi_AIoT/services/net/net_server/Makefile
+++ b/Ubiquitous/XiZi_AIoT/services/net/net_server/Makefile
@@ -1,6 +1,6 @@
 include $(KERNEL_ROOT)/services/net/net_server/lwip.mk
 
-net_server: lwip_server.o
+net_server: lwip_server.o COMPILER
 	@echo "generate $^"
 
 %.o: %.c
diff --git a/Ubiquitous/XiZi_AIoT/services/net/net_server/api/Makefile b/Ubiquitous/XiZi_AIoT/services/net/net_server/api/Makefile
index 3b9672c08..799d5f4d9 100644
--- a/Ubiquitous/XiZi_AIoT/services/net/net_server/api/Makefile
+++ b/Ubiquitous/XiZi_AIoT/services/net/net_server/api/Makefile
@@ -13,10 +13,9 @@ objs += api_lib.o \
 
 api: ${objs}
 	@echo "generate $^"
+	@mv $^ $(KERNEL_ROOT)/services/net/net_server
 
 %.o: %.c
 	@echo "cc $^"
 	@${cc} ${cflags} ${c_useropts} ${INC_DIR} -o $@ -c $^
 
-
-include $(KERNEL_ROOT)/compiler.mk
diff --git a/Ubiquitous/XiZi_AIoT/services/net/net_server/core/Makefile b/Ubiquitous/XiZi_AIoT/services/net/net_server/core/Makefile
index b70956811..c1e3301aa 100644
--- a/Ubiquitous/XiZi_AIoT/services/net/net_server/core/Makefile
+++ b/Ubiquitous/XiZi_AIoT/services/net/net_server/core/Makefile
@@ -20,8 +20,9 @@ objs += altcp_alloc.o \
 		timeouts.o \
 		udp.o
 
-core: ${objs}
+core: ${objs} COMPILER
 	@echo "generate $^"
+	@mv $^ $(KERNEL_ROOT)/services/net/net_server
 	
 %.o: %.c
 	@echo "cc $^"
diff --git a/Ubiquitous/XiZi_AIoT/services/net/net_server/core/ipv4/Makefile b/Ubiquitous/XiZi_AIoT/services/net/net_server/core/ipv4/Makefile
index db96f1d30..d35005ef2 100644
--- a/Ubiquitous/XiZi_AIoT/services/net/net_server/core/ipv4/Makefile
+++ b/Ubiquitous/XiZi_AIoT/services/net/net_server/core/ipv4/Makefile
@@ -11,9 +11,8 @@ objs += autoip.o \
 
 ip4: ${objs}
 	@echo "generate $^"
+	@mv $^ $(KERNEL_ROOT)/services/net/net_server
 
 %.o: %.c
 	@echo "cc $^"
 	@${cc} ${cflags} ${c_useropts} ${INC_DIR} -o $@ -c $^
-
-include $(KERNEL_ROOT)/compiler.mk
diff --git a/Ubiquitous/XiZi_AIoT/services/net/net_server/include/arch/cc.h b/Ubiquitous/XiZi_AIoT/services/net/net_server/include/arch/cc.h
index d724aaeff..6ce1f5d49 100644
--- a/Ubiquitous/XiZi_AIoT/services/net/net_server/include/arch/cc.h
+++ b/Ubiquitous/XiZi_AIoT/services/net/net_server/include/arch/cc.h
@@ -33,7 +33,7 @@
 #define LWIP_ARCH_CC_H
 
 // #include "stdio.h"
-
+#include "libserial.h"
 
 //typedef unsigned   char    u8_t;
 //typedef signed     char    s8_t;
diff --git a/Ubiquitous/XiZi_AIoT/services/net/net_server/netif/Makefile b/Ubiquitous/XiZi_AIoT/services/net/net_server/netif/Makefile
index 465179cb4..80eb7c8eb 100644
--- a/Ubiquitous/XiZi_AIoT/services/net/net_server/netif/Makefile
+++ b/Ubiquitous/XiZi_AIoT/services/net/net_server/netif/Makefile
@@ -6,9 +6,9 @@ objs += bridgeif.o \
 
 netif:${objs}
 	@echo "generate $^"
+	@mv $^ $(KERNEL_ROOT)/services/net/net_server
 
 %.o: %.c
 	@echo "cc $^"
 	@${cc} ${cflags} ${c_useropts} ${INC_DIR} -o $@ -c $^
 	
-include $(KERNEL_ROOT)/compiler.mk