From d06c770485f5669e0c21ea19f75980fe062cfdd0 Mon Sep 17 00:00:00 2001 From: Meiye Date: Thu, 7 Mar 2024 17:01:09 +0800 Subject: [PATCH 1/2] fix some missing dependencies in Makefile --- Makefile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 80efa60..68b6a9b 100644 --- a/Makefile +++ b/Makefile @@ -40,34 +40,34 @@ COLIB_OBJS=co_epoll.o co_routine.o co_hook_sys_call.o coctx_swap.o coctx.o co_co PROGS = colib example_poll example_echosvr example_echocli example_thread example_cond example_specific example_copystack example_closure example_setenv -all:$(PROGS) +all: $(PROGS) -colib:libcolib.a libcolib.so +colib: libcolib.a libcolib.so libcolib.a: $(COLIB_OBJS) $(ARSTATICLIB) libcolib.so: $(COLIB_OBJS) $(BUILDSHARELIB) -example_echosvr:example_echosvr.o +example_echosvr: example_echosvr.o lib/libcolib.a $(BUILDEXE) -example_echocli:example_echocli.o +example_echocli: example_echocli.o lib/libcolib.a $(BUILDEXE) -example_thread:example_thread.o +example_thread: example_thread.o lib/libcolib.a $(BUILDEXE) -example_poll:example_poll.o +example_poll: example_poll.o lib/libcolib.a $(BUILDEXE) -example_exit:example_exit.o +example_exit: example_exit.o $(BUILDEXE) -example_cond:example_cond.o +example_cond: example_cond.o lib/libcolib.a $(BUILDEXE) -example_specific:example_specific.o +example_specific: example_specific.o lib/libcolib.a $(BUILDEXE) -example_copystack:example_copystack.o +example_copystack: example_copystack.o lib/libcolib.a $(BUILDEXE) -example_setenv:example_setenv.o +example_setenv: example_setenv.o lib/libcolib.a $(BUILDEXE) -example_closure:example_closure.o +example_closure: example_closure.o lib/libcolib.a $(BUILDEXE) dist: clean libco-$(version).src.tar.gz @@ -78,7 +78,7 @@ libco-$(version).src.tar.gz: (cd ..; tar cvf - `cat libco_pub/MANIFEST` | gzip > libco_pub/libco-$(version).src.tar.gz) @(cd ..; rm libco-$(version)) -clean: +clean: $(CLEAN) *.o $(PROGS) rm -fr MANIFEST lib solib libco-$(version).src.tar.gz libco-$(version) From 0c17dae138c87d7f1e622144d25438dfd412ec1d Mon Sep 17 00:00:00 2001 From: Meiye_lj Date: Mon, 14 Apr 2025 10:16:13 +0800 Subject: [PATCH 2/2] fix missing dependecies in Makefile --- Makefile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 68b6a9b..5487468 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,6 @@ # limitations under the License. # - COMM_MAKE = 1 COMM_ECHO = 1 version=0.5 @@ -25,7 +24,7 @@ include co.mk ########## options ########## CFLAGS += -g -fno-strict-aliasing -O2 -Wall -export-dynamic \ - -Wall -pipe -D_GNU_SOURCE -D_REENTRANT -fPIC -Wno-deprecated -m64 + -Wall -pipe -D_GNU_SOURCE -D_REENTRANT -fPIC -Wno-deprecated -m64 -MMD UNAME := $(shell uname -s) @@ -49,30 +48,30 @@ libcolib.a: $(COLIB_OBJS) libcolib.so: $(COLIB_OBJS) $(BUILDSHARELIB) -example_echosvr: example_echosvr.o lib/libcolib.a +example_echosvr: example_echosvr.o libco/lib/libcolib.a $(BUILDEXE) -example_echocli: example_echocli.o lib/libcolib.a +example_echocli: example_echocli.o libco/lib/libcolib.a $(BUILDEXE) -example_thread: example_thread.o lib/libcolib.a +example_thread: example_thread.o libco/lib/libcolib.a $(BUILDEXE) -example_poll: example_poll.o lib/libcolib.a +example_poll: example_poll.o libco/lib/libcolib.a $(BUILDEXE) example_exit: example_exit.o $(BUILDEXE) -example_cond: example_cond.o lib/libcolib.a +example_cond: example_cond.o libco/lib/libcolib.a $(BUILDEXE) -example_specific: example_specific.o lib/libcolib.a +example_specific: example_specific.o libco/lib/libcolib.a $(BUILDEXE) -example_copystack: example_copystack.o lib/libcolib.a +example_copystack: example_copystack.o libco/lib/libcolib.a $(BUILDEXE) -example_setenv: example_setenv.o lib/libcolib.a +example_setenv: example_setenv.o libco/lib/libcolib.a $(BUILDEXE) -example_closure: example_closure.o lib/libcolib.a +example_closure: example_closure.o libco/lib/libcolib.a $(BUILDEXE) dist: clean libco-$(version).src.tar.gz -libco-$(version).src.tar.gz: +libco-$(version).src.tar.gz: @find . -type f | grep -v CVS | grep -v .svn | sed s:^./:libco-$(version)/: > MANIFEST @(cd ..; ln -s libco_pub libco-$(version)) (cd ..; tar cvf - `cat libco_pub/MANIFEST` | gzip > libco_pub/libco-$(version).src.tar.gz) @@ -82,3 +81,4 @@ clean: $(CLEAN) *.o $(PROGS) rm -fr MANIFEST lib solib libco-$(version).src.tar.gz libco-$(version) +-include $(wildcard *.d)