From 86395f53634b3ef1ce76a7f1e5edfdb61f8ffd80 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Sat, 25 Oct 2014 15:24:26 -0700 Subject: Fix header ranking --- Makefile.in | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 9fd289c..9be1ad9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -197,6 +197,8 @@ PIES := $(filter-out src/main-gdb-%.py,${PIES}) SOURCES := ${REAL_SOURCES} HEADERS := ${REAL_HEADERS} CHECK_HEADERS := $(patsubst src/%.hpp,stamp/%.hpp.check,$(filter %.hpp,${REAL_HEADERS})) +CHECK_RANK_FWDS := $(patsubst src/%,stamp/%.rank,${REAL_HEADERS} $(filter-out %_test.cpp,${REAL_SOURCES})) +CHECK_FWDS := $(patsubst src/%/fwd.hpp,stamp/%.fwdcheck,$(filter %/fwd.hpp,${REAL_HEADERS})) PATTERN_ROOTS := $(patsubst src/%.cpp,%,${SOURCES}) PATTERN_PIES := $(patsubst src/%.py,%,${PIES}) PATTERN_MAINS := $(patsubst %/main,%,$(filter %/main,${PATTERN_ROOTS})) @@ -501,18 +503,40 @@ endif test: test-direct test-direct: $(patsubst bin/tests/%,stamp/run-%.stamp,${TEST_BINARIES}) + test: test-gtest test-gtest: $(patsubst bin/tests/%,stamp/run-%.stamp,${GTEST_BINARIES}) + test: test-dtest test-dtest: $(patsubst bin/tests/%,stamp/run-%.stamp,${DTEST_BINARIES}) + stamp/run-%.stamp: bin/tests/% $(MKDIR_FIRST) ln -sf ../lib bin/lib ${TESTER} $< ${TEST_ARGS} touch $@ + test: test-headers test-headers: ${CHECK_HEADERS} +test: test-rank-fwd +test-rank-fwd: ${CHECK_RANK_FWDS} +stamp/%.rank: src/% + $(MKDIR_FIRST) + includes=$$(grep '#include.*".*/.*"' $< | sed 's/^[^"]*"//;s/"[^"]*$$//;s:/[^/]*$$::' | sort -u | fgrep -vx -e '..' -e 'conf-raw' -e '../conf'); \ + for inc in $$includes; do if ! test -f ${