From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 25 Jan 2012 10:52:23 +0000 (+0100)
Subject: Correctly calculate dependencies
X-Git-Tag: release_3_0_0_beta0~378
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e466c22b041fda371ad90fa31d72aed27f749f12;p=thirdparty%2Ffreeradius-server.git

Correctly calculate dependencies

FIRST filter absolute path -> ${top_srcdir}
THEN  filter absolute path -> ${BUILDDIR}
THEN delete all other absolute paths.
     They're not part of our build!
---

diff --git a/scripts/boiler.mk b/scripts/boiler.mk
index 6888f868436..e6100a9afc7 100644
--- a/scripts/boiler.mk
+++ b/scripts/boiler.mk
@@ -80,21 +80,23 @@ define FILTER_DEPENDS
 	@mkdir -p $$(dir $${BUILD_DIR}/make/src/$$*)
 	@mkdir -p $$(dir $${BUILD_DIR}/objs/$$*)
 	@sed  -e 's/#.*//' \
+	  -e 's,^$${top_srcdir},$$$${top_srcdir},' \
+	  -e 's, $${top_srcdir}, $$$${top_srcdir},' \
+	  -e 's,^$${BUILD_DIR},$$$${BUILD_DIR},' \
+	  -e 's, $${BUILD_DIR}/make/include/[^ :]*,,' \
+	  -e 's, $${BUILD_DIR}, $$$${BUILD_DIR},' \
 	  -e 's, /[^: ]*,,g' \
 	  -e 's,^ *[^:]* *: *$$$$,,' \
 	  -e '/: </ d' \
 	  -e 's/\.o: /.$$$${OBJ_EXT}: /' \
 	  -e '/^ *\\$$$$/ d' \
-	  -e 's,^$${BUILD_DIR},$$$${BUILD_DIR},' \
-	  -e 's, $${BUILD_DIR}/make/include/[^ :]*,,' \
-	  -e 's, $${BUILD_DIR}, $$$${BUILD_DIR},' \
 	  < $${BUILD_DIR}/objs/$$*.d | sed -e '$$$$!N; /^\(.*\)\n\1$$$$/!P; D' \
 	  >  $${BUILD_DIR}/make/src/$$*.mk
 	@sed -e 's/#.*//' \
+	  -e 's, $${BUILD_DIR}/make/include/[^ :]*,,' \
 	  -e 's, /[^: ]*,,g' \
 	  -e 's,^ *[^:]* *: *$$$$,,' \
 	  -e '/: </ d' \
-	  -e 's, $${BUILD_DIR}/make/include/[^ :]*,,' \
 	  -e 's/^[^:]*: *//' \
 	  -e 's/ *\\$$$$//' \
 	  -e 's/$$$$/ :/' \