ChangeLogTag: Wed Jan 5 09:25:49 2005 Jeff Parsons <j.parsons@vanderbilt.edu>

8 files changed, 385 insertions, 417 deletions

diff --git a/ChangeLog b/ChangeLog
index 48046566c35..e4ecd055c0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+Wed Jan  5 09:25:49 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * ace/ace.mpc:
+        * ace/codecs.mpb:
+        * ace/filecache.mpb:
+        * ace/other.mpb:
+        * ace/svcconf.mpb:
+        * ace/token.mpb:
+        * ace/uuid.mpb:
+        
+          Removed the extra nested braces related to ACE_COMPONENTS
+          that create "subdirectories" in VC project files. In makefiles,
+          these "components" can be separately compiled but not linked,
+          so the feature is not used on any platform. In VC projects,
+          the extra level of folders makes source and header files
+          much harder to locate in the GUI environment.
+
 Wed Jan  5 14:34:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/Dev_Poll_Reactor.cpp:
diff --git a/ace/ace.mpc b/ace/ace.mpc
index 7f251355452..886a214e293 100644
--- a/ace/ace.mpc
+++ b/ace/ace.mpc
@@ -7,9 +7,6 @@ project(ACE) : acedefaults, aceversion, core, qt_reactor, other, codecs, token,
   dynamicflags = ACE_BUILD_DLL
   install      = $(ACE_ROOT)/lib
 
-  // This mpc file could be greatly simplified by putting the separate components
-  // in subdirectories.
-
   // Old OS files.  put these back and remove the OS_NS*, Cleanup.cpp, and
   // Object_Manager_Base.cpp to improve compile times at the cost of
   // footprint. dhinton
@@ -20,379 +17,344 @@ project(ACE) : acedefaults, aceversion, core, qt_reactor, other, codecs, token,
   //Synch.cpp
 
   Source_Files(ACE_COMPONENTS) {
-    ACE_OS {
-      Basic_Types.cpp
-      Time_Value.cpp
-      Cleanup.cpp
-      Object_Manager_Base.cpp
-      OS_main.cpp
-      OS_NS_arpa_inet.cpp
-      OS_NS_ctype.cpp
-      OS_NS_dirent.cpp
-      OS_NS_dlfcn.cpp
-      OS_NS_errno.cpp
-      OS_NS_fcntl.cpp
-      OS_NS_math.cpp
-      OS_NS_netdb.cpp
-      OS_NS_poll.cpp
-      OS_NS_pwd.cpp
-      OS_NS_regex.cpp
-      OS_NS_signal.cpp
-      OS_NS_stdio.cpp
-      OS_NS_stdlib.cpp
-      OS_NS_string.cpp
-      OS_NS_strings.cpp
-      OS_NS_stropts.cpp
-      OS_NS_sys_mman.cpp
-      OS_NS_sys_msg.cpp
-      OS_NS_sys_resource.cpp
-      OS_NS_sys_select.cpp
-      OS_NS_sys_shm.cpp
-      OS_NS_sys_socket.cpp
-      OS_NS_sys_stat.cpp
-      OS_NS_sys_time.cpp
-      OS_NS_sys_uio.cpp
-      OS_NS_sys_utsname.cpp
-      OS_NS_sys_wait.cpp
-      OS_NS_Thread.cpp
-      OS_NS_time.cpp
-      OS_NS_unistd.cpp
-      OS_NS_wchar.cpp
-      OS_QoS.cpp
-      OS_TLI.cpp
-      OS_Errno.cpp
-      ARGV.cpp
-      Argv_Type_Converter.cpp
-      Base_Thread_Adapter.cpp
-      OS_Thread_Adapter.cpp
-      OS_Log_Msg_Attributes.cpp
-      Thread_Hook.cpp
-      Sched_Params.cpp
-      Handle_Set.cpp
-      Copy_Disabled.cpp
-      Date_Time.cpp
-      gethrtime.cpp
-    }
-
-    Utils {
-      ACE.cpp
-      ACE_crc32.cpp
-      ACE_crc_ccitt.cpp
-      Active_Map_Manager.cpp
-      Arg_Shifter.cpp
-      Capabilities.cpp
-      Containers.cpp
-      Configuration.cpp
-      Configuration_Import_Export.cpp
-      Dirent.cpp
-      Dirent_Selector.cpp
-      Dynamic.cpp
-      Flag_Manip.cpp
-      Framework_Component.cpp
-      Functor.cpp
-      Functor_String.cpp
-      Get_Opt.cpp
-      Hash_Map_Manager.cpp
-      Connection_Recycling_Strategy.cpp
-      Hashable.cpp
-      Notification_Strategy.cpp
-      Recyclable.cpp
-      Refcountable.cpp
-      Handle_Ops.cpp
-      Init_ACE.cpp
-      Lib_Find.cpp
-      Message_Block.cpp
-      Method_Request.cpp
-      Object_Manager.cpp
-      Registry.cpp
-      String_Base_Const.cpp
-      SString.cpp
-      Stats.cpp
-      Container_Instantiations.cpp
-      Sample_History.cpp
-    }
-
-    Logging {
-      Dump.cpp
-      Log_Msg.cpp
-      Log_Msg_Callback.cpp
-      Log_Msg_Backend.cpp
-      Log_Msg_IPC.cpp
-      Log_Msg_NT_Event_Log.cpp
-      Log_Msg_UNIX_Syslog.cpp
-      Log_Record.cpp
-      Logging_Strategy.cpp
-      Trace.cpp
-    }
-
-    Threads {
-      Activation_Queue.cpp
-      Atomic_Op.cpp
-      Process.cpp
-      Process_Manager.cpp
-      TSS_Adapter.cpp
-      Auto_Event.cpp
-      Manual_Event.cpp
-      Barrier.cpp
-      Condition_Thread_Mutex.cpp
-      Condition_Recursive_Thread_Mutex.cpp
-      Event.cpp
-      Lock.cpp
-      Mutex.cpp
-      RW_Mutex.cpp
-      RW_Thread_Mutex.cpp
-      Recursive_Thread_Mutex.cpp
-      Semaphore.cpp
-      Thread_Mutex.cpp
-      Thread_Semaphore.cpp
-      Synch_Options.cpp
-      Process_Semaphore.cpp
-      Process_Mutex.cpp
-      RW_Process_Mutex.cpp
-      File_Lock.cpp
-      Thread.cpp
-      Thread_Manager.cpp
-      Thread_Adapter.cpp
-      Thread_Exit.cpp
-      Thread_Control.cpp
-      Token.cpp
-    }
-
-    Demux {
-      Event_Handler.cpp
-      FlReactor.cpp
-      Msg_WFMO_Reactor.cpp
-      POSIX_Proactor.cpp
-      POSIX_CB_Proactor.cpp
-      WIN32_Proactor.cpp
-      Priority_Reactor.cpp
-      Proactor.cpp
-      Reactor.cpp
-      Select_Reactor.cpp
-      Select_Reactor_Base.cpp
-      SUN_Proactor.cpp
-      Dev_Poll_Reactor.cpp
-      TP_Reactor.cpp
-      TkReactor.cpp
-      WFMO_Reactor.cpp
-      XtReactor.cpp
-      QtReactor.cpp
-    }
-
-    Connection {
-      Asynch_IO.cpp
-      Asynch_IO_Impl.cpp
-      Asynch_Pseudo_Task.cpp
-      POSIX_Asynch_IO.cpp
-      WIN32_Asynch_IO.cpp
-    }
-
-    Sockets {
-      Addr.cpp
-      INET_Addr.cpp
-      IPC_SAP.cpp
-      ICMP_Socket.cpp
-      LSOCK.cpp
-      LSOCK_Acceptor.cpp
-      LSOCK_CODgram.cpp
-      LSOCK_Connector.cpp
-      LSOCK_Dgram.cpp
-      LSOCK_Stream.cpp
-      Multihomed_INET_Addr.cpp
-      Ping_Socket.cpp
-      SOCK.cpp
-      SOCK_Acceptor.cpp
-      SOCK_CODgram.cpp
-      Sock_Connect.cpp
-      SOCK_Connector.cpp
-      SOCK_Dgram.cpp
-      SOCK_Dgram_Bcast.cpp
-      SOCK_Dgram_Mcast.cpp
-      SOCK_IO.cpp
-      SOCK_SEQPACK_Acceptor.cpp
-      SOCK_SEQPACK_Association.cpp
-      SOCK_SEQPACK_Connector.cpp
-      SOCK_Stream.cpp
-    }
-
-    IPC {
-      ATM_Addr.cpp
-      ATM_Acceptor.cpp
-      ATM_Connector.cpp
-      ATM_Params.cpp
-      ATM_QoS.cpp
-      ATM_Stream.cpp
-      XTI_ATM_Mcast.cpp
-      DEV.cpp
-      DEV_Addr.cpp
-      DEV_Connector.cpp
-      DEV_IO.cpp
-      FIFO.cpp
-      FIFO_Recv.cpp
-      FIFO_Recv_Msg.cpp
-      FIFO_Send.cpp
-      FIFO_Send_Msg.cpp
-      FILE_Addr.cpp
-      FILE.cpp
-      FILE_Connector.cpp
-      FILE_IO.cpp
-      IO_SAP.cpp
-      IOStream.cpp
-      Pipe.cpp
-      Signal.cpp
-      SPIPE_Addr.cpp
-      SPIPE.cpp
-      SPIPE_Acceptor.cpp
-      SPIPE_Connector.cpp
-      SPIPE_Stream.cpp
-      SV_Message.cpp
-      SV_Message_Queue.cpp
-      SV_Semaphore_Complex.cpp
-      SV_Semaphore_Simple.cpp
-      SV_Shared_Memory.cpp
-      TLI.cpp
-      TLI_Acceptor.cpp
-      TLI_Connector.cpp
-      TLI_Stream.cpp
-      TTY_IO.cpp
-      UNIX_Addr.cpp
-      UPIPE_Acceptor.cpp
-      UPIPE_Connector.cpp
-      UPIPE_Stream.cpp
-      MEM_Acceptor.cpp
-      MEM_Addr.cpp
-      MEM_Connector.cpp
-      MEM_IO.cpp
-      MEM_SAP.cpp
-      MEM_Stream.cpp
-    }
-
-    Streams {
-      CDR_Base.cpp
-      CDR_Stream.cpp
-      Codeset_IBM1047.cpp
-      Codeset_Registry.cpp
-      Codeset_Registry_db.cpp
-      Message_Queue.cpp
-      Reactor_Notification_Strategy.cpp
-      Task.cpp
-    }
-
-    Memory {
-      Based_Pointer_Repository.cpp
-      Malloc.cpp
-      PI_Malloc.cpp
-      Local_Memory_Pool.cpp
-      MMAP_Memory_Pool.cpp
-      Malloc_Allocator.cpp
-      Malloc_Instantiations.cpp
-      Mem_Map.cpp
-      Obchunk.cpp
-      Obstack.cpp
-      Pagefile_Memory_Pool.cpp
-      Read_Buffer.cpp
-      Sbrk_Memory_Pool.cpp
-      Shared_Memory.cpp
-      Shared_Memory_MM.cpp
-      Shared_Memory_SV.cpp
-      Shared_Memory_Pool.cpp
-    }
-
-    Timer {
-      Basic_Stats.cpp
-      High_Res_Timer.cpp
-      Profile_Timer.cpp
-      System_Time.cpp
-      Time_Request_Reply.cpp
-      Timeprobe.cpp
-      Timer_Hash.cpp
-      Timer_Heap.cpp
-      Timer_List.cpp
-      Timer_Queue.cpp
-      Timer_Wheel.cpp
-    }
-
-    Metrics {
-      Metrics_Cache.cpp
-    }
+    ACE.cpp
+    ACE_crc_ccitt.cpp
+    ACE_crc32.cpp
+    Activation_Queue.cpp
+    Active_Map_Manager.cpp
+    Addr.cpp
+    Arg_Shifter.cpp
+    ARGV.cpp
+    Argv_Type_Converter.cpp
+    Asynch_IO.cpp
+    Asynch_IO_Impl.cpp
+    Asynch_Pseudo_Task.cpp
+    ATM_Acceptor.cpp
+    ATM_Addr.cpp
+    ATM_Connector.cpp
+    ATM_Params.cpp
+    ATM_QoS.cpp
+    ATM_Stream.cpp
+    Atomic_Op.cpp
+    Auto_Event.cpp
+    Barrier.cpp
+    Base_Thread_Adapter.cpp
+    Based_Pointer_Repository.cpp
+    Basic_Stats.cpp
+    Basic_Types.cpp
+    Capabilities.cpp
+    CDR_Base.cpp
+    CDR_Stream.cpp
+    Cleanup.cpp
+    Codeset_IBM1047.cpp
+    Codeset_Registry.cpp
+    Codeset_Registry_db.cpp
+    Condition_Recursive_Thread_Mutex.cpp
+    Condition_Thread_Mutex.cpp
+    Configuration.cpp
+    Configuration_Import_Export.cpp
+    Connection_Recycling_Strategy.cpp
+    Container_Instantiations.cpp
+    Containers.cpp
+    Copy_Disabled.cpp
+    Date_Time.cpp
+    DEV.cpp
+    DEV_Addr.cpp
+    DEV_Connector.cpp
+    DEV_IO.cpp
+    Dev_Poll_Reactor.cpp
+    Dirent.cpp
+    Dirent_Selector.cpp
+    Dump.cpp
+    Dynamic.cpp
+    Event.cpp
+    Event_Handler.cpp
+    FIFO.cpp
+    FIFO_Recv.cpp
+    FIFO_Recv_Msg.cpp
+    FIFO_Send.cpp
+    FIFO_Send_Msg.cpp
+    FILE.cpp
+    FILE_Addr.cpp
+    FILE_Connector.cpp
+    FILE_IO.cpp
+    File_Lock.cpp
+    Flag_Manip.cpp
+    FlReactor.cpp
+    Framework_Component.cpp
+    Functor.cpp
+    Functor_String.cpp
+    Get_Opt.cpp
+    gethrtime.cpp
+    Handle_Ops.cpp
+    Handle_Set.cpp
+    Hash_Map_Manager.cpp
+    Hashable.cpp
+    High_Res_Timer.cpp
+    ICMP_Socket.cpp
+    INET_Addr.cpp
+    Init_ACE.cpp
+    IO_SAP.cpp
+    IOStream.cpp
+    IPC_SAP.cpp
+    Lib_Find.cpp
+    Local_Memory_Pool.cpp
+    Lock.cpp
+    Log_Msg.cpp
+    Log_Msg_Backend.cpp
+    Log_Msg_Callback.cpp
+    Log_Msg_IPC.cpp
+    Log_Msg_NT_Event_Log.cpp
+    Log_Msg_UNIX_Syslog.cpp
+    Log_Record.cpp
+    Logging_Strategy.cpp
+    LSOCK.cpp
+    LSOCK_Acceptor.cpp
+    LSOCK_CODgram.cpp
+    LSOCK_Connector.cpp
+    LSOCK_Dgram.cpp
+    LSOCK_Stream.cpp
+    Malloc.cpp
+    Malloc_Allocator.cpp
+    Malloc_Instantiations.cpp
+    Manual_Event.cpp
+    MEM_Acceptor.cpp
+    MEM_Addr.cpp
+    MEM_Connector.cpp
+    MEM_IO.cpp
+    Mem_Map.cpp
+    MEM_SAP.cpp
+    MEM_Stream.cpp
+    Message_Block.cpp
+    Message_Queue.cpp
+    Method_Request.cpp
+    Metrics_Cache.cpp
+    MMAP_Memory_Pool.cpp
+    Msg_WFMO_Reactor.cpp
+    Multihomed_INET_Addr.cpp
+    Mutex.cpp
+    Notification_Strategy.cpp
+    Obchunk.cpp
+    Object_Manager.cpp
+    Object_Manager_Base.cpp
+    Obstack.cpp
+    OS_Errno.cpp
+    OS_Log_Msg_Attributes.cpp
+    OS_main.cpp
+    OS_NS_arpa_inet.cpp
+    OS_NS_ctype.cpp
+    OS_NS_dirent.cpp
+    OS_NS_dlfcn.cpp
+    OS_NS_errno.cpp
+    OS_NS_fcntl.cpp
+    OS_NS_math.cpp
+    OS_NS_netdb.cpp
+    OS_NS_poll.cpp
+    OS_NS_pwd.cpp
+    OS_NS_regex.cpp
+    OS_NS_signal.cpp
+    OS_NS_stdio.cpp
+    OS_NS_stdlib.cpp
+    OS_NS_string.cpp
+    OS_NS_strings.cpp
+    OS_NS_stropts.cpp
+    OS_NS_sys_mman.cpp
+    OS_NS_sys_msg.cpp
+    OS_NS_sys_resource.cpp
+    OS_NS_sys_select.cpp
+    OS_NS_sys_shm.cpp
+    OS_NS_sys_socket.cpp
+    OS_NS_sys_stat.cpp
+    OS_NS_sys_time.cpp
+    OS_NS_sys_uio.cpp
+    OS_NS_sys_utsname.cpp
+    OS_NS_sys_wait.cpp
+    OS_NS_Thread.cpp
+    OS_NS_time.cpp
+    OS_NS_unistd.cpp
+    OS_NS_wchar.cpp
+    OS_QoS.cpp
+    OS_Thread_Adapter.cpp
+    OS_TLI.cpp
+    Pagefile_Memory_Pool.cpp
+    PI_Malloc.cpp
+    Ping_Socket.cpp
+    Pipe.cpp
+    POSIX_Asynch_IO.cpp
+    POSIX_CB_Proactor.cpp
+    POSIX_Proactor.cpp
+    Priority_Reactor.cpp
+    Proactor.cpp
+    Process.cpp
+    Process_Manager.cpp
+    Process_Mutex.cpp
+    Process_Semaphore.cpp
+    Profile_Timer.cpp
+    QtReactor.cpp
+    Reactor.cpp
+    Reactor_Notification_Strategy.cpp
+    Read_Buffer.cpp
+    Recursive_Thread_Mutex.cpp
+    Recyclable.cpp
+    Refcountable.cpp
+    Registry.cpp
+    RW_Mutex.cpp
+    RW_Process_Mutex.cpp
+    RW_Thread_Mutex.cpp
+    Sample_History.cpp
+    Sbrk_Memory_Pool.cpp
+    Sched_Params.cpp
+    Select_Reactor.cpp
+    Select_Reactor_Base.cpp
+    Semaphore.cpp
+    Shared_Memory.cpp
+    Shared_Memory_MM.cpp
+    Shared_Memory_Pool.cpp
+    Shared_Memory_SV.cpp
+    Signal.cpp
+    SOCK.cpp
+    SOCK_Acceptor.cpp
+    SOCK_CODgram.cpp
+    Sock_Connect.cpp
+    SOCK_Connector.cpp
+    SOCK_Dgram.cpp
+    SOCK_Dgram_Bcast.cpp
+    SOCK_Dgram_Mcast.cpp
+    SOCK_IO.cpp
+    SOCK_SEQPACK_Acceptor.cpp
+    SOCK_SEQPACK_Association.cpp
+    SOCK_SEQPACK_Connector.cpp
+    SOCK_Stream.cpp
+    SPIPE.cpp
+    SPIPE_Acceptor.cpp
+    SPIPE_Addr.cpp
+    SPIPE_Connector.cpp
+    SPIPE_Stream.cpp
+    SString.cpp
+    Stats.cpp
+    String_Base_Const.cpp
+    SUN_Proactor.cpp
+    SV_Message.cpp
+    SV_Message_Queue.cpp
+    SV_Semaphore_Complex.cpp
+    SV_Semaphore_Simple.cpp
+    SV_Shared_Memory.cpp
+    Synch_Options.cpp
+    System_Time.cpp
+    Task.cpp
+    Thread.cpp
+    Thread_Adapter.cpp
+    Thread_Control.cpp
+    Thread_Exit.cpp
+    Thread_Hook.cpp
+    Thread_Manager.cpp
+    Thread_Mutex.cpp
+    Thread_Semaphore.cpp
+    Time_Request_Reply.cpp
+    Time_Value.cpp    
+    Timeprobe.cpp
+    Timer_Hash.cpp
+    Timer_Heap.cpp
+    Timer_List.cpp
+    Timer_Queue.cpp
+    Timer_Wheel.cpp
+    TkReactor.cpp
+    TLI.cpp
+    TLI_Acceptor.cpp
+    TLI_Connector.cpp
+    TLI_Stream.cpp
+    Token.cpp
+    TP_Reactor.cpp
+    Trace.cpp
+    TSS_Adapter.cpp
+    TTY_IO.cpp
+    UNIX_Addr.cpp
+    UPIPE_Acceptor.cpp
+    UPIPE_Connector.cpp
+    UPIPE_Stream.cpp
+    WFMO_Reactor.cpp
+    WIN32_Asynch_IO.cpp
+    WIN32_Proactor.cpp
+    XTI_ATM_Mcast.cpp
+    XtReactor.cpp
   }
 
   Template_Files {
-      Acceptor.cpp
-      Active_Map_Manager_T.cpp
-      Array_Base.cpp
-      Asynch_Acceptor.cpp
-      Asynch_Connector.cpp
-      Atomic_Op_T.cpp
-      Auto_Functor.cpp
-      Auto_IncDec_T.cpp
-      Auto_Ptr.cpp
-      Based_Pointer_T.cpp
-      Cache_Map_Manager_T.cpp
-      Cached_Connect_Strategy_T.cpp
-      Caching_Strategies_T.cpp
-      Caching_Utility_T.cpp
-      Cleanup_Strategies_T.cpp
-      Condition_T.cpp
-      Connector.cpp
-      Containers_T.cpp
-      Dump_T.cpp
-      Dynamic_Service.cpp
-      Env_Value_T.cpp
-      Event_Handler_T.cpp
-      Framework_Component_T.cpp
-      Free_List.cpp
-      Functor_T.cpp
-      Future.cpp
-      Future_Set.cpp
-      Guard_T.cpp
-      Hash_Cache_Map_Manager_T.cpp
-      Hash_Map_Manager_T.cpp
-      Hash_Map_With_Allocator_T.cpp
-      IOStream_T.cpp
-      Intrusive_List.cpp
-      Intrusive_List_Node.cpp
-      LOCK_SOCK_Acceptor.cpp
-      Local_Name_Space_T.cpp
-      Lock_Adapter_T.cpp
-      Malloc_T.cpp
-      Managed_Object.cpp
-      Map_Manager.cpp
-      Map_T.cpp
-      Message_Block_T.cpp
-      Message_Queue_T.cpp
-      Module.cpp
-      Node.cpp
-      Obstack_T.cpp
-      Pair_T.cpp
-      RB_Tree.cpp
-      Reverse_Lock_T.cpp
-      Select_Reactor_T.cpp
-      Singleton.cpp
-      Strategies_T.cpp
-      Stream.cpp
-      Stream_Modules.cpp
-      String_Base.cpp
-      Svc_Handler.cpp
-      Synch_T.cpp
-      TSS_T.cpp
-      Task_Ex_T.cpp
-      Task_T.cpp
-      Template_Instantiations.cpp
-      Test_and_Set.cpp
-      Timeprobe_T.cpp
-      Timer_Hash_T.cpp
-      Timer_Heap_T.cpp
-      Timer_List_T.cpp
-      Timer_Queue_Adapters.cpp
-      Timer_Queue_T.cpp
-      Timer_Wheel_T.cpp
-      Typed_SV_Message.cpp
-      Typed_SV_Message_Queue.cpp
-      Unbounded_Queue.cpp
-      Unbounded_Set.cpp
-      Unbounded_Set_Ex.cpp
-      Vector_T.cpp
+    Acceptor.cpp
+    Active_Map_Manager_T.cpp
+    Array_Base.cpp
+    Asynch_Acceptor.cpp
+    Asynch_Connector.cpp
+    Atomic_Op_T.cpp
+    Auto_Functor.cpp
+    Auto_IncDec_T.cpp
+    Auto_Ptr.cpp
+    Based_Pointer_T.cpp
+    Cache_Map_Manager_T.cpp
+    Cached_Connect_Strategy_T.cpp
+    Caching_Strategies_T.cpp
+    Caching_Utility_T.cpp
+    Cleanup_Strategies_T.cpp
+    Condition_T.cpp
+    Connector.cpp
+    Containers_T.cpp
+    Dump_T.cpp
+    Dynamic_Service.cpp
+    Env_Value_T.cpp
+    Event_Handler_T.cpp
+    Framework_Component_T.cpp
+    Free_List.cpp
+    Functor_T.cpp
+    Future.cpp
+    Future_Set.cpp
+    Guard_T.cpp
+    Hash_Cache_Map_Manager_T.cpp
+    Hash_Map_Manager_T.cpp
+    Hash_Map_With_Allocator_T.cpp
+    IOStream_T.cpp
+    Intrusive_List.cpp
+    Intrusive_List_Node.cpp
+    LOCK_SOCK_Acceptor.cpp
+    Local_Name_Space_T.cpp
+    Lock_Adapter_T.cpp
+    Malloc_T.cpp
+    Managed_Object.cpp
+    Map_Manager.cpp
+    Map_T.cpp
+    Message_Block_T.cpp
+    Message_Queue_T.cpp
+    Module.cpp
+    Node.cpp
+    Obstack_T.cpp
+    Pair_T.cpp
+    RB_Tree.cpp
+    Reverse_Lock_T.cpp
+    Select_Reactor_T.cpp
+    Singleton.cpp
+    Strategies_T.cpp
+    Stream.cpp
+    Stream_Modules.cpp
+    String_Base.cpp
+    Svc_Handler.cpp
+    Synch_T.cpp
+    TSS_T.cpp
+    Task_Ex_T.cpp
+    Task_T.cpp
+    Template_Instantiations.cpp
+    Test_and_Set.cpp
+    Timeprobe_T.cpp
+    Timer_Hash_T.cpp
+    Timer_Heap_T.cpp
+    Timer_List_T.cpp
+    Timer_Queue_Adapters.cpp
+    Timer_Queue_T.cpp
+    Timer_Wheel_T.cpp
+    Typed_SV_Message.cpp
+    Typed_SV_Message_Queue.cpp
+    Unbounded_Queue.cpp
+    Unbounded_Set.cpp
+    Unbounded_Set_Ex.cpp
+    Vector_T.cpp
   }
 
   Inline_Files {
@@ -492,6 +454,7 @@ project(ACE) : acedefaults, aceversion, core, qt_reactor, other, codecs, token,
     README
     ../VERSION
   }
+  
   verbatim(gnuace, local) {
     "Svc_Conf_y.cpp: Svc_Conf.y"
     "	$(YACC) -l -d Svc_Conf.y"
diff --git a/ace/codecs.mpb b/ace/codecs.mpb
index 2acc9343db7..d8c85fffddb 100644
--- a/ace/codecs.mpb
+++ b/ace/codecs.mpb
@@ -3,8 +3,6 @@
 
 feature(ace_codecs) {
   Source_Files(ACE_COMPONENTS) {
-    Codecs {
-      Codecs.cpp
-    }
+    Codecs.cpp
   }
 }
diff --git a/ace/filecache.mpb b/ace/filecache.mpb
index a1b94c41fef..f5da84a3314 100644
--- a/ace/filecache.mpb
+++ b/ace/filecache.mpb
@@ -3,8 +3,6 @@
 
 feature(ace_filecache) {
   Source_Files(ACE_COMPONENTS) {
-    Filecache {
-      Filecache.cpp
-    }
+    Filecache.cpp
   }
 }
diff --git a/ace/other.mpb b/ace/other.mpb
index a2f0015b0db..9599ab8282b 100644
--- a/ace/other.mpb
+++ b/ace/other.mpb
@@ -3,15 +3,13 @@
 
 feature(ace_other) {
   Source_Files(ACE_COMPONENTS) {
-    Other {
-      Local_Name_Space.cpp
-      Name_Proxy.cpp
-      Name_Request_Reply.cpp
-      Name_Space.cpp
-      Naming_Context.cpp
-      Registry_Name_Space.cpp
-      Remote_Name_Space.cpp
-      NT_Service.cpp
-    }
+    Local_Name_Space.cpp
+    Name_Proxy.cpp
+    Name_Request_Reply.cpp
+    Name_Space.cpp
+    Naming_Context.cpp
+    Registry_Name_Space.cpp
+    Remote_Name_Space.cpp
+    NT_Service.cpp
   }
 }
diff --git a/ace/svcconf.mpb b/ace/svcconf.mpb
index 5f5ba112e86..c05fd56ce09 100644
--- a/ace/svcconf.mpb
+++ b/ace/svcconf.mpb
@@ -5,22 +5,20 @@ feature(ace_svcconf) {
   macros += ACE_HAS_ACE_SVCCONF
 
   Source_Files(ACE_COMPONENTS) {
-    Svcconf {
-      DLL.cpp
-      DLL_Manager.cpp
-      Dynamic_Service_Base.cpp
-      Parse_Node.cpp
-      Service_Config.cpp
-      Service_Manager.cpp
-      Service_Object.cpp
-      Service_Repository.cpp
-      Service_Types.cpp
-      Service_Templates.cpp
-      Shared_Object.cpp
-      Svc_Conf_l.cpp
-      Svc_Conf_y.cpp
-      Svc_Conf_Lexer_Guard.cpp
-      XML_Svc_Conf.cpp
-    }
+    DLL.cpp
+    DLL_Manager.cpp
+    Dynamic_Service_Base.cpp
+    Parse_Node.cpp
+    Service_Config.cpp
+    Service_Manager.cpp
+    Service_Object.cpp
+    Service_Repository.cpp
+    Service_Types.cpp
+    Service_Templates.cpp
+    Shared_Object.cpp
+    Svc_Conf_l.cpp
+    Svc_Conf_y.cpp
+    Svc_Conf_Lexer_Guard.cpp
+    XML_Svc_Conf.cpp
   }
 }
diff --git a/ace/token.mpb b/ace/token.mpb
index 7795ec54328..e2a03f6edc8 100644
--- a/ace/token.mpb
+++ b/ace/token.mpb
@@ -5,13 +5,11 @@ feature(ace_token) {
   macros += ACE_HAS_ACE_TOKEN
 
   Source_Files(ACE_COMPONENTS) {
-    Token {
-      Local_Tokens.cpp
-      Remote_Tokens.cpp
-      Token_Collection.cpp
-      Token_Invariants.cpp
-      Token_Manager.cpp
-      Token_Request_Reply.cpp
-    }
+    Local_Tokens.cpp
+    Remote_Tokens.cpp
+    Token_Collection.cpp
+    Token_Invariants.cpp
+    Token_Manager.cpp
+    Token_Request_Reply.cpp
   }
 }
diff --git a/ace/uuid.mpb b/ace/uuid.mpb
index a7f9db9eb64..3357a6e61b8 100644
--- a/ace/uuid.mpb
+++ b/ace/uuid.mpb
@@ -3,8 +3,6 @@
 
 feature(ace_uuid) {
   Source_Files(ACE_COMPONENTS) {
-    UUID {
-      UUID.cpp
-    }
+    UUID.cpp
   }
 }