summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoriliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-04-08 12:18:05 +0000
committeriliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-04-08 12:18:05 +0000
commit26aeede19284bcd9ab96d01c8692f00f3f2df854 (patch)
tree4ac6a26b0545d60e35be563b76856c24739de85d
parent36d5afb08545f9f26261cb8a5f9eb0efd90be781 (diff)
downloadATCD-26aeede19284bcd9ab96d01c8692f00f3f2df854.tar.gz
Merged revisions 81264 via svnmerge from
https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk/ACE ........ r81264 | johnnyw | 2008-04-07 13:49:50 -0500 (Mon, 07 Apr 2008) | 1 line Mon Apr 7 18:49:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> ........
-rw-r--r--ACE/ChangeLog5
-rw-r--r--ACE/bin/MakeProjectCreator/docs/templates/gnu.txt1
2 files changed, 6 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 9f7cb6fb5c0..948cdc6cadd 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Mon Apr 7 18:49:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * bin/MakeProjectCreator/docs/templates/gnu.txt:
+ Document linkflags
+
Mon Apr 7 15:21:38 UTC 2008 Iliyan Jeliazkov <iliyan@ociweb.com>
This the second part of the SC refatoring. It builds on top of
diff --git a/ACE/bin/MakeProjectCreator/docs/templates/gnu.txt b/ACE/bin/MakeProjectCreator/docs/templates/gnu.txt
index 9d16b357afb..cbac98abf70 100644
--- a/ACE/bin/MakeProjectCreator/docs/templates/gnu.txt
+++ b/ACE/bin/MakeProjectCreator/docs/templates/gnu.txt
@@ -11,6 +11,7 @@ cidlc_flags = The default flags for the cidl compiler.
dds = Indicates whether or not this project contains DDS code.
idl_files = When a Define_Custom(IDL) is used, they will be accessible through this variable name.
install = This is a synonym for exeout.
+linkflags = Platform specific flags passed during the linking of dynamic libraries and executables.
tao = Indicates whether or not this project contains TAO code.
tao_idl = The full path to the idl compiler.
tao_idl3_to_idl2 = The full path to the idl3 to idl2 compiler.