diff --git a/tensor_t/test/Makefile b/tensor_t/test/Makefile index 3ac02e7..0d8fa20 100644 --- a/tensor_t/test/Makefile +++ b/tensor_t/test/Makefile @@ -34,7 +34,6 @@ PERMSRC_O=$(YPERMDIR)/src/permutation_t/permutation_t.o DIMSRC_O=$(DIMDIR)/src/dimension_t/dimension_t.o -TOPTARGETS := all clean DEPS=$(DIMDIR) $(YPERMDIR) $(YTESTDIR) $(TENSDIR) @@ -42,6 +41,7 @@ OBJ=$(DIMSRC_O) $(PERMSRC_O) $(TENSRC_O) LIB_YTEST=$(YTESTDIR)/libytest.so +TOPTARGETS := all clean $(TOPTARGETS): $(DEPS) @@ -61,7 +61,9 @@ all: $(EXEC) $(LIB_YTEST) $(EXEC): $(EXECSRC) $(OBJ) $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) -.PHONY: clean mrproper +.PHONY: all clean mrproper + +$(LIB_YTEST): $(YTESTDIR) clean: rm -f $(OBJ) diff --git a/y_socket_t/Makefile b/y_socket_t/Makefile index f43f577..bd246b8 100644 --- a/y_socket_t/Makefile +++ b/y_socket_t/Makefile @@ -27,16 +27,17 @@ WORKSRC_0=$(YWORKDIR)/src/y_worker_t/y_worker_t.o YTASKSRC_0=$(YWORKDIR)/src/y_worker_t/y_task_t.o +all: $(PROJECT_LIB) + TOPTARGETS := all clean -DEPS=$(YLISTDIR) $(YWORKDIR) +DEPS:=$(YLISTDIR) $(YWORKDIR) OBJ=$(YSOCKSRC_O) $(YNODESRC_O) $(YLISTSRC_O) $(WORKSRC_0) $(YTASKSRC_0) $(TOPTARGETS): $(DEPS) -all: $(PROJECT_LIB) @@ -61,7 +62,7 @@ $(DEPS): # .PHONY: $(TOPTARGETS) $(SUBDIRS) -.PHONY: clean +.PHONY: all clean clean: rm -f $(OBJ) diff --git a/y_socket_t/test/Makefile b/y_socket_t/test/Makefile index f30bd78..7828d8c 100644 --- a/y_socket_t/test/Makefile +++ b/y_socket_t/test/Makefile @@ -37,30 +37,34 @@ YLISTSRC_O=$(YLISTSRC:.c=.o) YWORKSRC_0=$(YWORKDIR)/src/y_worker_t/y_worker_t.o YTASKSRC_0=$(YWORKDIR)/src/y_worker_t/y_task_t.o + TOPTARGETS := all clean -DEPS=$(YTESTDIR) $(YLISTDIR) $(YWORKDIR) $(ROOT_DIR) +DEPS := $(YTESTDIR) $(YLISTDIR) $(YWORKDIR) $(ROOT_DIR) OBJ=$(YSOCKSRC_O) $(YNODESRC_O) $(YLISTSRC_O) $(YWORKSRC_0) $(YTASKSRC_0) LIB_YTEST=$(YTESTDIR)/libytest.so -LIB_YSOCK=$(PWD)/../libysocket.so +LIB_YSOCK=$(ROOT_DIR)/libysocket.so + +all: $(EXEC) $(LIB_YSOCK) $(TOPTARGETS): $(DEPS) $(DEPS): $(MAKE) -C $@ $(MAKECMDGOALS) +$(LIB_YTEST): $(YTESTDIR) + +$(LIB_YSOCK): $(ROOT_DIR) -all: $(EXEC) $(LIB_YSOCK) $(LIB_YTEST) - -$(EXEC): $(EXECSRC) $(OBJ) +$(EXEC): $(EXECSRC) $(OBJ) $(LIB_YTEST) $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) -.PHONY: clean mrproper +.PHONY: all clean mrproper clean: rm -f $(OBJ) diff --git a/ybar_progress/Makefile b/ybar_progress/Makefile index c06b690..dac90fc 100644 --- a/ybar_progress/Makefile +++ b/ybar_progress/Makefile @@ -15,3 +15,4 @@ $(BARPROGES_O): $(BARPROGES_SRC) clean: rm -f $(BARPROGES_O) +mrproper: clean diff --git a/ytest_t/Makefile b/ytest_t/Makefile index b47a7b7..68d7467 100644 --- a/ytest_t/Makefile +++ b/ytest_t/Makefile @@ -23,10 +23,10 @@ SUBDIRS :=$(wildcard y*) $(TOOLDIR) $(BARPDIR) export +all: $(PROJECT_LIB) update_headers $(TOPTARGETS): $(SUBDIRS) -all: $(PROJECT_LIB) update_headers $(PROJECT_LIB): $(OBJ) @@ -42,7 +42,7 @@ $(SUBDIRS): update_headers: $(PROJECT_LIB) for file_h in $(SUBDIRS); do cp -r "$$file_h/include/" include_ytest/; done -.PHONY: $(TOPTARGETS) $(SUBDIRS) +.PHONY: all $(TOPTARGETS) $(SUBDIRS) mrproper: clean rm -f $(PROJECT_LIB) diff --git a/ytest_t/libytest.so b/ytest_t/libytest.so index bc6364f..2203204 100755 Binary files a/ytest_t/libytest.so and b/ytest_t/libytest.so differ diff --git a/ytest_t/test/src/Makefile b/ytest_t/test/src/Makefile index 897eb11..fe6041b 100644 --- a/ytest_t/test/src/Makefile +++ b/ytest_t/test/src/Makefile @@ -4,7 +4,8 @@ CC=gcc LDFLAGS=-lpthread ROOT_DIR=$(shell pwd) INCLUDE_DIR=$(ROOT_DIR) -CFLAGS=-I$(INCLUDE_DIR) +PERMDIR=$(ROOT_DIR)/../../../ypermutation_t +CFLAGS=-I$(INCLUDE_DIR) -I$(PERMDIR)/src/ SRC_DIR=$(ROOT_DIR) SRC=$(wildcard src/*/*.c) OBJ=$(SRC:.c=.o) @@ -25,7 +26,7 @@ TESTSRC_O=$(TESTSRC:.c=.o) all: $(EXEC) $(EXEC): $(EXECSRC) $(OBJ) - $(CC) -o $@ $^ -I$(INCLUDE_DIR) $(LDFLAGS) + $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) $(TESTSRC_O): $(TESTSRC) $(TOOLSRC_O) diff --git a/ytest_t/test/src/is_good.c b/ytest_t/test/src/is_good.c index b62472c..a573da6 100644 --- a/ytest_t/test/src/is_good.c +++ b/ytest_t/test/src/is_good.c @@ -90,7 +90,7 @@ TEST(expect){ int b = 6; EXPECT_EQ(a,b); //SKIP(); - SKIP("on skip eq string\n"); + SKIP("%s\n","on skip eq string"); EXPECT_EQ_TYPE_STRING("hello","hello"); float f1 = 1.00019999, f2=1.00019999; EXPECT_EQ_TYPE_FLOAT(f1,f2); diff --git a/ytest_t/yfmock/Makefile b/ytest_t/yfmock/Makefile index f213508..9e7c168 100644 --- a/ytest_t/yfmock/Makefile +++ b/ytest_t/yfmock/Makefile @@ -18,3 +18,5 @@ $(FMOCK_O): $(FMOCK_SRC) $(FTEST_O) clean: rm -f $(FMOCK_O) +mrproper: clean + diff --git a/ytest_t/yftest/Makefile b/ytest_t/yftest/Makefile index 681451d..8015edc 100644 --- a/ytest_t/yftest/Makefile +++ b/ytest_t/yftest/Makefile @@ -25,3 +25,5 @@ $(FTEST_O): $(FTEST_SRC) $(TOOLS_O) $(BARPROGES_O) clean: rm -f $(FTEST_O) +mrproper: clean + diff --git a/ytools_t/Makefile b/ytools_t/Makefile index 9259c90..48d9445 100644 --- a/ytools_t/Makefile +++ b/ytools_t/Makefile @@ -15,3 +15,4 @@ $(TOOLS_O): $(TOOLS_SRC) clean: rm -f $(TOOLS_O) +mrproper: clean