ChangeLogTag: Tue Feb 15 14:33:18 2005 J.T. Conklin <jtc@acorntoolworks.com>

7 files changed, 42 insertions, 33 deletions

diff --git a/ChangeLog b/ChangeLog
index daa7944faf2..6009f647476 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+Tue Feb 15 14:33:18 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* examples/RMCast/Send_Msg/Makefile.am:
+	* examples/TMCast/Member/Makefile.am:
+
+	  Regenerated.
+
+	* examples/RMCast/Send_Msg/Receiver.cpp:
+	* examples/RMCast/Send_Msg/Sender.cpp:
+	* examples/TMCast/Member/member.cpp:
+
+	  Changed <protocols/ace/*.h> to <ace/*.h> so headers are
+	  #included the same regardless of whether they're in the
+	  source tree or installed.
+
+	* examples/TMCast/Member/Member.mpc:
+
+	  Add exename definition so executable is actually built.
+
 Tue Feb 15 13:34:42 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
 	* Makefile.am:
diff --git a/examples/RMCast/Send_Msg/Makefile.am b/examples/RMCast/Send_Msg/Makefile.am
index 14d8b6d81f5..a7c9874b08f 100644
--- a/examples/RMCast/Send_Msg/Makefile.am
+++ b/examples/RMCast/Send_Msg/Makefile.am
@@ -1,56 +1,51 @@
 ##  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:
-## ./bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake ACE.mwc
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
+
 ## Makefile.Send_Msg_Receiver.am 
 
-if BUILD_RMCAST
+if BUILD_EXCEPTIONS
 
 noinst_PROGRAMS += receiver
 
 receiver_CPPFLAGS = \
   -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR)
+  -I$(ACE_BUILDDIR) \
+  -I$(ACE_ROOT)/protocols
 
 receiver_SOURCES = \
   Receiver.cpp \
   Protocol.h
 
 receiver_LDADD = \
-  $(ACE_BUILDDIR)/ace/RMCast/libACE_RMCast.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
+  ${ACE_BUILDDIR}/protocols/ace/RMCast/libACE_RMCast.la \
+  ${ACE_BUILDDIR}/ace/libACE.la
 
-endif BUILD_RMCAST
+endif BUILD_EXCEPTIONS
 
 ## Makefile.Send_Msg_Sender.am 
 
-if BUILD_RMCAST
+if BUILD_EXCEPTIONS
 
 noinst_PROGRAMS += sender
 
 sender_CPPFLAGS = \
   -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR)
+  -I$(ACE_BUILDDIR) \
+  -I$(ACE_ROOT)/protocols
 
 sender_SOURCES = \
   Sender.cpp \
   Protocol.h
 
 sender_LDADD = \
-  $(ACE_BUILDDIR)/ace/RMCast/libACE_RMCast.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
+  ${ACE_BUILDDIR}/protocols/ace/RMCast/libACE_RMCast.la \
+  ${ACE_BUILDDIR}/ace/libACE.la
 
-endif BUILD_RMCAST
+endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/examples/RMCast/Send_Msg/Receiver.cpp b/examples/RMCast/Send_Msg/Receiver.cpp
index 4075313b3e9..0082ac2b9d6 100644
--- a/examples/RMCast/Send_Msg/Receiver.cpp
+++ b/examples/RMCast/Send_Msg/Receiver.cpp
@@ -3,7 +3,7 @@
 // cvs-id    : $Id$
 
 #include "ace/OS_NS_string.h"
-#include "protocols/ace/RMCast/Socket.h"
+#include "ace/RMCast/Socket.h"
 
 #include "Protocol.h"
 
diff --git a/examples/RMCast/Send_Msg/Sender.cpp b/examples/RMCast/Send_Msg/Sender.cpp
index 7d339ed560b..e784b6362c7 100644
--- a/examples/RMCast/Send_Msg/Sender.cpp
+++ b/examples/RMCast/Send_Msg/Sender.cpp
@@ -4,7 +4,7 @@
 
 
 #include <ace/OS.h>
-#include <protocols/ace/RMCast/Socket.h>
+#include <ace/RMCast/Socket.h>
 
 #include <iostream>
 
diff --git a/examples/TMCast/Member/Makefile.am b/examples/TMCast/Member/Makefile.am
index e7179b75440..f2c7d8014cb 100644
--- a/examples/TMCast/Member/Makefile.am
+++ b/examples/TMCast/Member/Makefile.am
@@ -1,32 +1,26 @@
 ##  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
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
 ## Makefile.Member.am 
 
 if BUILD_EXCEPTIONS
 if BUILD_THREADS
-noinst_PROGRAMS += member
+
+noinst_PROGRAMS = member
 
 member_CPPFLAGS = \
   -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR)
+  -I$(ACE_BUILDDIR) \
+  -I$(ACE_ROOT)/protocols
 
 member_SOURCES = \
   member.cpp
 
 member_LDADD = \
- $(top_builddir)/ace/TMCast/libACE_TMCast.la $(top_builddir)/ace/libACE.la
+  ${ACE_BUILDDIR}/protocols/ace/TMCast/libACE_TMCast.la \
+  ${ACE_BUILDDIR}/ace/libACE.la
 
 endif BUILD_THREADS
 endif BUILD_EXCEPTIONS
diff --git a/examples/TMCast/Member/Member.mpc b/examples/TMCast/Member/Member.mpc
index 41372c2abb4..29f274f51f3 100644
--- a/examples/TMCast/Member/Member.mpc
+++ b/examples/TMCast/Member/Member.mpc
@@ -2,5 +2,6 @@
 // $Id$
 
 project: aceexe, tmcast {
+  exename = member
 }
 
diff --git a/examples/TMCast/Member/member.cpp b/examples/TMCast/Member/member.cpp
index d02d227c284..f89c68564ea 100644
--- a/examples/TMCast/Member/member.cpp
+++ b/examples/TMCast/Member/member.cpp
@@ -10,7 +10,7 @@
 #include "ace/OS_NS_time.h"
 #include "ace/OS_NS_string.h"
 
-#include "protocols/ace/TMCast/Group.hpp"
+#include "ace/TMCast/Group.hpp"
 
 class Args {};