summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-05-17 02:19:42 +0000
committerjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-05-17 02:19:42 +0000
commit4da5fe874861e8452f181652a1d3592ac8e6f050 (patch)
tree77f9c4a030ad6598da268a019a01bacfa7ef71da
parente8fc05adc0af339d428f729659b66157f0e8afe2 (diff)
downloadATCD-4da5fe874861e8452f181652a1d3592ac8e6f050.tar.gz
ChangeLogTag: Mon May 16 19:18:14 2005 J.T. Conklin <jtc@acorntoolworks.com>
-rw-r--r--ChangeLog9
-rw-r--r--configure.ac5
-rw-r--r--examples/Makefile.am1
-rw-r--r--protocols/Makefile.am4
-rw-r--r--protocols/examples/Makefile.am12
5 files changed, 26 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 19a76032659..bed3595fcee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon May 16 19:18:14 2005 J.T. Conklin <jtc@acorntoolworks.com>
+
+ * configure.ac:
+ * examples/Makefile.am:
+ * protocols/Makefile.am:
+ * protocols/examples/Makefile.am:
+
+ Adapt autoconf build to adjust to relocation of RMCast examples.
+
Mon May 16 15:58:29 2005 Steve Huston <shuston@riverace.com>
* ACE-INSTALL.html: Corrected the names of the Sun compilers supported.
diff --git a/configure.ac b/configure.ac
index 641744a4eb4..bb8c7c1e523 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7575,8 +7575,6 @@ AC_CONFIG_FILES([
examples/QOS/Change_Sender_TSpec/Makefile
examples/QOS/Diffserv/Makefile
examples/QOS/Simple/Makefile
- examples/RMCast/Makefile
- examples/RMCast/Send_Msg/Makefile
examples/Reactor/Makefile
examples/Reactor/Dgram/Makefile
examples/Reactor/FIFO/Makefile
@@ -7628,6 +7626,9 @@ AC_CONFIG_FILES([
protocols/ace/HTBP/Makefile
protocols/ace/RMCast/Makefile
protocols/ace/TMCast/Makefile
+ protocols/examples/Makefile
+ protocols/examples/RMCast/Makefile
+ protocols/examples/RMCast/Send_Msg/Makefile
tests/Makefile
tests/HTBP/Makefile
tests/HTBP/Reactor_Tests/Makefile
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 3c14f3530d8..4127277e86a 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -27,7 +27,6 @@ SUBDIRS = \
Naming \
OS \
QOS \
- RMCast \
Reactor \
Registry \
Service_Configurator \
diff --git a/protocols/Makefile.am b/protocols/Makefile.am
index e09935be398..31372aa4797 100644
--- a/protocols/Makefile.am
+++ b/protocols/Makefile.am
@@ -9,5 +9,5 @@
## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
SUBDIRS = \
- ace
-
+ ace \
+ examples
diff --git a/protocols/examples/Makefile.am b/protocols/examples/Makefile.am
new file mode 100644
index 00000000000..a601192c677
--- /dev/null
+++ b/protocols/examples/Makefile.am
@@ -0,0 +1,12 @@
+## Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC. Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
+
+SUBDIRS = \
+ RMCast