ChangeLogTag: Fri Jun 06 06:39:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>

10 files changed, 55 insertions, 47 deletions

diff --git a/ACEXML/apps/svcconf/Makefile.ACEXML_XML_Svc_Conf_Parser b/ACEXML/apps/svcconf/Makefile.ACEXML_XML_Svc_Conf_Parser
index 92e6c77190d..5019fc1f49b 100644
--- a/ACEXML/apps/svcconf/Makefile.ACEXML_XML_Svc_Conf_Parser
+++ b/ACEXML/apps/svcconf/Makefile.ACEXML_XML_Svc_Conf_Parser
@@ -18,9 +18,10 @@ FILES = \
 LIB   = $(LIB_UNCHECKED)
 SHLIB = $(SHLIB_UNCHECKED)
 
+ACE_SHLIBS = -lACE
+
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 LSRC   = $(addsuffix .cpp, $(FILES))
-ACELIB = -lACE
 
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
@@ -29,8 +30,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 CPPFLAGS     += -I../../..
-
-
 ifeq ($(static_libs),1)
   ifneq ($(LIB),)
     CPPFLAGS += -DACE_AS_STATIC_LIBS
diff --git a/ACEXML/common/Attributes_Def_Builder.cpp b/ACEXML/common/Attributes_Def_Builder.cpp
index d70a80f2925..b8017bc0db2 100644
--- a/ACEXML/common/Attributes_Def_Builder.cpp
+++ b/ACEXML/common/Attributes_Def_Builder.cpp
@@ -15,11 +15,19 @@ ACEXML_Attributes_Def_Builder::~ACEXML_Attributes_Def_Builder ()
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class auto_ptr<ACEXML_Attribute_Def_Builder>;
 template class auto_ptr<ACEXML_Attributes_Def_Builder>;
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
 template class ACE_Auto_Basic_Ptr<ACEXML_Attribute_Def_Builder>;
 template class ACE_Auto_Basic_Ptr<ACEXML_Attributes_Def_Builder>;
+#  endif  /* ACE_LACKS_AUTO_PTR */
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate auto_ptr<ACEXML_Attribute_Def_Builder>
 #pragma instantiate auto_ptr<ACEXML_Attributes_Def_Builder>
-#pragma instantiate ACE_Auto_Basic_Ptr<ACEXML_Attribute_Def_Builder>
-#pragma instantiate ACE_Auto_Basic_Ptr<ACEXML_Attributes_Def_Builder>
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
+#    pragma instantiate ACE_Auto_Basic_Ptr<ACEXML_Attribute_Def_Builder>
+#    pragma instantiate ACE_Auto_Basic_Ptr<ACEXML_Attributes_Def_Builder>
+#  endif  /* ACE_LACKS_AUTO_PTR */
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ACEXML/common/Element_Def_Builder.cpp b/ACEXML/common/Element_Def_Builder.cpp
index 15be5e0feca..77a593c110d 100644
--- a/ACEXML/common/Element_Def_Builder.cpp
+++ b/ACEXML/common/Element_Def_Builder.cpp
@@ -10,8 +10,16 @@ ACEXML_Element_Def_Builder::~ACEXML_Element_Def_Builder ()
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class auto_ptr<ACEXML_Element_Def_Builder>;
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
 template class ACE_Auto_Basic_Ptr<ACEXML_Element_Def_Builder>;
+#  endif  /* ACE_LACKS_AUTO_PTR */
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate auto_ptr<ACEXML_Element_Def_Builder>
-#pragma instantiate ACE_Auto_Basic_Ptr<ACEXML_Element_Def_Builder>
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
+#    pragma instantiate ACE_Auto_Basic_Ptr<ACEXML_Element_Def_Builder>
+#  endif  /* ACE_LACKS_AUTO_PTR */
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ACEXML/common/Makefile.ACEXML b/ACEXML/common/Makefile.ACEXML
index 2d92a03740c..644b83c1e18 100644
--- a/ACEXML/common/Makefile.ACEXML
+++ b/ACEXML/common/Makefile.ACEXML
@@ -9,30 +9,30 @@ SHLIB_UNCHECKED = libACEXML.$(SOEXT)
 
 
 FILES = \
-  SAXExceptions \
-  Attributes_Def_Builder \
   AttributesImpl \
-  Transcode \
-  Mem_Map_Stream \
-  Validator \
-  Exception \
+  Attributes_Def_Builder \
   CharStream \
-  XMLFilterImpl \
+  DefaultHandler \
+  DTD_Manager \
+  Element_Def_Builder \
+  Encoding \
+  Env \
+  Exception \
+  FileCharStream \
+  HttpCharStream \
   InputSource \
   LocatorImpl \
+  Mem_Map_Stream \
   NamespaceSupport \
-  URL_Addr \
+  SAXExceptions \
   StrCharStream \
-  DTD_Manager \
-  DefaultHandler \
-  Env \
-  FileCharStream \
-  Element_Def_Builder \
   StreamFactory \
-  HttpCharStream \
-  ZipCharStream \
-  Encoding \
-  XML_Codecs
+  Transcode \
+  URL_Addr \
+  Validator \
+  XMLFilterImpl \
+  XML_Codecs \
+  ZipCharStream
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -40,9 +40,10 @@ FILES = \
 LIB   = $(LIB_UNCHECKED)
 SHLIB = $(SHLIB_UNCHECKED)
 
+ACE_SHLIBS = -lACE
+
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 LSRC   = $(addsuffix .cpp, $(FILES))
-ACELIB = -lACE
 
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
@@ -51,8 +52,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 CPPFLAGS     += -I../..
-
-
 ifeq ($(shared_libs),1)
   ifneq ($(SHLIB),)
     CPPFLAGS += -DACEXML_BUILD_DLL
diff --git a/ACEXML/examples/SAXPrint/Makefile.SAXPrint b/ACEXML/examples/SAXPrint/Makefile.SAXPrint
index 0ac857c9f99..08138e65810 100644
--- a/ACEXML/examples/SAXPrint/Makefile.SAXPrint
+++ b/ACEXML/examples/SAXPrint/Makefile.SAXPrint
@@ -9,19 +9,20 @@ BIN_UNCHECKED   = SAXPrint
 
 FILES = \
   main \
-  SAXPrint_Handler \
-  Print_Handler
+  Print_Handler \
+  SAXPrint_Handler
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
 
+ACE_SHLIBS = -lACE
+
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 
 BIN    = $(BIN_UNCHECKED)
 
 OBJS   = $(addsuffix .o, $(notdir $(FILES)))
 SRC    = $(addsuffix .cpp, $(FILES))
-ACELIB = -lACE
 
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
@@ -29,8 +30,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 CPPFLAGS     += -I../../..
-
-
 ifeq ($(static_libs),1)
   ifneq ($(LIB),)
     CPPFLAGS += -DACE_AS_STATIC_LIBS
diff --git a/ACEXML/parser/parser/Makefile.ACEXML_Parser b/ACEXML/parser/parser/Makefile.ACEXML_Parser
index b5331fb3d39..a18aabd21fe 100644
--- a/ACEXML/parser/parser/Makefile.ACEXML_Parser
+++ b/ACEXML/parser/parser/Makefile.ACEXML_Parser
@@ -9,8 +9,8 @@ SHLIB_UNCHECKED = libACEXML_Parser.$(SOEXT)
 
 
 FILES = \
-  Parser \
   Entity_Manager \
+  Parser \
   ParserContext \
   ParserInternals
 #----------------------------------------------------------------------------
@@ -20,9 +20,10 @@ FILES = \
 LIB   = $(LIB_UNCHECKED)
 SHLIB = $(SHLIB_UNCHECKED)
 
+ACE_SHLIBS = -lACE
+
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 LSRC   = $(addsuffix .cpp, $(FILES))
-ACELIB = -lACE
 
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
@@ -31,8 +32,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 CPPFLAGS     += -I../../..
-
-
 ifeq ($(shared_libs),1)
   ifneq ($(SHLIB),)
     CPPFLAGS += -DACEXML_PARSER_BUILD_DLL
diff --git a/ACEXML/tests/Makefile.ContentHandler_Test b/ACEXML/tests/Makefile.ContentHandler_Test
index c8bc281ba38..17b5d817598 100644
--- a/ACEXML/tests/Makefile.ContentHandler_Test
+++ b/ACEXML/tests/Makefile.ContentHandler_Test
@@ -13,13 +13,14 @@ FILES = \
 #       Include macros and targets
 #----------------------------------------------------------------------------
 
+ACE_SHLIBS = -lACE
+
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 
 BIN    = $(BIN_UNCHECKED)
 
 OBJS   = $(addsuffix .o, $(notdir $(FILES)))
 SRC    = $(addsuffix .cpp, $(FILES))
-ACELIB = -lACE
 
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
@@ -27,8 +28,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 CPPFLAGS     += -I../..
-
-
 ifeq ($(static_libs),1)
   ifneq ($(LIB),)
     CPPFLAGS += -DACE_AS_STATIC_LIBS
diff --git a/ACEXML/tests/Makefile.HttpCharStream_Test b/ACEXML/tests/Makefile.HttpCharStream_Test
index a73727b16ba..1f2222de2c1 100644
--- a/ACEXML/tests/Makefile.HttpCharStream_Test
+++ b/ACEXML/tests/Makefile.HttpCharStream_Test
@@ -13,13 +13,14 @@ FILES = \
 #       Include macros and targets
 #----------------------------------------------------------------------------
 
+ACE_SHLIBS = -lACE
+
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 
 BIN    = $(BIN_UNCHECKED)
 
 OBJS   = $(addsuffix .o, $(notdir $(FILES)))
 SRC    = $(addsuffix .cpp, $(FILES))
-ACELIB = -lACE
 
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
@@ -27,8 +28,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 CPPFLAGS     += -I../..
-
-
 ifeq ($(static_libs),1)
   ifneq ($(LIB),)
     CPPFLAGS += -DACE_AS_STATIC_LIBS
diff --git a/ACEXML/tests/Makefile.NamespaceSupport_Test b/ACEXML/tests/Makefile.NamespaceSupport_Test
index 07fe1c5997f..fbc97b12e3b 100644
--- a/ACEXML/tests/Makefile.NamespaceSupport_Test
+++ b/ACEXML/tests/Makefile.NamespaceSupport_Test
@@ -13,13 +13,14 @@ FILES = \
 #       Include macros and targets
 #----------------------------------------------------------------------------
 
+ACE_SHLIBS = -lACE
+
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 
 BIN    = $(BIN_UNCHECKED)
 
 OBJS   = $(addsuffix .o, $(notdir $(FILES)))
 SRC    = $(addsuffix .cpp, $(FILES))
-ACELIB = -lACE
 
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
@@ -27,8 +28,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 CPPFLAGS     += -I../..
-
-
 ifeq ($(static_libs),1)
   ifneq ($(LIB),)
     CPPFLAGS += -DACE_AS_STATIC_LIBS
diff --git a/ACEXML/tests/Makefile.Transcoder_Test b/ACEXML/tests/Makefile.Transcoder_Test
index 04c74e8d766..e055dafdd26 100644
--- a/ACEXML/tests/Makefile.Transcoder_Test
+++ b/ACEXML/tests/Makefile.Transcoder_Test
@@ -13,13 +13,14 @@ FILES = \
 #       Include macros and targets
 #----------------------------------------------------------------------------
 
+ACE_SHLIBS = -lACE
+
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 
 BIN    = $(BIN_UNCHECKED)
 
 OBJS   = $(addsuffix .o, $(notdir $(FILES)))
 SRC    = $(addsuffix .cpp, $(FILES))
-ACELIB = -lACE
 
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
@@ -27,8 +28,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 CPPFLAGS     += -I../..
-
-
 ifeq ($(static_libs),1)
   ifneq ($(LIB),)
     CPPFLAGS += -DACE_AS_STATIC_LIBS