summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Cervin <albert@acervin.com>2024-05-06 22:58:15 +0200
committerAlbert Cervin <albert@acervin.com>2024-05-06 22:58:15 +0200
commit1e7e71d151bac48f150b4edb4bfa3f1ac4e80f44 (patch)
tree00855639625a5d18d129d82ab5e80a4c6257913e
parent292b2786a513f4a058889fc088598cb5acf1bcc5 (diff)
downloaddged-1e7e71d151bac48f150b4edb4bfa3f1ac4e80f44.tar.gz
dged-1e7e71d151bac48f150b4edb4bfa3f1ac4e80f44.tar.xz
dged-1e7e71d151bac48f150b4edb4bfa3f1ac4e80f44.zip
Make formatting target more portable
Previously it would fail if not using a dedicated build folder.
-rw-r--r--Makefile26
1 files changed, 14 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 926487c..ea77788 100644
--- a/Makefile
+++ b/Makefile
@@ -111,12 +111,13 @@ run-tests: $(TEST_OBJS) $(OBJS)
$(CC) $(LDFLAGS) $(TEST_OBJS) $(OBJS) -lm -o run-tests
check: run-tests
- $(FORMAT_TOOL) --dry-run --Werror \
- $(SOURCES:%.c=../%.c) \
- $(PLATFORM_SOURCES:%.c=../%.c) \
- $(MAIN_SOURCES:%.c=../%.c) \
- $(TEST_SOURCES:%c=../%c) \
- $(HEADERS:%.h=../%.h)
+ @echo "Running $(FORMAT_TOOL) (--dry-run --Werror)..."
+ @$(FORMAT_TOOL) --dry-run --Werror \
+ $(SOURCES:%.c=$(.CURDIR)/%.c) \
+ $(PLATFORM_SOURCES:%.c=$(.CURDIR)/%.c) \
+ $(MAIN_SOURCES:%.c=$(.CURDIR)/%.c) \
+ $(TEST_SOURCES:%c=$(.CURDIR)/%c) \
+ $(HEADERS:%.h=$(.CURDIR)/%.h)
./run-tests
run: dged
@@ -129,12 +130,13 @@ debug-tests: run-tests
gdb ./run-tests
format:
- $(FORMAT_TOOL) -i \
- $(SOURCES:%.c=../%.c) \
- $(MAIN_SOURCES:%.c=../%.c) \
- $(PLATFORM_SOURCES:%.c=../%.c) \
- $(TEST_SOURCES:%c=../%c) \
- $(HEADERS:%.h=../%.h)
+ @echo "Formatting with '$(FORMAT_TOOL) -i'..."
+ @$(FORMAT_TOOL) -i \
+ $(SOURCES:%.c=$(.CURDIR)/%.c) \
+ $(MAIN_SOURCES:%.c=$(.CURDIR)/%.c) \
+ $(PLATFORM_SOURCES:%.c=$(.CURDIR)/%.c) \
+ $(TEST_SOURCES:%c=$(.CURDIR)/%c) \
+ $(HEADERS:%.h=$(.CURDIR)/%.h)
clean:
rm -f $(FILES)