Finished Sub-directory building

6 files changed, 132 insertions, 4 deletions

diff --git a/ace/Makefile b/ace/Makefile
index 023c74ba980..6b4e8c5c40a 100644
--- a/ace/Makefile
+++ b/ace/Makefile
@@ -11,18 +11,20 @@ MAKEFILE = Makefile
 
 SUBDIRS= \
   ATM \
-  Basic_Types \
   Connection \
   Demux \
   IPC \
   Logging \
   Memory \
   OS \
+  Other \
   QoS \
   RMCast \
   SSL \
+  Streams \
   Svcconf \
   Threads \
+  Timer \
   Token \
   Utils 
 
diff --git a/ace/OS/Init_ACE.h b/ace/OS/Init_ACE.h
index b383faf799d..5f1217eefce 100644
--- a/ace/OS/Init_ACE.h
+++ b/ace/OS/Init_ACE.h
@@ -17,7 +17,7 @@
 #define ACE_INIT_ACE_H
 #include "ace/pre.h"
 
-#include "OS.h"
+#include "ace/OS/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -58,7 +58,7 @@ private:
 };
 
 #if !defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "Init_ACE.i"
+#include "ace/OS/Init_ACE.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
 #include "ace/post.h"
diff --git a/ace/OS/OS.h b/ace/OS/OS.h
index 5d1d0583abb..bfaad1b97b5 100644
--- a/ace/OS/OS.h
+++ b/ace/OS/OS.h
@@ -7095,7 +7095,7 @@ extern "C" ACE_OS_Export void ace_mutex_lock_cleanup_adapter (void *args);
 # if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) && !defined (ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER)
 
 #   if !defined (ACE_HAS_MINIMAL_ACE_OS)
-#     include "ace/Object_Manager.h"
+#     include "ace/Utils/Object_Manager.h"
 #   endif /* ! ACE_HAS_MINIMAL_ACE_OS */
 
 // Rename "main ()" on platforms that don't allow it to be called "main ()".
diff --git a/ace/Other/Makefile b/ace/Other/Makefile
new file mode 100755
index 00000000000..4b2f3fd13d9
--- /dev/null
+++ b/ace/Other/Makefile
@@ -0,0 +1,63 @@
+# $Id$
+
+#----------------------------------------------------------------------------
+#       Makefile for the libACE_Other
+#----------------------------------------------------------------------------
+
+MAKEFILE = Makefile
+LIB_NAME   = libACE_Other
+LIB      = $(LIB_NAME).a
+SHLIB    = $(LIB_NAME).$(SOEXT)
+
+
+FILES = \
+	Local_Name_Space\
+	Local_Name_Space_T\
+	Msg_WFMO_Reactor\
+	Name_Proxy\
+	Name_Request_Reply\
+	Name_Space\
+	Naming_Context\
+	Registry_Name_Space\
+	Remote_Name_Space\
+	TP_Reactor\
+	XtReactor
+	
+#----------------------------------------------------------------------------
+#       Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+
+####
+#### ACE_COMPONENTS support.
+####
+
+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 $(LIB_NAME).a $(LIB_NAME).so
+
+#----------------------------------------------------------------------------
+#       Local targets
+#----------------------------------------------------------------------------
+
+
+
+#----------------------------------------------------------------------------
+#       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/Streams/Makefile b/ace/Streams/Makefile
new file mode 100755
index 00000000000..bdf46c9ace1
--- /dev/null
+++ b/ace/Streams/Makefile
@@ -0,0 +1,63 @@
+# $Id$
+
+#----------------------------------------------------------------------------
+#       Makefile for the libACE_Streams
+#----------------------------------------------------------------------------
+
+MAKEFILE = Makefile
+LIB_NAME   = libACE_Streams
+LIB      = $(LIB_NAME).a
+SHLIB    = $(LIB_NAME).$(SOEXT)
+
+
+FILES = \
+	CDR_Base\
+	CDR_Stream\
+	Codeset_IBM1047\
+	Message_Queue\
+	Message_Queue_T\
+	Module\
+	Notification_Strategy\
+	Read_Buffer\
+	Stream\
+	Stream_Modules\
+	Task\
+	Task_T\
+	Typed_SV_Message\
+	Typed_SV_Message_Queue
+
+#----------------------------------------------------------------------------
+#       Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+
+####
+#### ACE_COMPONENTS support.
+####
+
+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 $(LIB_NAME).a $(LIB_NAME).so
+
+#----------------------------------------------------------------------------
+#       Local targets
+#----------------------------------------------------------------------------
+
+
+
+#----------------------------------------------------------------------------
+#       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/Utils/libACE_Utils.a b/ace/Utils/libACE_Utils.a
index 21d80fe132e..767dc680825 100644
--- a/ace/Utils/libACE_Utils.a
+++ b/ace/Utils/libACE_Utils.a