ChangeLogTag:Fri Nov 12 17:23:41 2004 Steve Huston <shuston@riverace.com>

4 files changed, 34 insertions, 26 deletions

diff --git a/protocols/ace/HTBP/Makefile.am b/protocols/ace/HTBP/Makefile.am
index 0fb6995d9d5..ce3fb3e2a1a 100644
--- a/protocols/ace/HTBP/Makefile.am
+++ b/protocols/ace/HTBP/Makefile.am
@@ -1,6 +1,12 @@
 ##  Process this file with automake to create Makefile.in
-
-includedir = @includedir@/ace/HTBP
+##
+## $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)
@@ -27,7 +33,7 @@ libACE_HTBP_la_SOURCES = \
   HTBP_Stream.cpp
 
 libACE_HTBP_la_LIBADD = \
-  $(ACE_BUILDDIR)/ace/libACE.la
+ $(top_builddir)/ace/libACE.la
 
 nobase_include_HEADERS = \
   HTBP_Addr.h \
diff --git a/protocols/ace/Makefile.am b/protocols/ace/Makefile.am
index 9780904a10a..501680c6fab 100644
--- a/protocols/ace/Makefile.am
+++ b/protocols/ace/Makefile.am
@@ -1,4 +1,13 @@
 ##  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 = \
-	HTBP
+        HTBP
+
diff --git a/protocols/ace/RMCast/Makefile.am b/protocols/ace/RMCast/Makefile.am
index a9b8fb207ea..583424190a7 100644
--- a/protocols/ace/RMCast/Makefile.am
+++ b/protocols/ace/RMCast/Makefile.am
@@ -6,16 +6,13 @@
 ## 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 -hierarchy -make_coexistence -exclude build,Kokyu
+## /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
 
-includedir = @includedir@/ace/RMCast
-
-ACE_ROOT = $(top_srcdir)
 ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
 
 nobase_include_HEADERS =
 lib_LTLIBRARIES =
-
 ## Makefile.RMCast.am 
 
 if BUILD_RMCAST
@@ -53,11 +50,8 @@ libACE_RMCast_la_SOURCES = \
   RMCast_UDP_Reliable_Sender.cpp \
   RMCast_Worker.cpp
 
-libACE_RMCast_la_LDFLAGS = \
- -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
-
 libACE_RMCast_la_LIBADD = \
- $(ACE_BUILDDIR)/ace/libACE.la
+ $(top_builddir)/ace/libACE.la
 
 nobase_include_HEADERS += \
   RMCast.h \
@@ -119,6 +113,8 @@ EXTRA_DIST = \
 
 ## Clean up template repositories, etc.
 clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
 	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/protocols/ace/TMCast/Makefile.am b/protocols/ace/TMCast/Makefile.am
index 7704dcbd29e..78b90a7e1c3 100644
--- a/protocols/ace/TMCast/Makefile.am
+++ b/protocols/ace/TMCast/Makefile.am
@@ -6,16 +6,13 @@
 ## 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 -hierarchy -make_coexistence -exclude build,Kokyu
+## /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
 
-includedir = @includedir@/ace/TMCast
-
-ACE_ROOT = $(top_srcdir)
 ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
 
 nobase_include_HEADERS =
 lib_LTLIBRARIES =
-
 ## Makefile.TMCast.am 
 
 if BUILD_EXCEPTIONS
@@ -29,13 +26,11 @@ libTMCast_la_CPPFLAGS = \
 
 libTMCast_la_SOURCES = \
   Group.cpp \
+  MTQueue.cpp \
   Protocol.cpp
 
-libTMCast_la_LDFLAGS = \
- -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
-
 libTMCast_la_LIBADD = \
- $(ACE_BUILDDIR)/ace/libACE.la
+ $(top_builddir)/ace/libACE.la
 
 nobase_include_HEADERS += \
   Export.hpp \
@@ -53,6 +48,8 @@ endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
 clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
 	-rm -rf ptrepository SunWS_cache Templates.DB