diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8fe5afc5f..3d939def1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -68,7 +68,7 @@ standards by running the following tools: ``` 3. Run the static analyzer (`clang-tidy`) ```bash - cabin tidy # or make tidy + cabin tidy ``` ### Testing diff --git a/Makefile b/Makefile index fbcc3660d..87e760992 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ CXX ?= clang++ -CABIN_TIDY ?= clang-tidy GIT ?= git PREFIX ?= /usr/local INSTALL ?= install @@ -63,12 +62,10 @@ UNITTEST_OBJS := $(patsubst src/%,$(O)/tests/test_%,$(UNITTEST_SRCS:.cc=.o)) UNITTEST_BINS := $(UNITTEST_OBJS:.o=) UNITTEST_DEPS := $(UNITTEST_OBJS:.o=.d) -TIDY_TARGETS := $(patsubst src/%,tidy_%,$(SRCS)) - GIT_DEPS := $(O)/DEPS/toml11 $(O)/DEPS/mitama-cpp-result -.PHONY: all clean install test versions tidy $(TIDY_TARGETS) +.PHONY: all clean install test versions all: check_deps $(PROJECT) @@ -142,11 +139,6 @@ $(O)/tests/test_Builder/Project: $(O)/tests/test_Builder/Project.o $(O)/Algos.o $(CXX) $(TEST_LDFLAGS) $^ $(LIBS) $(LDFLAGS) -o $@ -tidy: $(TIDY_TARGETS) - -$(TIDY_TARGETS): tidy_%: src/% $(GIT_DEPS) - $(CABIN_TIDY) $(CABIN_TIDY_FLAGS) $< -- $(CXXFLAGS) $(DEFINES) -DCABIN_TEST $(INCLUDES) - install: all $(INSTALL) -m 0755 -d $(DESTDIR)$(PREFIX)/bin $(INSTALL) -m 0755 $(PROJECT) $(DESTDIR)$(PREFIX)/bin