summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McQueen <simon.mcqueen@gmail.com>2003-05-19 14:54:18 +0000
committerSimon McQueen <simon.mcqueen@gmail.com>2003-05-19 14:54:18 +0000
commitb78e833cbe153c4dff5822d112aa6738e2c9201a (patch)
tree3aba9f7cb39badbdcc9dc5a95263ec60b4193452
parentc88e7cca573da444e7e2b15fd1ec5475616c1476 (diff)
downloadATCD-b78e833cbe153c4dff5822d112aa6738e2c9201a.tar.gz
ChangeLogTag: Mon May 19 15:51:20 2003 Simon McQueen <sm@prismtechnologies.com>
-rw-r--r--TAO/ChangeLog22
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Makefile2
-rw-r--r--TAO/orbsvcs/tests/Notify/Blocking/Makefile2
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Makefile2
-rw-r--r--TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile2
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Makefile2
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile2
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile2
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile2
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile2
12 files changed, 40 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 72cdf5f19ae..1c36f5dcbd0 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,19 @@
+Mon May 19 15:51:20 2003 Simon McQueen <sm@prismtechnologies.com>
+
+ * orbsvcs/tests/Notify/Basic/Makefile:
+ * orbsvcs/tests/Notify/Blocking/Makefile:
+ * orbsvcs/tests/Notify/Discarding/Makefile:
+ * orbsvcs/tests/Notify/MT_Dispatching/Makefile:
+ * orbsvcs/tests/Notify/Ordering/Makefile:
+ * orbsvcs/tests/Notify/performance-tests/Filter/Makefile:
+ * orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile:
+ * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile:
+ * orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile:
+ * orbsvcs/tests/Notify/Structured_Filter/Makefile:
+ * orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile:
+
+ Fixed link errors on builds.
+
Sun May 18 05:47:10 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
* tao/PortableServer/POA.cpp: Fixed a warning in minimum builds.
@@ -7,8 +23,8 @@ Sun May 18 05:42:21 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
* tao/Sequence_T.i: TAO_Unbounded_Array_Sequence and
TAO_Bounded_Array_Sequence were parametrized by T and
T_var. But the template parameters in the .i file read T
- and T_life. Borland 6 compiler doesnt seem to like this
- throwing up a bunch of link errors.
+ and T_life. Borland 6 compiler doesnt seem to like this
+ throwing up a bunch of link errors.
Thanks to Johnny Willemsen for providing this patch.
@@ -33,7 +49,7 @@ Fri May 16 18:40:08 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
adding the MAX_ALIGNMENT to the aligned value.
This will not fix all the problems with Any's. There are some
- more fixes which would be checked in in the next few days.
+ more fixes which would be checked in in the next few days.
Thu May 15 14:54:31 2003 Simon McQueen <sm@prismtechnologies.com>
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Makefile b/TAO/orbsvcs/tests/Notify/Basic/Makefile
index e4346008b88..59401f62cc0 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Basic/Makefile
@@ -55,6 +55,8 @@ ifdef TEMPINCDIR
COMPILE.cc := $(RM) -rf tempinc; $(COMPILE.cc)
endif
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace
+
#----------------------------------------------------------------------------
# Local targets
#----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Makefile b/TAO/orbsvcs/tests/Notify/Blocking/Makefile
index 5ea549f5b43..58f04bb7058 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Makefile
@@ -41,6 +41,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
include $(TAO_ROOT)/orbsvcs/tests/Notify/notify_tests.GNU
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace
+
#----------------------------------------------------------------------------
# Local targets
#----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Makefile b/TAO/orbsvcs/tests/Notify/Discarding/Makefile
index 42e25ebb3c4..0149c895b4c 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Makefile
@@ -49,6 +49,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
include $(TAO_ROOT)/orbsvcs/tests/Notify/notify_tests.GNU
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace
+
#----------------------------------------------------------------------------
# Local targets
#----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile
index 0a32ba7d5a2..1fcb61f027d 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile
@@ -42,6 +42,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
include $(TAO_ROOT)/orbsvcs/tests/Notify/notify_tests.GNU
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace
+
#----------------------------------------------------------------------------
# Local targets
#----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Makefile b/TAO/orbsvcs/tests/Notify/Ordering/Makefile
index f842bd04bb2..9788bd72069 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Makefile
@@ -49,6 +49,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
include $(TAO_ROOT)/orbsvcs/tests/Notify/notify_tests.GNU
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace
+
#----------------------------------------------------------------------------
# Local targets
#----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile
index b72aa3eb341..9875b7d92ff 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile
@@ -41,6 +41,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
include $(TAO_ROOT)/orbsvcs/tests/Notify/notify_tests.GNU
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace
+
#----------------------------------------------------------------------------
# Local targets
#----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile
index b8e31eb6678..26249fa39bb 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile
@@ -40,6 +40,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
include $(TAO_ROOT)/orbsvcs/tests/Notify/notify_tests.GNU
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace
+
#----------------------------------------------------------------------------
# Local targets
#----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile
index 49b4ca57bfc..bca3ad62715 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile
@@ -38,6 +38,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
include $(TAO_ROOT)/orbsvcs/tests/Notify/notify_tests.GNU
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace
+
#----------------------------------------------------------------------------
# Local targets
#----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile
index f10ca4cc49f..6ecd703a223 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile
@@ -38,6 +38,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
include $(TAO_ROOT)/orbsvcs/tests/Notify/notify_tests.GNU
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace
+
#----------------------------------------------------------------------------
# Local targets
#----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile
index 8772c122e95..8ba39361a11 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile
@@ -58,6 +58,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
include $(TAO_ROOT)/orbsvcs/tests/Notify/notify_tests.GNU
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace
+
#----------------------------------------------------------------------------
# Local targets
#----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile
index f913a018526..567b05a2f0a 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile
@@ -45,7 +45,7 @@ include $(TAO_ROOT)/orbsvcs/tests/Notify/notify_tests.GNU
#----------------------------------------------------------------------------
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace
CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
override TAO_IDLFLAGS += -I$(TAO_ROOT)/orbsvcs -Ge 1