summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/orbsvcs/Makefile.am11
2 files changed, 13 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 8416af2aa4b..e8bd8623b41 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Thu Feb 2 17:48:16 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
+
+ * orbsvcs/Makefile.am:
+
+ Must build tests before examples, as the Notify Service examples
+ use a Notify Service test library.
+
Wed Feb 1 21:02:45 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu>
* TAO_IDL/ast/ast_predefined_type.cpp:
diff --git a/TAO/orbsvcs/Makefile.am b/TAO/orbsvcs/Makefile.am
index 3aaa8bc1ab5..56d59bb44e4 100644
--- a/TAO/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/Makefile.am
@@ -30,13 +30,14 @@ SUBDIRS = \
CosEvent_Service \
Concurrency_Service
-if BUILD_EXAMPLES
-SUBDIRS += \
- examples
-endif
-
if BUILD_TESTS
SUBDIRS += \
performance-tests \
tests
endif
+
+if BUILD_EXAMPLES
+SUBDIRS += \
+ examples
+endif
+