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

9 files changed, 73 insertions, 63 deletions

diff --git a/ACEXML/Makefile.am b/ACEXML/Makefile.am
index 68359be6e51..f0541d979c7 100644
--- a/ACEXML/Makefile.am
+++ b/ACEXML/Makefile.am
@@ -6,7 +6,7 @@
 ## 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
 
 SUBDIRS = \
         common \
diff --git a/ACEXML/apps/Makefile.am b/ACEXML/apps/Makefile.am
index fffa2c9b0ed..81f0c9cbd88 100644
--- a/ACEXML/apps/Makefile.am
+++ b/ACEXML/apps/Makefile.am
@@ -6,7 +6,7 @@
 ## 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
 
 SUBDIRS = \
         svcconf
diff --git a/ACEXML/apps/svcconf/Makefile.am b/ACEXML/apps/svcconf/Makefile.am
index af07f4865ab..a65f7cf69d0 100644
--- a/ACEXML/apps/svcconf/Makefile.am
+++ b/ACEXML/apps/svcconf/Makefile.am
@@ -6,15 +6,17 @@
 ## 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@/ACEXML/apps/svcconf
-
-ACE_ROOT = $(top_srcdir)
 ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
 
+nobase_include_HEADERS =
+lib_LTLIBRARIES =
 ## Makefile.ACEXML_XML_Svc_Conf_Parser.am 
-lib_LTLIBRARIES = libACEXML_XML_Svc_Conf_Parser.la
+
+if BUILD_ACEXML
+lib_LTLIBRARIES += libACEXML_XML_Svc_Conf_Parser.la
 
 libACEXML_XML_Svc_Conf_Parser_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -25,21 +27,20 @@ libACEXML_XML_Svc_Conf_Parser_la_SOURCES = \
   Svcconf.cpp \
   Svcconf_Handler.cpp
 
-libACEXML_XML_Svc_Conf_Parser_la_LDFLAGS = \
- -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
-
 libACEXML_XML_Svc_Conf_Parser_la_LIBADD = \
- $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
- $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
- $(ACE_BUILDDIR)/ace/libACE.la
+ $(top_builddir)/ACEXML/parser/parser/libACEXML_Parser.la $(top_builddir)/ACEXML/common/libACEXML.la $(top_builddir)/ace/libACE.la
 
-nobase_include_HEADERS = \
+nobase_include_HEADERS += \
   Svcconf.h \
   Svcconf_Handler.h \
   Svcconf_Handler.i
 
+endif BUILD_ACEXML
+
 ## 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/ACEXML/common/Makefile.am b/ACEXML/common/Makefile.am
index c83a8a832bf..c51b8debcc8 100644
--- a/ACEXML/common/Makefile.am
+++ b/ACEXML/common/Makefile.am
@@ -6,12 +6,10 @@
 ## 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@/ACEXML/common
-
-ACE_ROOT = $(top_srcdir)
 ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
 
 ## Makefile.ACEXML.am 
 lib_LTLIBRARIES = libACEXML.la
@@ -47,9 +45,6 @@ libACEXML_la_SOURCES = \
   XML_Codecs.cpp \
   ZipCharStream.cpp
 
-libACEXML_la_LDFLAGS = \
- -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
-
 libACEXML_la_LIBADD = \
  $(top_builddir)/ace/libACE.la
 
@@ -102,6 +97,8 @@ nobase_include_HEADERS = \
 
 ## 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/ACEXML/examples/Makefile.am b/ACEXML/examples/Makefile.am
index 409b9f3ec45..8a2494ea586 100644
--- a/ACEXML/examples/Makefile.am
+++ b/ACEXML/examples/Makefile.am
@@ -6,7 +6,7 @@
 ## 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
 
 SUBDIRS = \
         SAXPrint
diff --git a/ACEXML/examples/SAXPrint/Makefile.am b/ACEXML/examples/SAXPrint/Makefile.am
index 6228ef3905f..4ba83af5eb5 100644
--- a/ACEXML/examples/SAXPrint/Makefile.am
+++ b/ACEXML/examples/SAXPrint/Makefile.am
@@ -6,13 +6,16 @@
 ## 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
 
-ACE_ROOT = $(top_srcdir)
 ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
 
+noinst_PROGRAMS =
 ## Makefile.SAXPrint.am 
-noinst_PROGRAMS = SAXPrint
+
+if BUILD_ACEXML
+noinst_PROGRAMS += SAXPrint
 
 SAXPrint_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -29,12 +32,14 @@ SAXPrint_SOURCES = \
   SAXPrint_Handler.i
 
 SAXPrint_LDADD = \
- $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
- $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
- $(ACE_BUILDDIR)/ace/libACE.la
+ $(top_builddir)/ACEXML/parser/parser/libACEXML_Parser.la $(top_builddir)/ACEXML/common/libACEXML.la $(top_builddir)/ace/libACE.la
+
+endif BUILD_ACEXML
 
 ## 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/ACEXML/parser/Makefile.am b/ACEXML/parser/Makefile.am
index 844f1c9f735..de38e543937 100644
--- a/ACEXML/parser/Makefile.am
+++ b/ACEXML/parser/Makefile.am
@@ -6,7 +6,7 @@
 ## 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
 
 SUBDIRS = \
         parser
diff --git a/ACEXML/parser/parser/Makefile.am b/ACEXML/parser/parser/Makefile.am
index 20801e9dee6..1904417b2b3 100644
--- a/ACEXML/parser/parser/Makefile.am
+++ b/ACEXML/parser/parser/Makefile.am
@@ -6,12 +6,10 @@
 ## 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@/ACEXML/parser/parser
-
-ACE_ROOT = $(top_srcdir)
 ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
 
 ## Makefile.ACEXML_Parser.am 
 lib_LTLIBRARIES = libACEXML_Parser.la
@@ -27,12 +25,8 @@ libACEXML_Parser_la_SOURCES = \
   ParserContext.cpp \
   ParserInternals.cpp
 
-libACEXML_Parser_la_LDFLAGS = \
- -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
-
 libACEXML_Parser_la_LIBADD = \
- $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
- $(ACE_BUILDDIR)/ace/libACE.la
+ $(top_builddir)/ACEXML/common/libACEXML.la $(top_builddir)/ace/libACE.la
 
 nobase_include_HEADERS = \
   Entity_Manager.h \
@@ -46,6 +40,8 @@ nobase_include_HEADERS = \
 
 ## 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/ACEXML/tests/Makefile.am b/ACEXML/tests/Makefile.am
index 756d1d84fc2..3a6e7a9df21 100644
--- a/ACEXML/tests/Makefile.am
+++ b/ACEXML/tests/Makefile.am
@@ -6,13 +6,16 @@
 ## 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
 
-ACE_ROOT = $(top_srcdir)
 ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
 
+noinst_PROGRAMS =
 ## Makefile.ContentHandler_Test.am 
-noinst_PROGRAMS = ContentHandler_Test
+
+if BUILD_ACEXML
+noinst_PROGRAMS += ContentHandler_Test
 
 ContentHandler_Test_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -23,11 +26,13 @@ ContentHandler_Test_SOURCES = \
   ContentHandler_Test.cpp
 
 ContentHandler_Test_LDADD = \
- $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
- $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
- $(ACE_BUILDDIR)/ace/libACE.la
+ $(top_builddir)/ACEXML/parser/parser/libACEXML_Parser.la $(top_builddir)/ACEXML/common/libACEXML.la $(top_builddir)/ace/libACE.la
+
+endif BUILD_ACEXML
 
 ## Makefile.HttpCharStream_Test.am 
+
+if BUILD_ACEXML
 noinst_PROGRAMS += HttpCharStream_Test
 
 HttpCharStream_Test_CPPFLAGS = \
@@ -39,11 +44,13 @@ HttpCharStream_Test_SOURCES = \
   HttpCharStream_Test.cpp
 
 HttpCharStream_Test_LDADD = \
- $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
- $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
- $(ACE_BUILDDIR)/ace/libACE.la
+ $(top_builddir)/ACEXML/parser/parser/libACEXML_Parser.la $(top_builddir)/ACEXML/common/libACEXML.la $(top_builddir)/ace/libACE.la
+
+endif BUILD_ACEXML
 
 ## Makefile.NamespaceSupport_Test.am 
+
+if BUILD_ACEXML
 noinst_PROGRAMS += NamespaceSupport_Test
 
 NamespaceSupport_Test_CPPFLAGS = \
@@ -55,11 +62,13 @@ NamespaceSupport_Test_SOURCES = \
   NamespaceSupport_Test.cpp
 
 NamespaceSupport_Test_LDADD = \
- $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
- $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
- $(ACE_BUILDDIR)/ace/libACE.la
+ $(top_builddir)/ACEXML/parser/parser/libACEXML_Parser.la $(top_builddir)/ACEXML/common/libACEXML.la $(top_builddir)/ace/libACE.la
+
+endif BUILD_ACEXML
 
 ## Makefile.Transcoder_Test.am 
+
+if BUILD_ACEXML
 noinst_PROGRAMS += Transcoder_Test
 
 Transcoder_Test_CPPFLAGS = \
@@ -71,12 +80,14 @@ Transcoder_Test_SOURCES = \
   Transcoder_Test.cpp
 
 Transcoder_Test_LDADD = \
- $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
- $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
- $(ACE_BUILDDIR)/ace/libACE.la
+ $(top_builddir)/ACEXML/parser/parser/libACEXML_Parser.la $(top_builddir)/ACEXML/common/libACEXML.la $(top_builddir)/ace/libACE.la
+
+endif BUILD_ACEXML
 
 ## 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