From 1f06e5f0b9ee483053b987c9cab9f1f5fce2590c Mon Sep 17 00:00:00 2001 From: Kurtis Rader Date: Wed, 20 Apr 2016 23:00:54 -0700 Subject: add better support for IWYU and fix things Remove the "make iwyu" build target. Move the functionality into the recently introduced lint.fish script. Fix a lot, but not all, of the include-what-you-use errors. Specifically, it fixes all of the IWYU errors on my OS X server but only removes some of them on my Ubuntu 14.04 server. Fixes #2957 --- Makefile.in | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 0858c647..b73e75d1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -859,19 +859,11 @@ depend: cp config.h /tmp/fish_make_depend/ mv $(subst obj/,/tmp/fish_make_depend/src/,$(FISH_ALL_OBJS:.o=.cpp)) /tmp/fish_make_depend/ cd /tmp/fish_make_depend && \ - makedepend -f$(CURDIR)/Makefile.in -pobj/ -Y -Isrc *.cpp + makedepend -f$(CURDIR)/Makefile.in -pobj/ -Y -Isrc *.cpp rm -Rf /tmp/fish_make_depend ./config.status .PHONY: depend -# Include What You Use -iwyu: - # Requires the --keep-going flag as it always returns 1 - # Can't set MAKEFLAGS on a target-specific basic - $(MAKE) -k _iwyu CXX=include-what-you-use -_iwyu: clean $(PROGRAMS) -.PHONY: iwyu _iwyu - # Lint the code. This only deals with C++ files. lint: build_tools/lint.fish $(CXX) $(CXXFLAGS) @@ -894,7 +886,7 @@ style-all: # Restore the source tree to the state right after extracting a tarball. distclean: clean $(MAKE) -C $(PCRE2_DIR) distclean || true - rm -f config.status config.log config.h Makefile + rm -f config.status config.log config.h Makefile osx/config.h .PHONY: distclean -- cgit v1.2.3