ypc
/
RTU_ALL_AI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(build): 修复 makefile define 中 @for 语法 + 注册 libcomm 

- release/makefile, release/src/makefile, release/src/public/makefile:
  将 define 内的 @for 移除 @ 前缀，避免 /bin/sh 语法错误
- release/src/public/makefile: SUBDIRS 添加 ./libcomm
- release/copy_headers.sh: 添加 myComm.h 复制
This commit is contained in:
ypc 2026-07-08 13:36:48 +08:00
parent 9d4c2902c3
commit 36cef7e23f
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
release/copy_headers.sh
View File

@ -47,5 +47,6 @@ copy_module "libxml" "myXml.h"
copy_module "libxml" "tinyxml2.h"
copy_module "libcmd" "myCmd.h"
copy_module "libdatacenter" "myDatacenter.h"
copy_module "libcomm" "myComm.h"
echo "=== done ==="

4
release/makefile
View File

@ -1,8 +1,8 @@
SUBDIRS := ./src
define make_subdir
@for d in $(SUBDIRS); do [ -f "$$d/makefile" ] && (cd "$$d" && make -f makefile $1) || true; done
for d in $(SUBDIRS); do [ -f "$$d/makefile" ] && (cd "$$d" && make -f makefile $1) || true; done
endef
.PHONY: all clean rebuild
all:; $(call make_subdir,all)
all:; @$(call make_subdir,all)
clean:; @echo "clean..."; $(call make_subdir,clean)
rebuild: clean all

6
release/src/makefile
View File

@ -1,8 +1,8 @@
SUBDIRS := ./public
define make_subdir
@for d in $(SUBDIRS); do [ -f "$$d/makefile" ] && (cd "$$d" && make -f makefile $1) || true; done
for d in $(SUBDIRS); do [ -f "$$d/makefile" ] && (cd "$$d" && make -f makefile $1) || true; done
endef
.PHONY: all clean rebuild
all:; $(call make_subdir,all)
clean:; $(call make_subdir,clean)
all:; @$(call make_subdir,all)
clean:; @$(call make_subdir,clean)
rebuild: clean all

8
release/src/public/makefile
View File

@ -1,10 +1,10 @@
SUBDIRS := ./liblist ./libfunc ./liblog ./libmd5 ./libcJSON ./libmy_xxhash ./libtask ./libxml ./libcmd ./libdatacenter
SUBDIRS := ./liblist ./libfunc ./liblog ./libmd5 ./libcJSON ./libmy_xxhash ./libtask ./libxml ./libcmd ./libdatacenter ./libcomm
define make_subdir
@for d in $(SUBDIRS); do [ -f "$$d/makefile" ] && (cd "$$d" && make -f makefile $1) || true; done
for d in $(SUBDIRS); do [ -f "$$d/makefile" ] && (cd "$$d" && make -f makefile $1) || true; done
endef
ROOT_DIR := $(realpath $(CURDIR)/../../..)
.PHONY: all clean rebuild headers
headers:; @cd $(ROOT_DIR) && ./release/copy_headers.sh
all: headers; $(call make_subdir,all)
clean:; $(call make_subdir,clean)
all: headers; @$(call make_subdir,all)
clean:; @$(call make_subdir,clean)
rebuild: clean all