andy/mpc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: make check always compiles dependencies

Browse Source 
Make is supposed to only compile dependencies when they change but
`make check` always compiles them, making the test suite run slow.

```
$ make check
cc ... build/mpc.o

$ make check
cc ... build/mpc.o
```

The same occurs for other targets like `build/test-dynamic` and
`build/test-static`.

This happens because these targets have the `$(DIST)` directory as a
dependency, and directories always change whenever members are added,
removed or renamed.

Fix this by changing the `$(DIST)` directory dependency to a
`$(DIST)/.dirstamp` file.

Now `make check` compiles dependencies only once.
This commit is contained in:
steve-chavez
2023-08-03 17:53:33 -05:00
parent 1a59a5ff7a
commit 1523a830d8
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -9,3 +9,4 @@ examples/smallc
examples/foobar examples/foobar
examples/tree_traversal examples/tree_traversal
build/* build/*
tags

13
Makefile
View File

@@ -17,11 +17,12 @@ EXAMPLESEXE = $(EXAMPLES:.c=)
all: $(EXAMPLESEXE) check libs $(DIST)/$(PROJ).pc all: $(EXAMPLESEXE) check libs $(DIST)/$(PROJ).pc
$(DIST): $(DIST)/.dirstamp:
$(MKDIR) $(DIST) $(MKDIR) $(DIST)
$(MKDIR) $(DIST)/examples $(MKDIR) $(DIST)/examples
touch $@
check: $(DIST) $(DIST)/test-file $(DIST)/test-static $(DIST)/test-dynamic check: $(DIST)/.dirstamp $(DIST)/test-file $(DIST)/test-static $(DIST)/test-dynamic
./$(DIST)/test-file ./$(DIST)/test-file
./$(DIST)/test-static ./$(DIST)/test-static
LD_LIBRARY_PATH=$(DIST) ./$(DIST)/test-dynamic LD_LIBRARY_PATH=$(DIST) ./$(DIST)/test-dynamic
@@ -35,23 +36,23 @@ $(DIST)/test-dynamic: $(TESTS) $(DIST)/lib$(PROJ).so $(PROJ).h tests/ptest.h
$(DIST)/test-static: $(TESTS) $(DIST)/lib$(PROJ).a $(PROJ).h tests/ptest.h $(DIST)/test-static: $(TESTS) $(DIST)/lib$(PROJ).a $(PROJ).h tests/ptest.h
$(CC) $(filter-out -Werror, $(CFLAGS)) $(TESTS) -lm -L$(DIST) -l$(PROJ) -static -o $(DIST)/test-static $(CC) $(filter-out -Werror, $(CFLAGS)) $(TESTS) -lm -L$(DIST) -l$(PROJ) -static -o $(DIST)/test-static
examples/%: $(DIST) examples/%.c $(PROJ).c $(PROJ).h examples/%: $(DIST)/.dirstamp examples/%.c $(PROJ).c $(PROJ).h
$(CC) $(CFLAGS) $(filter-out $(DIST) $(PROJ).h, $^) -lm -o $(DIST)/$@ $(CC) $(CFLAGS) $(filter-out $(DIST) $(PROJ).h, $^) -lm -o $(DIST)/$@
$(DIST)/lib$(PROJ).so: $(DIST) $(PROJ).c $(PROJ).h $(DIST)/lib$(PROJ).so: $(DIST)/.dirstamp $(PROJ).c $(PROJ).h
ifneq ($(OS),Windows_NT) ifneq ($(OS),Windows_NT)
$(CC) $(CFLAGS) -fPIC -shared $(PROJ).c -o $(DIST)/lib$(PROJ).so $(CC) $(CFLAGS) -fPIC -shared $(PROJ).c -o $(DIST)/lib$(PROJ).so
else else
$(CC) $(CFLAGS) -shared $(PROJ).c -o $(DIST)/lib$(PROJ).so $(CC) $(CFLAGS) -shared $(PROJ).c -o $(DIST)/lib$(PROJ).so
endif endif
$(DIST)/lib$(PROJ).a: $(DIST) $(PROJ).c $(PROJ).h $(DIST)/lib$(PROJ).a: $(DIST)/.dirstamp $(PROJ).c $(PROJ).h
$(CC) $(CFLAGS) -c $(PROJ).c -o $(DIST)/$(PROJ).o $(CC) $(CFLAGS) -c $(PROJ).c -o $(DIST)/$(PROJ).o
$(AR) rcs $(DIST)/lib$(PROJ).a $(DIST)/$(PROJ).o $(AR) rcs $(DIST)/lib$(PROJ).a $(DIST)/$(PROJ).o
libs: $(DIST)/lib$(PROJ).so $(DIST)/lib$(PROJ).a libs: $(DIST)/lib$(PROJ).so $(DIST)/lib$(PROJ).a
$(DIST)/$(PROJ).pc: $(DIST) $(PROJ).pc $(DIST)/$(PROJ).pc: $(DIST)/.dirstamp $(PROJ).pc
cp $(PROJ).pc $(DIST)/$(PROJ).pc cp $(PROJ).pc $(DIST)/$(PROJ).pc
sed -i '1i\prefix=$(PREFIX)/' $(DIST)/$(PROJ).pc sed -i '1i\prefix=$(PREFIX)/' $(DIST)/$(PROJ).pc