summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2010-11-05 14:33:15 +0000
committerSteve Huston <shuston@riverace.com>2010-11-05 14:33:15 +0000
commit1da058e4cff56f590b2ccb5a0b0dbee42c7e99d5 (patch)
tree5861b30b3ab805787a5e55fb0320ec0dd1a6e0a6
parent150834f17e31a49c560d1ce76960ad7c658ac852 (diff)
downloadATCD-1da058e4cff56f590b2ccb5a0b0dbee42c7e99d5.tar.gz
Fri Nov 5 14:23:26 UTC 2010 Steve Huston <shuston@riverace.com>
-rw-r--r--ChangeLog11
-rw-r--r--include/makeinclude/rules.local.GNU7
2 files changed, 18 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b97f81ef8f4..2c6317ac147 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Fri Nov 5 14:23:26 UTC 2010 Steve Huston <shuston@riverace.com>
+
+ * include/makeinclude/rules.local.GNU: Added a hook for users to
+ include site-private rules in a build. If the user places a
+ "rules.private.GNU" in any build directory it will get included
+ from rules.local.GNU. The "private_rules_file" make variable
+ can be set to override the name and/or location of the file.
+ If no such rules file exists, its absence is silently ignored.
+ This facility can be used, for example, to integrate a specialized
+ code checker into the build process.
+
Thu Nov 4 15:17:51 UTC 2010 Steve Huston <shuston@riverace.com>
* ace/INET_Addr.cpp (set): For platforms that have the GNU-extended
diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU
index 268961c3f66..2e947e9a7c4 100644
--- a/include/makeinclude/rules.local.GNU
+++ b/include/makeinclude/rules.local.GNU
@@ -542,3 +542,10 @@ svnignore.local:
svn propset svn:ignore -F SvNiGnOrE .; \
rm SvNiGnOrE; \
fi
+
+#----------------------------------------------------------------------------
+# Optional private, site-specific rules
+#----------------------------------------------------------------------------
+
+private_rules_file ?= rules.private.GNU
+-include $(private_rules_file)