summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-11-14 18:17:22 +0000
committerjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-11-14 18:17:22 +0000
commit6c3a887df9c2d788224ae50e7f0b48906cf5d6df (patch)
tree19ca0098bb518a3e468e533b0b18b35dfdef9acc
parentfac16513a73681b278e34160652656c67a793891 (diff)
downloadATCD-6c3a887df9c2d788224ae50e7f0b48906cf5d6df.tar.gz
ChangeLogTag: Sun Nov 14 10:12:00 2004 J.T. Conklin <jtc@acorntoolworks.com>
-rw-r--r--ACEXML/apps/svcconf/Makefile.am3
-rw-r--r--ACEXML/common/Makefile.am3
-rw-r--r--ACEXML/parser/parser/Makefile.am3
-rw-r--r--ChangeLog15
-rw-r--r--Kokyu/Makefile.am3
-rw-r--r--ace/Makefile.am3
-rw-r--r--ace/QoS/Makefile.am3
-rw-r--r--ace/RMCast/Makefile.am3
-rw-r--r--ace/SSL/Makefile.am3
-rw-r--r--ace/TMCast/Makefile.am3
-rw-r--r--protocols/ace/HTBP/Makefile.am3
-rw-r--r--protocols/ace/RMCast/Makefile.am3
-rw-r--r--protocols/ace/TMCast/Makefile.am3
13 files changed, 51 insertions, 0 deletions
diff --git a/ACEXML/apps/svcconf/Makefile.am b/ACEXML/apps/svcconf/Makefile.am
index fb12e5ca99f..fdc2851bb97 100644
--- a/ACEXML/apps/svcconf/Makefile.am
+++ b/ACEXML/apps/svcconf/Makefile.am
@@ -29,6 +29,9 @@ libACEXML_XML_Svc_Conf_Parser_la_SOURCES = \
Svcconf.cpp \
Svcconf_Handler.cpp
+libACEXML_XML_Svc_Conf_Parser_la_LDFLAGS = \
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
+
libACEXML_XML_Svc_Conf_Parser_la_LIBADD = \
$(top_builddir)/ACEXML/parser/parser/libACEXML_Parser.la $(top_builddir)/ACEXML/common/libACEXML.la $(top_builddir)/ace/libACE.la
diff --git a/ACEXML/common/Makefile.am b/ACEXML/common/Makefile.am
index 6b8d6cb1ef6..db42127f190 100644
--- a/ACEXML/common/Makefile.am
+++ b/ACEXML/common/Makefile.am
@@ -47,6 +47,9 @@ libACEXML_la_SOURCES = \
XML_Codecs.cpp \
ZipCharStream.cpp
+libACEXML_la_LDFLAGS = \
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
+
libACEXML_la_LIBADD = \
$(top_builddir)/ace/libACE.la
diff --git a/ACEXML/parser/parser/Makefile.am b/ACEXML/parser/parser/Makefile.am
index f8951f268b7..466d4265cdd 100644
--- a/ACEXML/parser/parser/Makefile.am
+++ b/ACEXML/parser/parser/Makefile.am
@@ -27,6 +27,9 @@ libACEXML_Parser_la_SOURCES = \
ParserContext.cpp \
ParserInternals.cpp
+libACEXML_Parser_la_LDFLAGS = \
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
+
libACEXML_Parser_la_LIBADD = \
$(top_builddir)/ACEXML/common/libACEXML.la $(top_builddir)/ace/libACE.la
diff --git a/ChangeLog b/ChangeLog
index cbb00dc2cd3..a4cc4c6b9de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Sun Nov 14 10:12:00 2004 J.T. Conklin <jtc@acorntoolworks.com>
+
+ * ACEXML/apps/svcconf/Makefile.am:
+ * ACEXML/common/Makefile.am:
+ * ACEXML/parser/parser/Makefile.am:
+ * Kokyu/Makefile.am:
+ * ace/Makefile.am:
+ * ace/QoS/Makefile.am:
+ * ace/RMCast/Makefile.am:
+ * ace/SSL/Makefile.am:
+ * ace/TMCast/Makefile.am:
+ * protocols/ace/HTBP/Makefile.am:
+
+ Restored LDFLAGS definition.
+
Sun Nov 14 05:03:47 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
* bin/tao_orb_tests.lst:
diff --git a/Kokyu/Makefile.am b/Kokyu/Makefile.am
index 41239dbe2b0..f52e0205242 100644
--- a/Kokyu/Makefile.am
+++ b/Kokyu/Makefile.am
@@ -32,6 +32,9 @@ libKokyu_la_SOURCES = \
Kokyu.cpp \
Kokyu_defs.cpp
+libKokyu_la_LDFLAGS = \
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
+
libKokyu_la_LIBADD = \
$(ACE_BUILDDIR)/ace/libACE.la
diff --git a/ace/Makefile.am b/ace/Makefile.am
index 15affa1ba01..06c58dc5ae7 100644
--- a/ace/Makefile.am
+++ b/ace/Makefile.am
@@ -378,6 +378,9 @@ libACE_la_SOURCES = \
$(Timer) \
$(Metrics)
+libACE_la_LDFLAGS = \
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
+
nobase_include_HEADERS = \
ACE.h \
ACE_export.h \
diff --git a/ace/QoS/Makefile.am b/ace/QoS/Makefile.am
index a351992a709..99103102210 100644
--- a/ace/QoS/Makefile.am
+++ b/ace/QoS/Makefile.am
@@ -32,6 +32,9 @@ libACE_QoS_la_SOURCES = \
QoS_Session_Impl.cpp \
SOCK_Dgram_Mcast_QoS.cpp
+libACE_QoS_la_LDFLAGS = \
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
+
libACE_QoS_la_LIBADD = \
$(top_builddir)/ace/libACE.la
diff --git a/ace/RMCast/Makefile.am b/ace/RMCast/Makefile.am
index 58c23331352..d1afd90ee46 100644
--- a/ace/RMCast/Makefile.am
+++ b/ace/RMCast/Makefile.am
@@ -52,6 +52,9 @@ libACE_RMCast_la_SOURCES = \
RMCast_UDP_Reliable_Sender.cpp \
RMCast_Worker.cpp
+libACE_RMCast_la_LDFLAGS = \
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
+
libACE_RMCast_la_LIBADD = \
$(top_builddir)/ace/libACE.la
diff --git a/ace/SSL/Makefile.am b/ace/SSL/Makefile.am
index 3aa2f48fa90..db3309404b8 100644
--- a/ace/SSL/Makefile.am
+++ b/ace/SSL/Makefile.am
@@ -36,6 +36,9 @@ libACE_SSL_la_SOURCES = \
SSL_SOCK_Connector.cpp \
SSL_SOCK_Stream.cpp
+libACE_SSL_la_LDFLAGS = \
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
+
libACE_SSL_la_LIBADD = \
$(top_builddir)/ace/libACE.la -lssl -lcrypto
diff --git a/ace/TMCast/Makefile.am b/ace/TMCast/Makefile.am
index cc59bfadef3..dc2150b9f1d 100644
--- a/ace/TMCast/Makefile.am
+++ b/ace/TMCast/Makefile.am
@@ -31,6 +31,9 @@ libTMCast_la_SOURCES = \
MTQueue.cpp \
Protocol.cpp
+libTMCast_la_LDFLAGS = \
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
+
libTMCast_la_LIBADD = \
$(top_builddir)/ace/libACE.la
diff --git a/protocols/ace/HTBP/Makefile.am b/protocols/ace/HTBP/Makefile.am
index c110e00114e..77c941b434a 100644
--- a/protocols/ace/HTBP/Makefile.am
+++ b/protocols/ace/HTBP/Makefile.am
@@ -34,6 +34,9 @@ libACE_HTBP_la_SOURCES = \
HTBP_Session.cpp \
HTBP_Stream.cpp
+libACE_HTBP_la_LDFLAGS = \
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
+
libACE_HTBP_la_LIBADD = \
$(top_builddir)/ace/libACE.la
diff --git a/protocols/ace/RMCast/Makefile.am b/protocols/ace/RMCast/Makefile.am
index 58c23331352..d1afd90ee46 100644
--- a/protocols/ace/RMCast/Makefile.am
+++ b/protocols/ace/RMCast/Makefile.am
@@ -52,6 +52,9 @@ libACE_RMCast_la_SOURCES = \
RMCast_UDP_Reliable_Sender.cpp \
RMCast_Worker.cpp
+libACE_RMCast_la_LDFLAGS = \
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
+
libACE_RMCast_la_LIBADD = \
$(top_builddir)/ace/libACE.la
diff --git a/protocols/ace/TMCast/Makefile.am b/protocols/ace/TMCast/Makefile.am
index cc59bfadef3..dc2150b9f1d 100644
--- a/protocols/ace/TMCast/Makefile.am
+++ b/protocols/ace/TMCast/Makefile.am
@@ -31,6 +31,9 @@ libTMCast_la_SOURCES = \
MTQueue.cpp \
Protocol.cpp
+libTMCast_la_LDFLAGS = \
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
+
libTMCast_la_LIBADD = \
$(top_builddir)/ace/libACE.la