summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2010-11-05 14:32:28 +0000
committerSteve Huston <shuston@riverace.com>2010-11-05 14:32:28 +0000
commit043bb7dd9e763a647d774f9162b7cd0456635f49 (patch)
tree53163ce9d5cf0bc64a561f7c69315a93c68416cf
parent163fadb68e0ac4ce1ade31aae6502377f65e566a (diff)
downloadATCD-043bb7dd9e763a647d774f9162b7cd0456635f49.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 82d314e1967..98eb07797da 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 840d21e6a30..b32dab24548 100644
--- a/include/makeinclude/rules.local.GNU
+++ b/include/makeinclude/rules.local.GNU
@@ -502,3 +502,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)