summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--Makefile.am11
2 files changed, 15 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index b54016a5d41..3dce1f4ce79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Thu Feb 2 14:48:03 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
+
+ * Makefile.am:
+
+ Build examples and tests subdirectories after building
+ protocols. I think all of the HTBP, RMCast and TMCast examples
+ and tests should be moved underneath protocols eventually , but
+ it's too close to the release to do it safely.
+
Thu Feb 2 11:19:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/Naming_Test.cpp:
diff --git a/Makefile.am b/Makefile.am
index 291e61b1982..340e2a53ff1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,6 +16,12 @@ if BUILD_ACEXML
SUBDIRS += ACEXML
endif
+SUBDIRS += \
+ apps \
+ bin \
+ netsvcs \
+ protocols
+
if BUILD_EXAMPLES
SUBDIRS += examples
endif
@@ -26,10 +32,6 @@ SUBDIRS += tests
endif
SUBDIRS += \
- apps \
- bin \
- netsvcs \
- protocols \
websvcs \
@KOKYU@ \
@TAO@
@@ -37,4 +39,3 @@ SUBDIRS += \
ACLOCAL = @ACLOCAL@
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = foreign
-