Updated Makefiles

34 files changed, 214 insertions, 689 deletions

diff --git a/ace/ATM/Makefile b/ace/ATM/Makefile
index 09481984ace..aeb79691b6b 100644
--- a/ace/ATM/Makefile
+++ b/ace/ATM/Makefile
@@ -5,9 +5,9 @@
 #----------------------------------------------------------------------------
 
 MAKEFILE = Makefile
-LIBOS   = libACE_ATM
-LIB      = $(LIBOS).a
-SHLIB    = $(LIBOS).$(SOEXT)
+LIBNAME   = libACE_ATM
+LIB      = $(LIBNAME).a
+SHLIB    = $(LIBNAME).$(SOEXT)
 
 
 LIB_FILES = \
@@ -40,7 +40,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 INSTALL =
 
 clean:
-	$(RM) -f $(LIBOS).a $(LIBOS).so
+	$(RM) -f $(LIBNAME).a $(LIBNAME).so
 
 #----------------------------------------------------------------------------
 #       Dependencies
diff --git a/ace/Connection/Acceptor.cpp b/ace/Connection/Acceptor.cpp
index 2d9cad5e54f..99ca1366401 100644
--- a/ace/Connection/Acceptor.cpp
+++ b/ace/Connection/Acceptor.cpp
@@ -9,9 +9,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Acceptor.h"
-#include "ace/Handle_Set.h"
-#include "ace/WFMO_Reactor.h"
+#include "ace/Connection/Acceptor.h"
+#include "ace/OS/Handle_Set.h"
+#include "ace/Demux/WFMO_Reactor.h"
 
 ACE_RCSID(ace, Acceptor, "$Id$")
 
diff --git a/ace/Connection/Acceptor.h b/ace/Connection/Acceptor.h
index 63a448f1046..2c5511da0f0 100644
--- a/ace/Connection/Acceptor.h
+++ b/ace/Connection/Acceptor.h
@@ -14,15 +14,15 @@
 #define ACE_ACCEPTOR_H
 #include "ace/pre.h"
 
-#include "ace/Service_Config.h"
+#include "ace/Svcconf/Service_Config.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Service_Object.h"
-#include "ace/Svc_Handler.h"
-#include "ace/Strategies_T.h"
+#include "ace/Svcconf/Service_Object.h"
+#include "ace/Svcconf/Svc_Handler.h"
+#include "ace/Connection/Strategies_T.h"
 
 /**
  * @class ACE_Acceptor
@@ -556,7 +556,7 @@ private:
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Acceptor.cpp"
+#include "ace/Connection/Acceptor.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/ace/Connection/Asynch_Acceptor.cpp b/ace/Connection/Asynch_Acceptor.cpp
index c83faa29252..a27385f2e5e 100644
--- a/ace/Connection/Asynch_Acceptor.cpp
+++ b/ace/Connection/Asynch_Acceptor.cpp
@@ -4,7 +4,7 @@
 #ifndef ACE_ASYNCH_ACCEPTOR_C
 #define ACE_ASYNCH_ACCEPTOR_C
 
-#include "ace/Asynch_Acceptor.h"
+#include "ace/Connection/Asynch_Acceptor.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -15,8 +15,8 @@ ACE_RCSID(ace, Asynch_Acceptor, "$Id$")
 #if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
 // This only works on platforms that support async i/o.
 
-#include "ace/Message_Block.h"
-#include "ace/INET_Addr.h"
+#include "ace/Utils/Message_Block.h"
+#include "ace/IPC/INET_Addr.h"
 
 template <class HANDLER>
 ACE_Asynch_Acceptor<HANDLER>::ACE_Asynch_Acceptor (void)
diff --git a/ace/Connection/Asynch_Acceptor.h b/ace/Connection/Asynch_Acceptor.h
index f2a0db738e9..d110677cd38 100644
--- a/ace/Connection/Asynch_Acceptor.h
+++ b/ace/Connection/Asynch_Acceptor.h
@@ -14,7 +14,7 @@
 #define ACE_ASYNCH_ACCEPTOR_H
 #include "ace/pre.h"
 
-#include "ace/OS.h"
+#include "ace/OS/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,7 +23,7 @@
 #if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
 // This only works on platforms that support async i/o.
 
-#include "ace/Asynch_IO.h"
+#include "ace/Connection/Asynch_IO.h"
 
 // Forward declarations
 class ACE_Message_Block;
@@ -190,7 +190,7 @@ private:
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Asynch_Acceptor.cpp"
+#include "ace/Connection/Asynch_Acceptor.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/ace/Connection/Asynch_IO.cpp b/ace/Connection/Asynch_IO.cpp
index 4fa2b269a90..fce08f24d9a 100644
--- a/ace/Connection/Asynch_IO.cpp
+++ b/ace/Connection/Asynch_IO.cpp
@@ -1,16 +1,16 @@
 // $Id$
 
-#include "ace/Asynch_IO.h"
+#include "ace/Connection/Asynch_IO.h"
 
 ACE_RCSID(ace, Asynch_IO, "$Id$")
 
 #if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))
 // This only works on platforms with Asynchronous IO
 
-#include "ace/Proactor.h"
-#include "ace/Message_Block.h"
-#include "ace/INET_Addr.h"
-#include "ace/Asynch_IO_Impl.h"
+#include "ace/Demux/Proactor.h"
+#include "ace/Utils/Message_Block.h"
+#include "ace/IPC/INET_Addr.h"
+#include "ace/Connection/Asynch_IO_Impl.h"
 
 u_long
 ACE_Asynch_Result::bytes_transferred (void) const
diff --git a/ace/Connection/Asynch_IO.h b/ace/Connection/Asynch_IO.h
index 311650d33ee..6395024f596 100644
--- a/ace/Connection/Asynch_IO.h
+++ b/ace/Connection/Asynch_IO.h
@@ -26,7 +26,7 @@
 #define ACE_ASYNCH_IO_H
 #include "ace/pre.h"
 
-#include "ace/OS.h"
+#include "ace/OS/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
diff --git a/ace/Connection/Asynch_IO_Impl.cpp b/ace/Connection/Asynch_IO_Impl.cpp
index ac079a80994..c85a8dbf346 100644
--- a/ace/Connection/Asynch_IO_Impl.cpp
+++ b/ace/Connection/Asynch_IO_Impl.cpp
@@ -1,13 +1,13 @@
 // $Id$
-#include "ace/OS.h"
-#include "ace/Asynch_IO_Impl.h"
+#include "ace/OS/OS.h"
+#include "ace/Connection/Asynch_IO_Impl.h"
 
 #if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))
 // This only works on Win32 platforms and on Unix platforms supporting
 // aio calls. 
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Asynch_IO_Impl.i"
+#include "ace/Connection/Asynch_IO_Impl.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_Asynch_Result_Impl::~ACE_Asynch_Result_Impl (void)
diff --git a/ace/Connection/Asynch_IO_Impl.h b/ace/Connection/Asynch_IO_Impl.h
index 5137145534d..b1f5a18dce2 100644
--- a/ace/Connection/Asynch_IO_Impl.h
+++ b/ace/Connection/Asynch_IO_Impl.h
@@ -31,7 +31,7 @@
 // This only works on Win32 platforms and on Unix platforms supporting
 // aio calls.
 
-#include "ace/Asynch_IO.h"
+#include "ace/Connection/Asynch_IO.h"
 
 // Forward declaration.
 class ACE_Proactor_Impl;
@@ -676,7 +676,7 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Asynch_IO_Impl.i"
+#include "ace/Connection/Asynch_IO_Impl.i"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_AIO_CALLS  || !ACE_HAS_WINCE && ACE_WIN32 */
diff --git a/ace/Connection/Caching_Strategies_T.cpp b/ace/Connection/Caching_Strategies_T.cpp
index 0d4f389c966..5a1f55d5586 100644
--- a/ace/Connection/Caching_Strategies_T.cpp
+++ b/ace/Connection/Caching_Strategies_T.cpp
@@ -3,11 +3,14 @@
 #ifndef CACHING_STRATEGIES_T_C
 #define CACHING_STRATEGIES_T_C
 
-#include "ace/Caching_Strategies_T.h"
-#include "ace/Log_Msg.h"
+#include "ace/Connection/Caching_Strategies_T.h"
+
+#ifdef ACE_SUBSET_0
+#include "ace/Logging/Log_Msg.h"
+#endif
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Caching_Strategies_T.i"
+#include "ace/Connection/Caching_Strategies_T.i"
 #endif /* __ACE_INLINE__ */
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/ace/Connection/Caching_Strategies_T.h b/ace/Connection/Caching_Strategies_T.h
index 3c6dbef3a8e..8d98f5d7aa8 100644
--- a/ace/Connection/Caching_Strategies_T.h
+++ b/ace/Connection/Caching_Strategies_T.h
@@ -14,8 +14,8 @@
 #define CACHING_STRATEGIES_H
 #include "ace/pre.h"
 
-#include "ace/OS.h"
-#include "ace/Caching_Utility_T.h"
+#include "ace/OS/OS.h"
+#include "ace/Utils/Templates/Caching_Utility_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #define  ACE_LACKS_PRAGMA_ONCE
@@ -522,11 +522,11 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Caching_Strategies_T.i"
+#include "ace/Connection/Caching_Strategies_T.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Caching_Strategies_T.cpp"
+#include "ace/Connection/Caching_Strategies_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/ace/Connection/Connector.cpp b/ace/Connection/Connector.cpp
index 2debc2b48b1..2cc65e0cc6a 100644
--- a/ace/Connection/Connector.cpp
+++ b/ace/Connection/Connector.cpp
@@ -4,7 +4,7 @@
 #ifndef ACE_CONNECTOR_C
 #define ACE_CONNECTOR_C
 
-#include "ace/Connector.h"
+#include "ace/Connection/Connector.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/Connection/Connector.h b/ace/Connection/Connector.h
index 5def25cba94..0078654068d 100644
--- a/ace/Connection/Connector.h
+++ b/ace/Connection/Connector.h
@@ -14,16 +14,16 @@
 #define ACE_CONNECTOR_H
 #include "ace/pre.h"
 
-#include "ace/Service_Config.h"
+#include "ace/Svcconf/Service_Config.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Service_Object.h"
-#include "ace/Map_Manager.h"
-#include "ace/Svc_Handler.h"
-#include "ace/Strategies_T.h"
+#include "ace/Svcconf/Service_Object.h"
+#include "ace/Utils/Templates/Map_Manager.h"
+#include "ace/Svcconf/Svc_Handler.h"
+#include "ace/Connection/Strategies_T.h"
 
 /**
  * @class ACE_Svc_Tuple
@@ -520,7 +520,7 @@ protected:
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Connector.cpp"
+#include "ace/Connection/Connector.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/ace/Connection/LOCK_SOCK_Acceptor.cpp b/ace/Connection/LOCK_SOCK_Acceptor.cpp
index 931216750ae..c0ceac8bf26 100644
--- a/ace/Connection/LOCK_SOCK_Acceptor.cpp
+++ b/ace/Connection/LOCK_SOCK_Acceptor.cpp
@@ -3,8 +3,8 @@
 #ifndef ACE_LOCK_SOCK_ACCEPTOR_CPP
 #define ACE_LOCK_SOCK_ACCEPTOR_CPP
 
-#include "ace/Synch.h"
-#include "ace/LOCK_SOCK_Acceptor.h"
+#include "ace/Threads/Synch.h"
+#include "ace/Connection/LOCK_SOCK_Acceptor.h"
 
 ACE_RCSID(ace, LOCK_SOCK_Acceptor, "$Id$")
 
diff --git a/ace/Connection/LOCK_SOCK_Acceptor.h b/ace/Connection/LOCK_SOCK_Acceptor.h
index 720664e65ff..908bfc58285 100644
--- a/ace/Connection/LOCK_SOCK_Acceptor.h
+++ b/ace/Connection/LOCK_SOCK_Acceptor.h
@@ -14,7 +14,7 @@
 #define ACE_LOCK_SOCK_ACCEPTOR_H
 #include "ace/pre.h"
 
-#include "ace/SOCK_Acceptor.h"
+#include "ace/Sockets/SOCK_Acceptor.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -51,7 +51,7 @@ protected:
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/LOCK_SOCK_Acceptor.cpp"
+#include "ace/Connection/LOCK_SOCK_Acceptor.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/ace/Connection/Makefile b/ace/Connection/Makefile
new file mode 100644
index 00000000000..f82b113dc20
--- /dev/null
+++ b/ace/Connection/Makefile
@@ -0,0 +1,55 @@
+# $Id$
+
+#----------------------------------------------------------------------------
+#       Makefile for the libACE_Connection
+#----------------------------------------------------------------------------
+
+MAKEFILE = Makefile
+LIBNAME   = libACE_Connection
+LIB      = $(LIBNAME).a
+SHLIB    = $(LIBNAME).$(SOEXT)
+
+
+LIB_FILES = \
+	Acceptor\
+	Asynch_Acceptor\
+	Asynch_IO\
+	Asynch_IO_Impl\
+	Caching_Strategies_T\
+	Connector\
+	LOCK_SOCK_Acceptor\
+	POSIX_Asynch_IO\
+	Sock_Connect\
+	Strategies_T\
+	WIN32_Asynch_IO
+
+#----------------------------------------------------------------------------
+#       Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+
+####
+#### ACE_COMPONENTS support.
+####
+FILES += $(LIB_FILES)
+
+LSRC  = $(addsuffix .cpp,$(FILES))
+
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+
+INSTALL =
+
+clean:
+	$(RM) -f $(LIBNAME).a $(LIBNAME).so
+
+#----------------------------------------------------------------------------
+#       Dependencies
+#----------------------------------------------------------------------------
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
diff --git a/ace/Connection/POSIX_Asynch_IO.cpp b/ace/Connection/POSIX_Asynch_IO.cpp
index 010200327b6..d85236cf1aa 100644
--- a/ace/Connection/POSIX_Asynch_IO.cpp
+++ b/ace/Connection/POSIX_Asynch_IO.cpp
@@ -1,18 +1,18 @@
 /* -*- C++ -*- */
 // $Id$
 
-#include "ace/POSIX_Asynch_IO.h"
+#include "ace/Connection/POSIX_Asynch_IO.h"
 
 #if defined (ACE_HAS_AIO_CALLS)
 
-#include "ace/Proactor.h"
-#include "ace/Message_Block.h"
-#include "ace/INET_Addr.h"
-#include "ace/Task_T.h"
-#include "ace/POSIX_Proactor.h"
+#include "ace/Demux/Proactor.h"
+#include "ace/Utils/Message_Block.h"
+#include "ace/IPC/INET_Addr.h"
+#include "ace/Streams/Task_T.h"
+#include "ace/Demux/POSIX_Proactor.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/POSIX_Asynch_IO.i"
+#include "ace/Connection/POSIX_Asynch_IO.i"
 #endif /* __ACE_INLINE__ */
 
 u_long
diff --git a/ace/Connection/POSIX_Asynch_IO.h b/ace/Connection/POSIX_Asynch_IO.h
index 7f9693ab963..64da1e86d0a 100644
--- a/ace/Connection/POSIX_Asynch_IO.h
+++ b/ace/Connection/POSIX_Asynch_IO.h
@@ -20,7 +20,7 @@
 #ifndef ACE_POSIX_ASYNCH_IO_H
 #define ACE_POSIX_ASYNCH_IO_H
 
-#include "ace/OS.h"
+#include "ace/OS/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -28,8 +28,8 @@
 
 #if defined (ACE_HAS_AIO_CALLS)
 
-#include "ace/Asynch_IO_Impl.h"
-#include "ace/Reactor.h"
+#include "ace/Connection/Asynch_IO_Impl.h"
+#include "ace/Demux/Reactor.h"
 
 // Forward declarations
 class ACE_POSIX_SIG_Proactor;
@@ -1725,7 +1725,7 @@ protected:
 
 
 #if defined (__ACE_INLINE__)
-#include "ace/POSIX_Asynch_IO.i"
+#include "ace/Connection/POSIX_Asynch_IO.i"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_AIO_CALLS */
diff --git a/ace/Connection/Sock_Connect.cpp b/ace/Connection/Sock_Connect.cpp
index 8d11bdf2621..e66afbbb7f1 100644
--- a/ace/Connection/Sock_Connect.cpp
+++ b/ace/Connection/Sock_Connect.cpp
@@ -1,11 +1,15 @@
 // $Id$
 
-#include "ace/Sock_Connect.h"
-#include "ace/INET_Addr.h"
+#include "ace/Connection/Sock_Connect.h"
+#include "ace/IPC/INET_Addr.h"
+
+#ifdef ACE_SUBSET_0
 #include "ace/Log_Msg.h"
-#include "ace/Handle_Set.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/SString.h"
+#endif
+
+#include "ace/OS/Handle_Set.h"
+#include "ace/Utils/Templates/Auto_Ptr.h"
+#include "ace/Utils/SString.h"
 
 #if defined (VXWORKS)
 #include /**/ <inetLib.h>
@@ -17,8 +21,8 @@ extern "C" {
 
 #if defined (ACE_HAS_IPV6)
 #  if defined (ACE_HAS_THREADS)
-#    include "ace/Synch.h"
-#    include "ace/Object_Manager.h"
+#    include "ace/Threads/Synch.h"
+#    include "ace/Utils/Object_Manager.h"
 #  endif /* ACE_HAS_THREADS */
 
 // Whether or not ipv6 is turned on in this box
@@ -26,7 +30,7 @@ int ACE_Sock_Connect::ipv6_enabled_ = -1;
 #endif /* ACE_HAS_IPV6 */
 
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "ace/Sock_Connect.i"
+#include "ace/Connection/Sock_Connect.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
 ACE_RCSID(ace, Sock_Connect, "$Id$")
diff --git a/ace/Connection/WIN32_Asynch_IO.cpp b/ace/Connection/WIN32_Asynch_IO.cpp
index 69d504e3792..eb8c1b0c74c 100644
--- a/ace/Connection/WIN32_Asynch_IO.cpp
+++ b/ace/Connection/WIN32_Asynch_IO.cpp
@@ -1,16 +1,16 @@
 // $Id$
 
-#include "ace/WIN32_Asynch_IO.h"
+#include "ace/Connection/WIN32_Asynch_IO.h"
 
 // ACE_RCSID(ace, Asynch_IO, "$Id$")
 
 #if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
 
-#include "ace/WIN32_Proactor.h"
-#include "ace/Message_Block.h"
-#include "ace/Service_Config.h"
-#include "ace/INET_Addr.h"
-#include "ace/Task_T.h"
+#include "ace/Demux/WIN32_Proactor.h"
+#include "ace/Utils/Message_Block.h"
+#include "ace/Svcconf/Service_Config.h"
+#include "ace/IPC/INET_Addr.h"
+#include "ace/Threads/Task_T.h"
 
 u_long
 ACE_WIN32_Asynch_Result::bytes_transferred (void) const
diff --git a/ace/Connection/WIN32_Asynch_IO.h b/ace/Connection/WIN32_Asynch_IO.h
index 8dba2c3cbfc..1048b837c6a 100644
--- a/ace/Connection/WIN32_Asynch_IO.h
+++ b/ace/Connection/WIN32_Asynch_IO.h
@@ -25,7 +25,7 @@
 #define ACE_WIN32_ASYNCH_IO_H
 #include "ace/pre.h"
 
-#include "ace/OS.h"
+#include "ace/OS/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -33,8 +33,8 @@
 
 #if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
 
-#include "ace/Asynch_IO_Impl.h"
-#include "ace/Addr.h"
+#include "ace/Connection/Asynch_IO_Impl.h"
+#include "ace/IPC/Addr.h"
 
 // Forward declaration
 class ACE_WIN32_Proactor;
diff --git a/ace/Demux/Event_Handler.cpp b/ace/Demux/Event_Handler.cpp
index 8c82b408197..06ffbd44fbd 100644
--- a/ace/Demux/Event_Handler.cpp
+++ b/ace/Demux/Event_Handler.cpp
@@ -5,7 +5,7 @@
 #include "ace/Utils/Message_Block.h"
 #include "ace/OS/OS_Errno.h"
 #include "ace/Demux/Reactor.h"
-#include "ace/Demux/Thread_Manager.h"
+#include "ace/Threads/Thread_Manager.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Demux/Event_Handler.i"
diff --git a/ace/Demux/Event_Handler_T.cpp b/ace/Demux/Event_Handler_T.cpp
index f0efd27b43f..487120b410a 100644
--- a/ace/Demux/Event_Handler_T.cpp
+++ b/ace/Demux/Event_Handler_T.cpp
@@ -4,7 +4,7 @@
 #ifndef EVENT_HANDLER_T_C
 #define EVENT_HANDLER_T_C
 
-#include "ace/Event_Handler_T.h"
+#include "ace/Demux/Event_Handler_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -15,7 +15,7 @@ ACE_RCSID(ace, Event_Handler_T, "$Id$")
 #if defined (ACE_HAS_TEMPLATE_TYPEDEFS)
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Event_Handler_T.i"
+#include "ace/Demux/Event_Handler_T.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Event_Handler_T)
diff --git a/ace/Demux/Event_Handler_T.h b/ace/Demux/Event_Handler_T.h
index c6400f93281..eaacfbc8a7a 100644
--- a/ace/Demux/Event_Handler_T.h
+++ b/ace/Demux/Event_Handler_T.h
@@ -14,7 +14,7 @@
 #define ACE_EVENT_HANDLER_T_H
 #include "ace/pre.h"
 
-#include "ace/Event_Handler.h"
+#include "ace/Demux/Event_Handler.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -171,11 +171,11 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Event_Handler_T.i"
+#include "ace/Demux/Event_Handler_T.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Event_Handler_T.cpp"
+#include "ace/Demux/Event_Handler_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/ace/Demux/FlReactor.cpp b/ace/Demux/FlReactor.cpp
index c9a64145ce7..87ff9bd5c90 100644
--- a/ace/Demux/FlReactor.cpp
+++ b/ace/Demux/FlReactor.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "ace/FlReactor.h"
-#include "ace/Synch_T.h"
+#include "ace/Demux/FlReactor.h"
+#include "ace/Threads/Synch_T.h"
 
 ACE_RCSID(ace, FlReactor, "$Id$")
 
diff --git a/ace/Demux/FlReactor.h b/ace/Demux/FlReactor.h
index c9cb7670b0d..aa69102516e 100644
--- a/ace/Demux/FlReactor.h
+++ b/ace/Demux/FlReactor.h
@@ -19,7 +19,7 @@
 #define ACE_FLREACTOR_H
 #include "ace/pre.h"
 
-#include "ace/Select_Reactor.h"
+#include "ace/Demux/Select_Reactor.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -102,7 +102,7 @@ private:
 };
 
 #if defined(__ACE_INLINE__)
-#include "ace/FlReactor.i"
+#include "ace/Demux/FlReactor.i"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_FL */
diff --git a/ace/Demux/Makefile b/ace/Demux/Makefile
index f27d6158751..429d9be4ca3 100644
--- a/ace/Demux/Makefile
+++ b/ace/Demux/Makefile
@@ -5,9 +5,9 @@
 #----------------------------------------------------------------------------
 
 MAKEFILE = Makefile
-LIBOS   = libACE_Demux
-LIB      = $(LIBOS).a
-SHLIB    = $(LIBOS).$(SOEXT)
+LIBNAME   = libACE_Demux
+LIB      = $(LIBNAME).a
+SHLIB    = $(LIBNAME).$(SOEXT)
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
@@ -47,7 +47,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 INSTALL =
 
 clean:
-	$(RM) -f $(LIBOS).a $(LIBOS).so
+	$(RM) -f $(LIBNAME).a $(LIBNAME).so
 
 #----------------------------------------------------------------------------
 #       Local targets
diff --git a/ace/Demux/POSIX_Proactor.cpp b/ace/Demux/POSIX_Proactor.cpp
index 8edad89edf9..488bcd3cd47 100644
--- a/ace/Demux/POSIX_Proactor.cpp
+++ b/ace/Demux/POSIX_Proactor.cpp
@@ -1,16 +1,20 @@
 /* -*- C++ -*- */
 // $Id$
 
-#include "ace/POSIX_Proactor.h"
+#include "ace/Demux/POSIX_Proactor.h"
 
 #if defined (ACE_HAS_AIO_CALLS)
 
-#include "ace/Task_T.h"
-#include "ace/Log_Msg.h"
-#include "ace/Object_Manager.h"
+#include "ace/Streams/Task_T.h"
+
+#ifdef ACE_SUBSET_0
+#include "ace/Logging/Log_Msg.h"
+#endif
+
+#include "ace/Utils/Object_Manager.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/POSIX_Proactor.i"
+#include "ace/Demux/POSIX_Proactor.i"
 #endif /* __ACE_INLINE__ */
 
 # if defined (ACE_HAS_SYSINFO)
diff --git a/ace/Demux/POSIX_Proactor.h b/ace/Demux/POSIX_Proactor.h
index 939157e5d2d..f07a7dd268f 100644
--- a/ace/Demux/POSIX_Proactor.h
+++ b/ace/Demux/POSIX_Proactor.h
@@ -17,16 +17,16 @@
 #ifndef ACE_POSIX_PROACTOR_H
 #define ACE_POSIX_PROACTOR_H
 
-#include "ace/Proactor_Impl.h"
+#include "ace/Demux/Proactor_Impl.h"
 
 #if defined (ACE_HAS_AIO_CALLS)
 // POSIX implementation of Proactor depends on the <aio_> family of
 // system calls.
 
-#include "ace/Free_List.h"
-#include "ace/Pipe.h"
-#include "ace/POSIX_Asynch_IO.h"
-#include "ace/Unbounded_Queue.h"
+#include "ace/Utils/Templates/Free_List.h"
+#include "ace/IPC/Pipe.h"
+#include "ace/Connection/POSIX_Asynch_IO.h"
+#include "ace/Utils/Unbounded_Queue.h"
 
 #define ACE_AIO_MAX_SIZE     2048
 #define ACE_AIO_DEFAULT_SIZE 1024
@@ -582,7 +582,7 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/POSIX_Proactor.i"
+#include "ace/Demux/POSIX_Proactor.i"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_AIO_CALLS */
diff --git a/ace/Demux/Priority_Reactor.cpp b/ace/Demux/Priority_Reactor.cpp
index fd66ba55e7d..9e9b8a3c866 100644
--- a/ace/Demux/Priority_Reactor.cpp
+++ b/ace/Demux/Priority_Reactor.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "ace/Priority_Reactor.h"
-#include "ace/Malloc_T.h"
+#include "ace/Demux/Priority_Reactor.h"
+#include "ace/Memory/Malloc_T.h"
 
 ACE_RCSID(ace, Priority_Reactor, "$Id$")
 
diff --git a/ace/Demux/Priority_Reactor.h b/ace/Demux/Priority_Reactor.h
index 23fa0e3ae24..1778527c285 100644
--- a/ace/Demux/Priority_Reactor.h
+++ b/ace/Demux/Priority_Reactor.h
@@ -14,13 +14,13 @@
 #define ACE_PRIORITY_REACTOR_H
 #include "ace/pre.h"
 
-#include "ace/Unbounded_Queue.h"
+#include "ace/Utils/Unbounded_Queue.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Select_Reactor.h"
+#include "ace/Demux/Select_Reactor.h"
 
 /**
  * @class ACE_Priority_Reactor
diff --git a/ace/Demux/Proactor.cpp b/ace/Demux/Proactor.cpp
index 8fe6c8c982c..12b1ad981f0 100644
--- a/ace/Demux/Proactor.cpp
+++ b/ace/Demux/Proactor.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#include "ace/Proactor.h"
-#include "ace/Proactor_Impl.h"
-#include "ace/Object_Manager.h"
-#include "ace/Task_T.h"
+#include "ace/Demux/Proactor.h"
+#include "ace/Demux/Proactor_Impl.h"
+#include "ace/Utils/Object_Manager.h"
+#include "ace/Streams/Task_T.h"
 #if !defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_ACE_SVCCONF)
-#    include "ace/Service_Config.h"
+#    include "ace/Svcconf/Service_Config.h"
 #  endif /* !ACE_HAS_WINCE && !ACE_LACKS_ACE_SVCCONF */
 
 ACE_RCSID(ace, Proactor, "$Id$")
@@ -13,17 +13,20 @@ ACE_RCSID(ace, Proactor, "$Id$")
 #if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
 // This only works on Win32 platforms and on Unix platforms with aio
 // calls.
-#include "ace/Task_T.h"
-#include "ace/Log_Msg.h"
+#include "ace/Streams/Task_T.h"
+
+#ifdef ACE_SUBSET_0
+#include "ace/Logging/Log_Msg.h"
+#endif
 
 #if defined (ACE_HAS_AIO_CALLS)
-#   include "ace/POSIX_Proactor.h"
+#   include "ace/Demux/POSIX_Proactor.h"
 #else /* !ACE_HAS_AIO_CALLS */
-#   include "ace/WIN32_Proactor.h"
+#   include "ace/Demux/WIN32_Proactor.h"
 #endif /* ACE_HAS_AIO_CALLS */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Proactor.i"
+#include "ace/Demux/Proactor.i"
 #endif /* __ACE_INLINE__ */
 
 // Process-wide ACE_Proactor.
diff --git a/ace/Demux/Proactor.h b/ace/Demux/Proactor.h
index 6209a8ad420..73fc63b25ae 100644
--- a/ace/Demux/Proactor.h
+++ b/ace/Demux/Proactor.h
@@ -17,7 +17,7 @@
 #define ACE_PROACTOR_H
 #include "ace/pre.h"
 
-#include "ace/OS.h"
+#include "ace/OS/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -27,13 +27,13 @@
 // This only works on Win32 platforms and on Unix platforms supporting
 // POSIX aio calls.
 
-#include "ace/Asynch_IO.h"
-#include "ace/Asynch_IO_Impl.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Timer_Queue.h"
-#include "ace/Timer_List.h"
-#include "ace/Timer_Heap.h"
-#include "ace/Timer_Wheel.h"
+#include "ace/Connection/Asynch_IO.h"
+#include "ace/Connection/Asynch_IO_Impl.h"
+#include "ace/Threads/Thread_Manager.h"
+#include "ace/Timer/Timer_Queue.h"
+#include "ace/Timer/Timer_List.h"
+#include "ace/Timer/Timer_Heap.h"
+#include "ace/Timer/Timer_Wheel.h"
 
 // Forward declarations.
 class ACE_Proactor_Impl;
@@ -560,7 +560,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Proactor.i"
+#include "ace/Demux/Proactor.i"
 #endif /* __ACE_INLINE__ */
 
 #else /* NOT WIN32 or POSIX with AIO features. */
diff --git a/ace/Makefile b/ace/Makefile
index b6dd76ff391..3cf435e992f 100644
--- a/ace/Makefile
+++ b/ace/Makefile
@@ -5,309 +5,12 @@
 #----------------------------------------------------------------------------
 
 MAKEFILE = Makefile
-LIBACE   = libACE
-LIB      = $(LIBACE).a
-SHLIB    = $(LIBACE).$(SOEXT)
+#LIBACE   = libACE
+#LIB      = $(LIBACE).a
+#SHLIB    = $(LIBACE).$(SOEXT)
 
-OS_FILES = \
-  OS \
-  OS_Dirent \
-  OS_Memory \
-  OS_QoS \
-  OS_String \
-  OS_TLI \
-  OS_Errno \
-  Base_Thread_Adapter \
-  OS_Thread_Adapter \
-  OS_Log_Msg_Attributes \
-  Thread_Hook \
-  Sched_Params \
-  Handle_Set
-
-UTILS_FILES = \
-  ACE \
-  Active_Map_Manager \
-  Arg_Shifter \
-  ARGV \
-  Capabilities \
-  Containers \
-  Configuration \
-  Configuration_Import_Export \
-  Connection_Recycling_Strategy \
-  Dirent \
-  Dirent_Selector \
-  Dynamic \
-  Flag_Manip \
-  Functor \
-  Get_Opt \
-  Hash_Map_Manager \
-  Hashable \
-  Refcountable \
-  Handle_Ops \
-  Init_ACE \
-  Lib_Find \
-  Message_Block \
-  Method_Request \
-  Notification_Strategy \
-  Object_Manager \
-  Recyclable \
-  Registry \
-  String_Base_Const \
-  SString \
-  Stats \
-  Sample_History
-  #### NOTE:  see below for Filecache.
-LOGGING_FILES = \
-  Dump \
-  Log_Msg \
-  Log_Msg_Callback \
-  Log_Msg_Backend \
-  Log_Msg_IPC \
-  Log_Msg_NT_Event_Log \
-  Log_Msg_UNIX_Syslog \
-  Log_Record \
-  Logging_Strategy \
-  Trace
-THREADS_FILES = \
-  Activation_Queue \
-  Process \
-  Process_Manager \
-  Synch \
-  Synch_Options \
-  Process_Semaphore \
-  Process_Mutex \
-  RW_Process_Mutex \
-  File_Lock \
-  Thread \
-  Thread_Manager \
-  Thread_Adapter \
-  Thread_Exit \
-  Thread_Control \
-  Token
-DEMUX_FILES = \
-  Event_Handler \
-  FlReactor \
-  Msg_WFMO_Reactor \
-  POSIX_Proactor \
-  WIN32_Proactor \
-  Priority_Reactor \
-  Proactor \
-  Reactor \
-  Select_Reactor \
-  Select_Reactor_Base \
-  SUN_Proactor \
-  TP_Reactor \
-  TkReactor \
-  WFMO_Reactor \
-  XtReactor \
-  QtReactor
-CONNECTION_FILES = \
-  Asynch_IO \
-  Asynch_IO_Impl \
-  POSIX_Asynch_IO \
-  WIN32_Asynch_IO
-SOCKETS_FILES = \
-  Addr \
-  INET_Addr \
-  IPC_SAP \
-  LSOCK \
-  LSOCK_Acceptor \
-  LSOCK_CODgram \
-  LSOCK_Connector \
-  LSOCK_Dgram \
-  LSOCK_Stream \
-  SOCK \
-  SOCK_Acceptor \
-  SOCK_CODgram \
-  Sock_Connect \
-  SOCK_Connector \
-  SOCK_Dgram \
-  SOCK_Dgram_Bcast \
-  SOCK_Dgram_Mcast \
-  SOCK_IO \
-  SOCK_Stream
-IPC_FILES = \
-  ATM_Addr \
-  ATM_Acceptor \
-  ATM_Connector \
-  ATM_Params \
-  ATM_QoS \
-  ATM_Stream \
-  XTI_ATM_Mcast \
-  DEV \
-  DEV_Addr \
-  DEV_Connector \
-  DEV_IO \
-  FIFO \
-  FIFO_Recv \
-  FIFO_Recv_Msg \
-  FIFO_Send \
-  FIFO_Send_Msg \
-  FILE_Addr \
-  FILE \
-  FILE_Connector \
-  FILE_IO \
-  IO_SAP \
-  IOStream \
-  Pipe \
-  Signal \
-  SPIPE_Addr \
-  SPIPE \
-  SPIPE_Acceptor \
-  SPIPE_Connector \
-  SPIPE_Stream \
-  SV_Message \
-  SV_Message_Queue \
-  SV_Semaphore_Complex \
-  SV_Semaphore_Simple \
-  SV_Shared_Memory \
-  TLI \
-  TLI_Acceptor \
-  TLI_Connector \
-  TLI_Stream \
-  TTY_IO \
-  UNIX_Addr \
-  UPIPE_Acceptor \
-  UPIPE_Connector \
-  UPIPE_Stream \
-  MEM_Acceptor \
-  MEM_Addr \
-  MEM_Connector \
-  MEM_IO \
-  MEM_SAP \
-  MEM_Stream
-SVCCONF_FILES = \
-  DLL \
-  Dynamic_Service_Base \
-  Parse_Node \
-  Service_Config \
-  Service_Manager \
-  Service_Object \
-  Service_Repository \
-  Service_Types \
-  Service_Templates \
-  Shared_Object \
-  Svc_Conf_l \
-  Svc_Conf_y \
-  Svc_Conf_Lexer_Guard
-STREAMS_FILES = \
-  CDR_Base \
-  CDR_Stream \
-  Codeset_IBM1047 \
-  Message_Queue \
-  Reactor_Notification_Strategy \
-  Task
-MEMORY_FILES = \
-  Based_Pointer_Repository \
-  Malloc \
-  PI_Malloc \
-  Malloc_Allocator \
-  Malloc_Instantiations \
-  Mem_Map \
-  Memory_Pool \
-  Obchunk \
-  Obstack \
-  Read_Buffer \
-  Shared_Memory \
-  Shared_Memory_MM \
-  Shared_Memory_SV
-TIMER_FILES = \
-  Basic_Stats \
-  High_Res_Timer \
-  Profile_Timer \
-  System_Time \
-  Time_Request_Reply \
-  Timeprobe \
-  Timer_Hash \
-  Timer_Heap \
-  Timer_List \
-  Timer_Queue \
-  Timer_Wheel
-TOKEN_FILES = \
-  Local_Tokens \
-  Remote_Tokens \
-  Token_Collection \
-  Token_Invariants \
-  Token_Manager \
-  Token_Request_Reply
-OTHER_FILES = \
-  Local_Name_Space \
-  Name_Proxy \
-  Name_Request_Reply \
-  Name_Space \
-  Naming_Context \
-  Registry_Name_Space \
-  Remote_Name_Space \
-
-TEMPLATE_FILES = \
-           Acceptor \
-           Active_Map_Manager_T \
-	   Array_Base \
-	   Node \
-	   Unbounded_Set \
-	   Unbounded_Queue \
-           Asynch_Acceptor \
-           Auto_IncDec_T \
-           Auto_Ptr \
-           Based_Pointer_T \
-	   Bound_Ptr \
-           Connector \
-           Containers_T \
-           Cache_Map_Manager_T \
-           Cached_Connect_Strategy_T \
-           Caching_Strategies_T \
-           Caching_Utility_T \
-           Cleanup_Strategies_T \
-           Dump_T \
-           Dynamic_Service \
-           Env_Value_T \
-           Event_Handler_T \
-           Free_List \
-           Functor_T \
-           Future \
-           Future_Set \
-           Hash_Map_Manager_T \
-	   Hash_Map_With_Allocator_T \
-           Hash_Cache_Map_Manager_T \
-           IOStream_T \
-	   Intrusive_List \
-	   Intrusive_List_Node \
-           LOCK_SOCK_Acceptor \
-           Local_Name_Space_T \
-           Malloc_T \
-           Managed_Object \
-           Map_Manager \
-           Map_T \
-           Message_Block_T \
-           Message_Queue_T \
-           Module \
-	   Obstack_T \
-           Pair_T \
-           Refcounted_Auto_Ptr \
-           RB_Tree \
-           Select_Reactor_T \
-           Singleton \
-           Strategies_T \
-           Stream \
-           Stream_Modules \
-	   String_Base \
-           Svc_Handler \
-           Synch_T \
-           Task_T \
-           Template_Instantiations \
-	   Test_and_Set \
-           Timeprobe_T \
-           Timer_Hash_T \
-           Timer_Heap_T \
-           Timer_List_T \
-           Timer_Queue_Adapters \
-           Timer_Queue_T \
-           Timer_Wheel_T \
-           Typed_SV_Message \
-           Typed_SV_Message_Queue
 SUBDIRS= \
   ATM \
-  CLASSIX \
   Basic_Types \
   Connection \
   Demux \
@@ -323,164 +26,30 @@ SUBDIRS= \
   Token \
   Utils
 
+all:
+	@for subdir in $(SUBDIRS) ; do \
+		if test -d $$subdir ; \
+		then \
+			echo "Making all in $$subdir"; \
+			( cd $$subdir && $(MAKE) all ) || exit 1 ;\
+		fi ; \
+	done
+
+clean:
+	@for subdir in $(SUBDIRS) ; do \
+		if test -d $$subdir ; \
+		then \
+			echo "Making clean in $$subdir"; \
+			( cd $$subdir && $(MAKE) clean ) || exit 1 ;\
+		fi ; \
+	done
+	$(RM) -rf *.so *.a
+
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-
-ifneq ($(GHS),)
-  ifeq ($(CPU),86)
-    #### With Green Hills for x86 target, compile gethrtime.cpp.
-    FILES += gethrtime
-    LSRC += gethrtime.cpp
-  endif # 86
-endif # GHS
-
-ifeq ($(ssl),1)
-  DIRS += SSL
-endif # ssl
-
-ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
-  ifneq ($(rmcast),0)
-    DIRS += RMCast
-  endif # rmcast
-endif # ACE_HAS_GNUG_PRE_2_8
-
-## Only build the contents of the QoS directory under UNIX
-## if we have the RAPI library installed
-ifeq ($(rapi),1)
-  DIRS += QoS
-endif # rapi
-
-####
-#### Build customization.
-####
-ifndef ACE_COMPONENTS
-  #### Please see docs/ACE-subsets.html for documentation.
-  ACE_COMPONENTS = \
-    OS \
-    Utils \
-    Logging \
-    Threads \
-    Demux \
-    Connection \
-    Sockets \
-    IPC \
-    Svcconf \
-    Streams \
-    Memory \
-    Timer \
-    Token \
-    Other
-endif # ACE_COMPONENTS
-
-ifeq (FOR_TAO,$(ACE_COMPONENTS))
-  #### These ACE components are necessary to support TAO.
-  override ACE_COMPONENTS = \
-    OS \
-    Utils \
-    Logging \
-    Threads \
-    Demux \
-    Connection \
-    Sockets \
-    IPC \
-    Svcconf \
-    Streams \
-    Memory \
-    Timer
-else  # ! FOR_TAO
-  #### TAO doesn't need Filecache.  It costs 14 Kb.
-  UTILS_FILES += Filecache
-endif # ! FOR_TAO
-
-####
-#### ACE_COMPONENTS support.
-####
-ifneq (,$(findstring OS,$(ACE_COMPONENTS)))
-  FILES += $(OS_FILES)
-endif # OS
-
-ifneq (,$(findstring Utils,$(ACE_COMPONENTS)))
-  FILES += $(UTILS_FILES)
-endif # Utils
-
-ifneq (,$(findstring Logging,$(ACE_COMPONENTS)))
-  FILES += $(LOGGING_FILES)
-endif # Logging
-
-ifneq (,$(findstring Threads,$(ACE_COMPONENTS)))
-  FILES += $(THREADS_FILES)
-endif # Threads
-
-ifneq (,$(findstring Demux,$(ACE_COMPONENTS)))
-  FILES += $(DEMUX_FILES)
-endif # Demux
-
-ifneq (,$(findstring Connection,$(ACE_COMPONENTS)))
-  FILES += $(CONNECTION_FILES)
-endif # Connection
-
-ifneq (,$(findstring Sockets,$(ACE_COMPONENTS)))
-  FILES += $(SOCKETS_FILES)
-endif # Sockets
-
-ifneq (,$(findstring IPC,$(ACE_COMPONENTS)))
-  FILES += $(IPC_FILES)
-endif # IPC
-
-ifneq (,$(findstring Timer,$(ACE_COMPONENTS)))
-  FILES += $(TIMER_FILES)
-endif # ! Timer
-
-ifneq (,$(findstring Svcconf,$(ACE_COMPONENTS)))
-  FILES += $(SVCCONF_FILES)
-else # ! Svcconf
-  CCFLAGS += -DACE_LACKS_ACE_SVCCONF
-endif # ! Svcconf
-
-ifneq (,$(findstring Streams,$(ACE_COMPONENTS)))
-  FILES += $(STREAMS_FILES)
-endif # Streams
-
-ifneq (,$(findstring Memory,$(ACE_COMPONENTS)))
-  FILES += $(MEMORY_FILES)
-endif # Memory
-
-ifeq (,$(findstring Token,$(ACE_COMPONENTS)))
-  CCFLAGS += -DACE_LACKS_ACE_TOKEN
-else  # ! Token
-  FILES += $(TOKEN_FILES)
-endif # ! Token
-
-ifeq (,$(findstring Other,$(ACE_COMPONENTS)))
-  CCFLAGS += -DACE_LACKS_ACE_OTHER
-else  # ! Other
-  FILES += $(OTHER_FILES)
-endif # ! Other
-
-ifeq ($(AIX_TEMPLATE_HACK),1)
-  FILES = 0_ACE_All_Src
-  TEMPLATE_FILES = 0_ACE_All_Tmp
-endif
-
-#This is a hack. If the qt_reactor needs to be built we need to run
-#the moc (Meta Object Compiler) on QtReactor.h that would generate
-#QtReactor_moc.cpp. We need to compile this file and add it to the
-#library.
-ifneq ($(qt_reactor),)
-  DEMUX_FILES += QtReactor_moc
-endif #qt_recator
-
-LSRC  = $(addsuffix .cpp,$(FILES))
-
-BUILD += ACE_COMPONENTS
-
-#### Setting ACELIB to null allows it to be used for building shared
-#### libraries, including libACE.$(SOEXT,) on certain platforms.
-ACELIB =
-
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU
@@ -496,119 +65,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 #       Local targets
 #----------------------------------------------------------------------------
 
-.PHONY: ACE_COMPONENTS
-ACE_COMPONENTS:
-	@sh $(ACE_ROOT)/bin/ace_components --ace --set ' $(ACE_COMPONENTS) '
-
-realclean:
-	@sh $(ACE_ROOT)/bin/ace_components --ace --remove
-
-# AIX template compilation speedup hack
-
-ACE_All: 0_ACE_All_Src.cpp 0_ACE_All_Tmp.cpp
-
-# Build ACE before descending into subdirectories.
-all.nested: all.local
-
-0_ACE_All_Src.h:
-	@echo;
-	echo  > $@ "// $@";
-	echo >> $@ "// This file should speed up compilation for AIX. ";
-	echo >> $@ "// It includes all non-template .h-files in one batch.";
-	echo >> $@ "// The .h-files #include those .i-files that are needed.";
-	echo >> $@;
-	for name in $(FILES); do \
-	    echo "#include \"$$name.h\""; \
-	 done >> $@;
-	echo >> $@;
-	echo >> $@ "// EOF";
-
-0_ACE_All_Src.cpp: 0_ACE_All_Src.h
-	@echo;
-	echo >  $@ "// $@";
-	echo >> $@ "// This file should speed up compilation for AIX. ";
-	echo >> $@ "// It includes all non-template .cpp-files in one batch.";
-	echo >> $@ "// The .h-files #include those .i-files that are needed.";
-	echo >> $@;
-	echo >> $@ "#include \"$*.h\"";
-	echo >> $@;
-	for name in $(FILES); do \
-	    echo "#include \"$$name.cpp\""; \
-	  done >> $@;
-	echo >> $@;
-	echo >> $@ "// EOF";
-
-0_ACE_All_Tmp.cpp:
-	@echo;
-	echo >  $@ "// $@";
-	echo >> $@ "// This file should speed up compilation for AIX. ";
-	echo >> $@ "// It includes all _template_ .h-files in one batch. ";
-	echo >> $@ "// Each of these will include any needed template";
-	echo >> $@ "// implementations from .cpp- and .i-files. ";
-	echo >> $@;
-	for name in $(TEMPLATE_FILES); do \
-	    echo "#include \"$$name.cpp\""; \
-	  done >> $@;
-	echo >> $@;
-	echo >> $@ "// EOF";
-
-Svc_Conf_y.cpp: Svc_Conf.y
-	$(YACC) -l -d Svc_Conf.y; \
-	sed -e "s/char \*getenv/char *ace_foo/g" \
-	    -e "s/= getenv/= ACE_OS::getenv/g" \
-	    -e "s/fprintf/ACE_OS::fprintf/g" \
-            -e "s/yy/ace_yy/g" \
-            -e "s/->ace_yyerrno/->yyerrno/g" \
-	    -e "s/YY/ACE_YY/g" \
-            -e "s/Svc_Conf\.tab\.c/Svc_Conf_y.cpp/g" < Svc_Conf.tab.c > /tmp/$@; \
-	cp /tmp/$@ $@; \
-	patch < ../etc/Svc_Conf_y.cpp.diff; \
-	echo '// $$'\I\d'$$' > Svc_Conf_Tokens.h; \
-	cat Svc_Conf.tab.h >> Svc_Conf_Tokens.h; \
-	$(RM) -f /tmp/$@ Svc_Conf.tab.c Svc_Conf.tab.h Svc_Conf_y.cpp.orig;
-
-Svc_Conf_l.cpp: Svc_Conf.l
-	$(LEX) -L -t -I Svc_Conf.l > $@; \
-	sed -e "s/unistd/stdio/g" \
-	    -e "s/yy/ace_yy/g" \
-            -e "s/YY/ACE_YY/g" \
-            -e "s/free( ptr );/free( ACE_MALLOC_T (ptr) );/g" \
-            -e "s/exit( 1 );/ACE_OS::exit( 1 );/g" \
-            -e "s/isatty( fileno(file)/ACE_OS::isatty( fileno (file)/g" \
-            -e "s/int isatty/int nop_isatty/g" \
-            -e "s/realloc( ptr, size );/realloc( ACE_MALLOC_T (ptr), size );/g" \
-            -e "s@#include <stdio\.h>@#include \"ace/OS.h\"@" \
-            -e "s@#include <@#include /**/ <@" \
-            -e "s@ECHO@ACE_SVC_CONF_ECHO@" < $@ > /tmp/$@; \
-	cp /tmp/$@ $@; \
-	patch < ../etc/Svc_Conf_l.cpp.diff; \
-	$(RM) -f /tmp/$@ Svc_Conf_l.cpp.orig;
-
-# Some compilation for the QtReactor stuff. We need to run moc
-# ie. (Meta Object compiler) for our QtReactor.h. So, let's do it
-# here.
-
-ifneq ($(qt_reactor),)
-QtReactor_moc.cpp: QtReactor.h
-	$(MOC) QtReactor.h >QtReactor_moc.cpp
-endif #qt_reactor
-
-ifeq ($(CHORUS),1)
-  ifeq ($(CC),$(GHS_DIR)/build -driver ch68)
-    #### Build this target without -g, because it causes ghs 1.8.8 to core
-    #### dump.
-    $(VDIR)Select_Reactor.o .obj/Select_Reactor.so .shobj/Select_Reactor.o .shobj/Select_Reactor.so:
-	$(COMPILE-NO_DASH_G.cc) -o $@ $<
-  endif # CC
-endif # CHORUS
-
-ifneq ($(GHS),)
-  ifeq ($(CPU),86)
-    $(VDIR)gethrtime.$(OBJEXT):
-	$(MAKE) $@ ghs=0
-  endif # 86
-endif # GHS
-
 #----------------------------------------------------------------------------
 #       Dependencies
 #----------------------------------------------------------------------------