From 02ca76465e226c858585b5c124e781d16ea167c2 Mon Sep 17 00:00:00 2001 From: jtc Date: Thu, 2 Feb 2006 14:57:44 +0000 Subject: ChangeLogTag: Thu Feb 2 14:48:03 UTC 2006 J.T. Conklin --- ChangeLog | 9 +++++++++ Makefile.am | 11 ++++++----- 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 + + * 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 * 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 - -- cgit v1.2.1