[svn] * Restore make dist.

--HG--
branch : trunk

11 files changed, 971 insertions, 91 deletions

diff --git a/Makefile.am b/Makefile.am
index 44e649a5598..e8cddd41a13 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,39 +20,9 @@
 SUBDIRS = dep doc src
 
 ## Additional files to include when running 'make dist'
-# Win32 project workspace for Visual Studio .NET 2003
-EXTRA_DIST = \
-	win/mangosdVC71.sln \
-	win/VC71/framework.vcproj \
-	win/VC71/game.vcproj \
-	win/VC71/TrinityCore.vcproj \
-	win/VC71/TrinityRealm.vcproj \
-	win/VC71/shared.vcproj \
-	win/VC71/zlib.vcproj \
-	win/VC71/g3dlite.vcproj \
-	win/VC71/zthread.vcproj
-
-# Win32 project workspace for Visual Studio .NET 2005
-EXTRA_DIST += \
-	win/mangosdVC80.sln \
-	win/VC80/framework.vcproj \
-	win/VC80/game.vcproj \
-	win/VC80/TrinityCore.vcproj \
-	win/VC80/TrinityRealm.vcproj \
-	win/VC80/shared.vcproj \
-	win/VC80/zlib.vcproj \
-	win/VC80/g3dlite.vcproj \
-	win/VC80/zthread.vcproj
-
-# Win32 project workspace for Visual Studio .NET 2008
-EXTRA_DIST += \
-	win/mangosdVC90.sln \
-	win/VC90/framework.vcproj \
-	win/VC90/game.vcproj \
-	win/VC90/TrinityCore.vcproj \
-	win/VC90/TrinityRealm.vcproj \
-	win/VC90/shared.vcproj \
-	win/VC90/zlib.vcproj \
-	win/VC90/g3dlite.vcproj \
-	win/VC90/zthread.vcproj
+EXTRA_DIST = win contrib sql
+
+
+
+
 
diff --git a/configure.ac b/configure.ac
index 2b986a3c438..1ae64778152 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ AC_CONFIG_SRCDIR([src/shared/Base.cpp])
 ## Prelude, basic settings for Automake
 #  Turn on all warnings and error messages, and enforce GNU
 #  standards for the package.
-AM_INIT_AUTOMAKE([-Wall -Werror gnu])
+AM_INIT_AUTOMAKE([-Wall -Werror gnu tar-pax])
 AM_MAINTAINER_MODE
 
 ## Prevent the configure script from continuing any further if
@@ -258,10 +258,10 @@ else
 fi
 
 if test X$tri_need_to_build_ace = Xyes; then
-   CXXFLAGS="-I\$(top_srcdir)/dep/ACE_wrappers -I\$(top_builddir)/dep/ACE_wrappers $CXXFLAGS"
-   ACE_LIBS="\$(top_builddir)/dep/ACE_wrappers/ace/libACE.la"
+   TRINI_INCLUDES="-I\$(top_srcdir)/dep/ACE_wrappers -I\$(top_builddir)/dep/ACE_wrappers $TRINI_INCLUDES"
+   TRINI_LIBS="\$(top_builddir)/dep/ACE_wrappers/ace/libACE.la $TRINI_LIBS"
 else
-   ACE_LIBS="-lACE"
+   TRINI_LIBS="-lACE $TRINI_LIBS"
 fi
 
 AM_CONDITIONAL([TRI_BUILD_ACE], [test X$tri_need_to_build_ace = Xyes])
@@ -278,7 +278,8 @@ AC_SUBST(DOXYGEN)
 AC_SUBST(MANGOSD_DEBUG_INFO)
 AC_SUBST(MANGOSD_ENABLE_CLI)
 AC_SUBST(MANGOSD_ENABLE_RA)
-AC_SUBST(ACE_LIBS)
+AC_SUBST(TRINI_INCLUDES)
+AC_SUBST(TRINI_LIBS)
 
 ## Set output files.
 AC_CONFIG_HEADERS([config.h])
diff --git a/dep/ACE_wrappers/ace/Makefile.am b/dep/ACE_wrappers/ace/Makefile.am
index 5910646eee5..5b621a17bb1 100644
--- a/dep/ACE_wrappers/ace/Makefile.am
+++ b/dep/ACE_wrappers/ace/Makefile.am
@@ -332,6 +332,912 @@ libACE_la_SOURCES = \
 libACE_la_LDFLAGS = \
  -release @ACE_VERSION_NAME@
 
+EXTRA_DIST = \
+  ace.rc
+
+EXTRA_DIST += \
+  ACE.h \
+  ACE.inl \
+  ACE_export.h \
+  ARGV.cpp \
+  ARGV.h \
+  ARGV.inl \
+  ATM_Acceptor.h \
+  ATM_Acceptor.inl \
+  ATM_Addr.h \
+  ATM_Addr.inl \
+  ATM_Connector.h \
+  ATM_Connector.inl \
+  ATM_Params.h \
+  ATM_Params.inl \
+  ATM_QoS.h \
+  ATM_QoS.inl \
+  ATM_Stream.h \
+  ATM_Stream.inl \
+  Acceptor.cpp \
+  Acceptor.h \
+  Activation_Queue.h \
+  Activation_Queue.inl \
+  Active_Map_Manager.h \
+  Active_Map_Manager.inl \
+  Active_Map_Manager_T.cpp \
+  Active_Map_Manager_T.h \
+  Active_Map_Manager_T.inl \
+  Addr.h \
+  Addr.inl \
+  Arg_Shifter.cpp \
+  Arg_Shifter.h \
+  Argv_Type_Converter.h \
+  Argv_Type_Converter.inl \
+  Array.h \
+  Array_Base.cpp \
+  Array_Base.h \
+  Array_Base.inl \
+  Array_Map.cpp \
+  Array_Map.h \
+  Array_Map.inl \
+  Assert.h \
+  Asynch_Acceptor.cpp \
+  Asynch_Acceptor.h \
+  Asynch_Connector.cpp \
+  Asynch_Connector.h \
+  Asynch_IO.h \
+  Asynch_IO_Impl.h \
+  Asynch_IO_Impl.inl \
+  Asynch_Pseudo_Task.h \
+  Atomic_Op.h \
+  Atomic_Op.inl \
+  Atomic_Op_Sparc.h \
+  Atomic_Op_T.cpp \
+  Atomic_Op_T.h \
+  Atomic_Op_T.inl \
+  Auto_Event.h \
+  Auto_Event.inl \
+  Auto_Functor.cpp \
+  Auto_Functor.h \
+  Auto_Functor.inl \
+  Auto_IncDec_T.cpp \
+  Auto_IncDec_T.h \
+  Auto_IncDec_T.inl \
+  Auto_Ptr.cpp \
+  Auto_Ptr.h \
+  Auto_Ptr.inl \
+  Barrier.h \
+  Barrier.inl \
+  Base_Thread_Adapter.h \
+  Base_Thread_Adapter.inl \
+  Based_Pointer_Repository.h \
+  Based_Pointer_T.cpp \
+  Based_Pointer_T.h \
+  Based_Pointer_T.inl \
+  Basic_Stats.h \
+  Basic_Stats.inl \
+  Basic_Types.h \
+  Basic_Types.inl \
+  Bound_Ptr.h \
+  Bound_Ptr.inl \
+  CDR_Base.h \
+  CDR_Base.inl \
+  CDR_Size.h \
+  CDR_Size.inl \
+  CDR_Stream.h \
+  CDR_Stream.inl \
+  CORBA_macros.h \
+  Cache_Map_Manager_T.cpp \
+  Cache_Map_Manager_T.h \
+  Cache_Map_Manager_T.inl \
+  Cached_Connect_Strategy_T.cpp \
+  Cached_Connect_Strategy_T.h \
+  Caching_Strategies_T.cpp \
+  Caching_Strategies_T.h \
+  Caching_Strategies_T.inl \
+  Caching_Utility_T.cpp \
+  Caching_Utility_T.h \
+  Capabilities.h \
+  Capabilities.inl \
+  Cleanup.h \
+  Cleanup.inl \
+  Cleanup_Strategies_T.cpp \
+  Cleanup_Strategies_T.h \
+  Codecs.h \
+  Codeset_IBM1047.h \
+  Codeset_Registry.h \
+  Codeset_Registry.inl \
+  Condition_Recursive_Thread_Mutex.h \
+  Condition_T.cpp \
+  Condition_T.h \
+  Condition_T.inl \
+  Condition_Thread_Mutex.h \
+  Condition_Thread_Mutex.inl \
+  Configuration.h \
+  Configuration.inl \
+  Configuration_Import_Export.h \
+  Connection_Recycling_Strategy.h \
+  Connector.cpp \
+  Connector.h \
+  Containers.h \
+  Containers.inl \
+  Containers_T.cpp \
+  Containers_T.h \
+  Containers_T.inl \
+  Copy_Disabled.h \
+  Countdown_Time.h \
+  DEV.h \
+  DEV.inl \
+  DEV_Addr.h \
+  DEV_Addr.inl \
+  DEV_Connector.h \
+  DEV_Connector.inl \
+  DEV_IO.h \
+  DEV_IO.inl \
+  DLL.h \
+  DLL_Manager.h \
+  Date_Time.h \
+  Date_Time.inl \
+  Default_Constants.h \
+  Dev_Poll_Reactor.h \
+  Dev_Poll_Reactor.inl \
+  Dirent.h \
+  Dirent.inl \
+  Dirent_Selector.h \
+  Dirent_Selector.inl \
+  Dump.h \
+  Dump_T.cpp \
+  Dump_T.h \
+  Dynamic.h \
+  Dynamic.inl \
+  Dynamic_Message_Strategy.h \
+  Dynamic_Message_Strategy.inl \
+  Dynamic_Service.cpp \
+  Dynamic_Service.h \
+  Dynamic_Service.inl \
+  Dynamic_Service_Base.h \
+  Dynamic_Service_Dependency.h \
+  Encoding_Converter.h \
+  Encoding_Converter_Factory.h \
+  Env_Value_T.cpp \
+  Env_Value_T.h \
+  Env_Value_T.inl \
+  Event.h \
+  Event.inl \
+  Event_Handler.h \
+  Event_Handler.inl \
+  Event_Handler_T.cpp \
+  Event_Handler_T.h \
+  Event_Handler_T.inl \
+  Exception_Macros.h \
+  FIFO.h \
+  FIFO.inl \
+  FIFO_Recv.h \
+  FIFO_Recv.inl \
+  FIFO_Recv_Msg.h \
+  FIFO_Recv_Msg.inl \
+  FIFO_Send.h \
+  FIFO_Send.inl \
+  FIFO_Send_Msg.h \
+  FIFO_Send_Msg.inl \
+  FILE.h \
+  FILE.inl \
+  FILE_Addr.h \
+  FILE_Addr.inl \
+  FILE_Connector.h \
+  FILE_Connector.inl \
+  FILE_IO.h \
+  FILE_IO.inl \
+  File_Lock.h \
+  File_Lock.inl \
+  Filecache.h \
+  Flag_Manip.h \
+  Flag_Manip.inl \
+  Framework_Component.h \
+  Framework_Component.inl \
+  Framework_Component_T.cpp \
+  Framework_Component_T.h \
+  Free_List.cpp \
+  Free_List.h \
+  Functor.h \
+  Functor.inl \
+  Functor_String.h \
+  Functor_String.inl \
+  Functor_T.cpp \
+  Functor_T.h \
+  Functor_T.inl \
+  Future.cpp \
+  Future.h \
+  Future_Set.cpp \
+  Future_Set.h \
+  Get_Opt.h \
+  Get_Opt.inl \
+  Global_Macros.h \
+  Guard_T.cpp \
+  Guard_T.h \
+  Guard_T.inl \
+  Handle_Gobbler.h \
+  Handle_Gobbler.inl \
+  Handle_Ops.h \
+  Handle_Set.h \
+  Handle_Set.inl \
+  Hash_Cache_Map_Manager_T.cpp \
+  Hash_Cache_Map_Manager_T.h \
+  Hash_Cache_Map_Manager_T.inl \
+  Hash_Map_Manager.h \
+  Hash_Map_Manager_T.cpp \
+  Hash_Map_Manager_T.h \
+  Hash_Map_Manager_T.inl \
+  Hash_Map_With_Allocator_T.cpp \
+  Hash_Map_With_Allocator_T.h \
+  Hash_Map_With_Allocator_T.inl \
+  Hash_Multi_Map_Manager_T.cpp \
+  Hash_Multi_Map_Manager_T.h \
+  Hash_Multi_Map_Manager_T.inl \
+  Hashable.h \
+  Hashable.inl \
+  High_Res_Timer.h \
+  High_Res_Timer.inl \
+  ICMP_Socket.h \
+  INET_Addr.h \
+  INET_Addr.inl \
+  IOStream.h \
+  IOStream_T.cpp \
+  IOStream_T.h \
+  IOStream_T.inl \
+  IO_Cntl_Msg.h \
+  IO_Cntl_Msg.inl \
+  IO_SAP.h \
+  IO_SAP.inl \
+  IPC_SAP.h \
+  IPC_SAP.inl \
+  If_Then_Else.h \
+  Init_ACE.h \
+  Intrusive_Auto_Ptr.cpp \
+  Intrusive_Auto_Ptr.h \
+  Intrusive_Auto_Ptr.inl \
+  Intrusive_List.cpp \
+  Intrusive_List.h \
+  Intrusive_List.inl \
+  Intrusive_List_Node.cpp \
+  Intrusive_List_Node.h \
+  Intrusive_List_Node.inl \
+  LOCK_SOCK_Acceptor.cpp \
+  LOCK_SOCK_Acceptor.h \
+  LSOCK.h \
+  LSOCK.inl \
+  LSOCK_Acceptor.h \
+  LSOCK_CODgram.h \
+  LSOCK_CODgram.inl \
+  LSOCK_Connector.h \
+  LSOCK_Connector.inl \
+  LSOCK_Dgram.h \
+  LSOCK_Dgram.inl \
+  LSOCK_Stream.h \
+  LSOCK_Stream.inl \
+  Lib_Find.h \
+  Local_Memory_Pool.h \
+  Local_Name_Space.h \
+  Local_Name_Space_T.cpp \
+  Local_Name_Space_T.h \
+  Local_Tokens.h \
+  Local_Tokens.inl \
+  Lock.h \
+  Lock.inl \
+  Lock_Adapter_T.cpp \
+  Lock_Adapter_T.h \
+  Lock_Adapter_T.inl \
+  Log_Msg.h \
+  Log_Msg.inl \
+  Log_Msg_Backend.h \
+  Log_Msg_Callback.h \
+  Log_Msg_IPC.h \
+  Log_Msg_NT_Event_Log.h \
+  Log_Msg_UNIX_Syslog.h \
+  Log_Priority.h \
+  Log_Record.h \
+  Log_Record.inl \
+  Logging_Strategy.h \
+  MEM_Acceptor.h \
+  MEM_Acceptor.inl \
+  MEM_Addr.h \
+  MEM_Addr.inl \
+  MEM_Connector.h \
+  MEM_Connector.inl \
+  MEM_IO.h \
+  MEM_IO.inl \
+  MEM_SAP.h \
+  MEM_SAP.inl \
+  MEM_Stream.h \
+  MEM_Stream.inl \
+  MMAP_Memory_Pool.h \
+  MMAP_Memory_Pool.inl \
+  Malloc.h \
+  Malloc.inl \
+  Malloc_Allocator.h \
+  Malloc_Allocator.inl \
+  Malloc_Base.h \
+  Malloc_T.cpp \
+  Malloc_T.h \
+  Malloc_T.inl \
+  Managed_Object.cpp \
+  Managed_Object.h \
+  Managed_Object.inl \
+  Manual_Event.h \
+  Manual_Event.inl \
+  Map_Manager.cpp \
+  Map_Manager.h \
+  Map_Manager.inl \
+  Map_T.cpp \
+  Map_T.h \
+  Map_T.inl \
+  Mem_Map.h \
+  Mem_Map.inl \
+  Memory_Pool.h \
+  Message_Block.h \
+  Message_Block.inl \
+  Message_Block_T.cpp \
+  Message_Block_T.h \
+  Message_Block_T.inl \
+  Message_Queue.h \
+  Message_Queue.inl \
+  Message_Queue_NT.h \
+  Message_Queue_NT.inl \
+  Message_Queue_T.cpp \
+  Message_Queue_T.h \
+  Message_Queue_Vx.h \
+  Message_Queue_Vx.inl \
+  Method_Object.h \
+  Method_Request.h \
+  Min_Max.h \
+  Module.cpp \
+  Module.h \
+  Module.inl \
+  Monitor_Admin.h \
+  Monitor_Admin_Manager.h \
+  Monitor_Base.h \
+  Monitor_Base.inl \
+  Monitor_Control_Action.h \
+  Monitor_Control_Types.h \
+  Monitor_Point_Registry.h \
+  Monitor_Size.h \
+  Msg_WFMO_Reactor.h \
+  Msg_WFMO_Reactor.inl \
+  Multihomed_INET_Addr.h \
+  Multihomed_INET_Addr.inl \
+  Mutex.h \
+  Mutex.inl \
+  NT_Service.h \
+  NT_Service.inl \
+  Name_Proxy.h \
+  Name_Request_Reply.h \
+  Name_Space.h \
+  Naming_Context.h \
+  Naming_Context.inl \
+  Netlink_Addr.h \
+  Netlink_Addr.inl \
+  Node.cpp \
+  Node.h \
+  Notification_Queue.h \
+  Notification_Queue.inl \
+  Notification_Strategy.h \
+  Notification_Strategy.inl \
+  Null_Barrier.h \
+  Null_Condition.h \
+  Null_Mutex.h \
+  Null_Semaphore.h \
+  Numeric_Limits.h \
+  OS.h \
+  OS.inl \
+  OS_Dirent.h \
+  OS_Errno.h \
+  OS_Errno.inl \
+  OS_Log_Msg_Attributes.h \
+  OS_Log_Msg_Attributes.inl \
+  OS_Memory.h \
+  OS_NS_Thread.h \
+  OS_NS_Thread.inl \
+  OS_NS_arpa_inet.h \
+  OS_NS_arpa_inet.inl \
+  OS_NS_ctype.h \
+  OS_NS_ctype.inl \
+  OS_NS_dirent.h \
+  OS_NS_dirent.inl \
+  OS_NS_dlfcn.h \
+  OS_NS_dlfcn.inl \
+  OS_NS_errno.h \
+  OS_NS_errno.inl \
+  OS_NS_fcntl.h \
+  OS_NS_fcntl.inl \
+  OS_NS_macros.h \
+  OS_NS_math.h \
+  OS_NS_math.inl \
+  OS_NS_netdb.h \
+  OS_NS_netdb.inl \
+  OS_NS_poll.h \
+  OS_NS_poll.inl \
+  OS_NS_pwd.h \
+  OS_NS_pwd.inl \
+  OS_NS_regex.h \
+  OS_NS_regex.inl \
+  OS_NS_signal.h \
+  OS_NS_signal.inl \
+  OS_NS_stdio.h \
+  OS_NS_stdio.inl \
+  OS_NS_stdlib.h \
+  OS_NS_stdlib.inl \
+  OS_NS_string.h \
+  OS_NS_string.inl \
+  OS_NS_strings.h \
+  OS_NS_strings.inl \
+  OS_NS_stropts.h \
+  OS_NS_stropts.inl \
+  OS_NS_sys_mman.h \
+  OS_NS_sys_mman.inl \
+  OS_NS_sys_msg.h \
+  OS_NS_sys_msg.inl \
+  OS_NS_sys_resource.h \
+  OS_NS_sys_resource.inl \
+  OS_NS_sys_select.h \
+  OS_NS_sys_select.inl \
+  OS_NS_sys_sendfile.h \
+  OS_NS_sys_sendfile.inl \
+  OS_NS_sys_shm.h \
+  OS_NS_sys_shm.inl \
+  OS_NS_sys_socket.h \
+  OS_NS_sys_socket.inl \
+  OS_NS_sys_stat.h \
+  OS_NS_sys_stat.inl \
+  OS_NS_sys_time.h \
+  OS_NS_sys_time.inl \
+  OS_NS_sys_uio.h \
+  OS_NS_sys_uio.inl \
+  OS_NS_sys_utsname.h \
+  OS_NS_sys_wait.h \
+  OS_NS_sys_wait.inl \
+  OS_NS_time.h \
+  OS_NS_time.inl \
+  OS_NS_unistd.h \
+  OS_NS_unistd.inl \
+  OS_NS_wchar.h \
+  OS_NS_wchar.inl \
+  OS_QoS.h \
+  OS_String.h \
+  OS_TLI.h \
+  OS_TLI.inl \
+  OS_Thread_Adapter.h \
+  OS_main.h \
+  Obchunk.h \
+  Obchunk.inl \
+  Object_Manager.h \
+  Object_Manager.inl \
+  Object_Manager_Base.h \
+  Obstack_T.cpp \
+  Obstack_T.h \
+  Obstack_T.inl \
+  PI_Malloc.h \
+  PI_Malloc.inl \
+  POSIX_Asynch_IO.h \
+  POSIX_CB_Proactor.h \
+  POSIX_Proactor.h \
+  POSIX_Proactor.inl \
+  Pagefile_Memory_Pool.h \
+  Pagefile_Memory_Pool.inl \
+  Pair.h \
+  Pair_T.cpp \
+  Pair_T.h \
+  Pair_T.inl \
+  Parse_Node.h \
+  Ping_Socket.h \
+  Ping_Socket.inl \
+  Pipe.h \
+  Pipe.inl \
+  Priority_Reactor.h \
+  Proactor.h \
+  Proactor.inl \
+  Proactor_Impl.h \
+  Process.h \
+  Process.inl \
+  Process_Manager.h \
+  Process_Manager.inl \
+  Process_Mutex.h \
+  Process_Mutex.inl \
+  Process_Semaphore.h \
+  Process_Semaphore.inl \
+  Profile_Timer.h \
+  Profile_Timer.inl \
+  RB_Tree.cpp \
+  RB_Tree.h \
+  RB_Tree.inl \
+  RW_Mutex.h \
+  RW_Mutex.inl \
+  RW_Process_Mutex.h \
+  RW_Process_Mutex.inl \
+  RW_Thread_Mutex.h \
+  RW_Thread_Mutex.inl \
+  Reactor.h \
+  Reactor.inl \
+  Reactor_Impl.h \
+  Reactor_Notification_Strategy.h \
+  Reactor_Notification_Strategy.inl \
+  Reactor_Timer_Interface.h \
+  Reactor_Token_T.cpp \
+  Reactor_Token_T.h \
+  Read_Buffer.h \
+  Read_Buffer.inl \
+  Recursive_Thread_Mutex.h \
+  Recursive_Thread_Mutex.inl \
+  Recyclable.h \
+  Recyclable.inl \
+  Refcountable.h \
+  Refcountable_T.cpp \
+  Refcountable_T.h \
+  Refcountable_T.inl \
+  Refcounted_Auto_Ptr.cpp \
+  Refcounted_Auto_Ptr.h \
+  Refcounted_Auto_Ptr.inl \
+  Registry.h \
+  Registry_Name_Space.h \
+  Remote_Name_Space.h \
+  Remote_Tokens.h \
+  Remote_Tokens.inl \
+  Reverse_Lock_T.cpp \
+  Reverse_Lock_T.h \
+  Reverse_Lock_T.inl \
+  SOCK.h \
+  SOCK.inl \
+  SOCK_Acceptor.h \
+  SOCK_Acceptor.inl \
+  SOCK_CODgram.h \
+  SOCK_CODgram.inl \
+  SOCK_Connector.h \
+  SOCK_Connector.inl \
+  SOCK_Dgram.h \
+  SOCK_Dgram.inl \
+  SOCK_Dgram_Bcast.h \
+  SOCK_Dgram_Bcast.inl \
+  SOCK_Dgram_Mcast.h \
+  SOCK_Dgram_Mcast.inl \
+  SOCK_IO.h \
+  SOCK_IO.inl \
+  SOCK_Netlink.h \
+  SOCK_Netlink.inl \
+  SOCK_SEQPACK_Acceptor.h \
+  SOCK_SEQPACK_Acceptor.inl \
+  SOCK_SEQPACK_Association.h \
+  SOCK_SEQPACK_Association.inl \
+  SOCK_SEQPACK_Connector.h \
+  SOCK_SEQPACK_Connector.inl \
+  SOCK_Stream.h \
+  SOCK_Stream.inl \
+  SPIPE.h \
+  SPIPE.inl \
+  SPIPE_Acceptor.h \
+  SPIPE_Addr.h \
+  SPIPE_Addr.inl \
+  SPIPE_Connector.h \
+  SPIPE_Connector.inl \
+  SPIPE_Stream.h \
+  SPIPE_Stream.inl \
+  SString.h \
+  SString.inl \
+  SStringfwd.h \
+  Stack_Trace.h \
+  SUN_Proactor.h \
+  SV_Message.h \
+  SV_Message.inl \
+  SV_Message_Queue.h \
+  SV_Message_Queue.inl \
+  SV_Semaphore_Complex.h \
+  SV_Semaphore_Complex.inl \
+  SV_Semaphore_Simple.h \
+  SV_Semaphore_Simple.inl \
+  SV_Shared_Memory.h \
+  SV_Shared_Memory.inl \
+  Sample_History.h \
+  Sample_History.inl \
+  Sbrk_Memory_Pool.h \
+  Sched_Params.h \
+  Sched_Params.inl \
+  Select_Reactor.h \
+  Select_Reactor_Base.h \
+  Select_Reactor_Base.inl \
+  Select_Reactor_T.cpp \
+  Select_Reactor_T.h \
+  Select_Reactor_T.inl \
+  Semaphore.h \
+  Semaphore.inl \
+  Service_Config.h \
+  Service_Config.inl \
+  Service_Gestalt.h \
+  Service_Gestalt.inl \
+  Service_Manager.h \
+  Service_Object.h \
+  Service_Object.inl \
+  Service_Repository.h \
+  Service_Repository.inl \
+  Service_Types.h \
+  Service_Types.inl \
+  Shared_Memory.h \
+  Shared_Memory_MM.h \
+  Shared_Memory_MM.inl \
+  Shared_Memory_Pool.h \
+  Shared_Memory_SV.h \
+  Shared_Memory_SV.inl \
+  Shared_Object.h \
+  Shared_Object.inl \
+  Sig_Adapter.h \
+  Sig_Handler.h \
+  Sig_Handler.inl \
+  Signal.h \
+  Signal.inl \
+  Singleton.cpp \
+  Singleton.h \
+  Singleton.inl \
+  Sock_Connect.h \
+  Static_Object_Lock.h \
+  Stats.h \
+  Stats.inl \
+  Strategies.h \
+  Strategies_T.cpp \
+  Strategies_T.h \
+  Strategies_T.inl \
+  Stream.cpp \
+  Stream.h \
+  Stream.inl \
+  Stream_Modules.cpp \
+  Stream_Modules.h \
+  String_Base.cpp \
+  String_Base.h \
+  String_Base.inl \
+  String_Base_Const.h \
+  Svc_Conf.h \
+  Svc_Conf_Lexer.h \
+  Svc_Conf_Tokens.h \
+  Svc_Conf_Token_Table.h \
+  Svc_Handler.cpp \
+  Svc_Handler.h \
+  Synch.h \
+  Synch_Options.h \
+  Synch_T.cpp \
+  Synch_T.h \
+  Synch_Traits.h \
+  System_Time.h \
+  TLI.h \
+  TLI.inl \
+  TLI_Acceptor.h \
+  TLI_Connector.h \
+  TLI_Connector.inl \
+  TLI_Stream.h \
+  TLI_Stream.inl \
+  TP_Reactor.h \
+  TP_Reactor.inl \
+  TSS_Adapter.h \
+  TSS_T.cpp \
+  TSS_T.h \
+  TSS_T.inl \
+  TTY_IO.h \
+  Task.h \
+  Task.inl \
+  Task_Ex_T.cpp \
+  Task_Ex_T.h \
+  Task_Ex_T.inl \
+  Task_T.cpp \
+  Task_T.h \
+  Task_T.inl \
+  Test_and_Set.cpp \
+  Test_and_Set.h \
+  Thread.h \
+  Thread.inl \
+  Thread_Adapter.h \
+  Thread_Adapter.inl \
+  Thread_Control.h \
+  Thread_Control.inl \
+  Thread_Exit.h \
+  Thread_Hook.h \
+  Thread_Manager.h \
+  Thread_Manager.inl \
+  Thread_Mutex.h \
+  Thread_Mutex.inl \
+  Thread_Semaphore.h \
+  Thread_Semaphore.inl \
+  Throughput_Stats.h \
+  Time_Value.h \
+  Time_Value.inl \
+  Timeprobe.h \
+  Timeprobe.inl \
+  Timeprobe_T.cpp \
+  Timeprobe_T.h \
+  Timer_Hash_T.cpp \
+  Timer_Hash_T.h \
+  Timer_Heap_T.cpp \
+  Timer_Heap_T.h \
+  Timer_List_T.cpp \
+  Timer_List_T.h \
+  Timer_Queue_Adapters.cpp \
+  Timer_Queue_Adapters.h \
+  Timer_Queue_Adapters.inl \
+  Timer_Queue_T.cpp \
+  Timer_Queue_T.h \
+  Timer_Queue_T.inl \
+  Timer_Queuefwd.h \
+  Timer_Wheel_T.cpp \
+  Timer_Wheel_T.h \
+  Timer_Hash.h \
+  Timer_Heap.h \
+  Timer_List.h \
+  Timer_Queue.h \
+  Timer_Queuefwd.h \
+  Timer_Wheel.h \
+  Token.h \
+  Token.inl \
+  Token_Collection.h \
+  Token_Collection.inl \
+  Token_Invariants.h \
+  Token_Manager.h \
+  Token_Manager.inl \
+  Token_Request_Reply.h \
+  Token_Request_Reply.inl \
+  Trace.h \
+  Truncate.h \
+  Typed_SV_Message.cpp \
+  Typed_SV_Message.h \
+  Typed_SV_Message.inl \
+  Typed_SV_Message_Queue.cpp \
+  Typed_SV_Message_Queue.h \
+  Typed_SV_Message_Queue.inl \
+  UNIX_Addr.h \
+  UNIX_Addr.inl \
+  UPIPE_Acceptor.h \
+  UPIPE_Acceptor.inl \
+  UPIPE_Addr.h \
+  UPIPE_Connector.h \
+  UPIPE_Connector.inl \
+  UPIPE_Stream.h \
+  UPIPE_Stream.inl \
+  UTF16_Encoding_Converter.h \
+  UTF16_Encoding_Converter.inl \
+  UTF32_Encoding_Converter.h \
+  UTF8_Encoding_Converter.h \
+  UUID.h \
+  UUID.inl \
+  Unbounded_Queue.cpp \
+  Unbounded_Queue.h \
+  Unbounded_Queue.inl \
+  Unbounded_Set.cpp \
+  Unbounded_Set.h \
+  Unbounded_Set.inl \
+  Unbounded_Set_Ex.cpp \
+  Unbounded_Set_Ex.h \
+  Unbounded_Set_Ex.inl \
+  Value_Ptr.h \
+  Vector_T.cpp \
+  Vector_T.h \
+  Vector_T.inl \
+  Version.h \
+  Versioned_Namespace.h \
+  WFMO_Reactor.h \
+  WFMO_Reactor.inl \
+  WIN32_Asynch_IO.h \
+  WIN32_Proactor.h \
+  XML_Svc_Conf.h \
+  XTI_ATM_Mcast.h \
+  XTI_ATM_Mcast.inl \
+  ace_wchar.h \
+  ace_wchar.inl \
+  checked_iterator.h \
+  config-WinCE.h \
+  config-all.h \
+  config-borland-common.h \
+  config-lite.h \
+  config-macros.h \
+  config-minimal.h \
+  config-win32-borland.h \
+  config-win32-common.h \
+  config-win32-ghs.h \
+  config-win32-msvc-7.h \
+  config-win32-msvc-8.h \
+  config-win32-msvc.h \
+  config-win32.h \
+  config.h \
+  iosfwd.h \
+  os_include/arpa/os_inet.h \
+  os_include/net/os_if.h \
+  os_include/netinet/os_in.h \
+  os_include/netinet/os_tcp.h \
+  os_include/os_aio.h \
+  os_include/os_assert.h \
+  os_include/os_byteswap.h \
+  os_include/os_complex.h \
+  os_include/os_cpio.h \
+  os_include/os_ctype.h \
+  os_include/os_dirent.h \
+  os_include/os_dlfcn.h \
+  os_include/os_errno.h \
+  os_include/os_fcntl.h \
+  os_include/os_fenv.h \
+  os_include/os_float.h \
+  os_include/os_fmtmsg.h \
+  os_include/os_fnmatch.h \
+  os_include/os_ftw.h \
+  os_include/os_glob.h \
+  os_include/os_grp.h \
+  os_include/os_iconv.h \
+  os_include/os_intrin.h \
+  os_include/os_inttypes.h \
+  os_include/os_iso646.h \
+  os_include/os_kstat.h \
+  os_include/os_langinfo.h \
+  os_include/os_libgen.h \
+  os_include/os_limits.h \
+  os_include/os_local.h \
+  os_include/os_math.h \
+  os_include/os_monetary.h \
+  os_include/os_mqueue.h \
+  os_include/os_ndbm.h \
+  os_include/os_netdb.h \
+  os_include/os_nl_types.h \
+  os_include/os_pdh.h \
+  os_include/os_pdhmsg.h \
+  os_include/os_poll.h \
+  os_include/os_pthread.h \
+  os_include/os_pwd.h \
+  os_include/os_regex.h \
+  os_include/os_sched.h \
+  os_include/os_search.h \
+  os_include/os_semaphore.h \
+  os_include/os_setjmp.h \
+  os_include/os_signal.h \
+  os_include/os_spawn.h \
+  os_include/os_stdarg.h \
+  os_include/os_stdbool.h \
+  os_include/os_stddef.h \
+  os_include/os_stdint.h \
+  os_include/os_stdio.h \
+  os_include/os_stdlib.h \
+  os_include/os_string.h \
+  os_include/os_strings.h \
+  os_include/os_stropts.h \
+  os_include/os_syslog.h \
+  os_include/os_tar.h \
+  os_include/os_termios.h \
+  os_include/os_tgmath.h \
+  os_include/os_time.h \
+  os_include/os_trace.h \
+  os_include/os_ucontext.h \
+  os_include/os_ulimit.h \
+  os_include/os_unistd.h \
+  os_include/os_utime.h \
+  os_include/os_utmpx.h \
+  os_include/os_wchar.h \
+  os_include/os_wctype.h \
+  os_include/os_wordexp.h \
+  os_include/sys/os_ipc.h \
+  os_include/sys/os_loadavg.h \
+  os_include/sys/os_mman.h \
+  os_include/sys/os_msg.h \
+  os_include/sys/os_pstat.h \
+  os_include/sys/os_resource.h \
+  os_include/sys/os_select.h \
+  os_include/sys/os_sem.h \
+  os_include/sys/os_shm.h \
+  os_include/sys/os_socket.h \
+  os_include/sys/os_stat.h \
+  os_include/sys/os_statvfs.h \
+  os_include/sys/os_sysctl.h \
+  os_include/sys/os_sysinfo.h \
+  os_include/sys/os_time.h \
+  os_include/sys/os_timeb.h \
+  os_include/sys/os_times.h \
+  os_include/sys/os_types.h \
+  os_include/sys/os_uio.h \
+  os_include/sys/os_un.h \
+  os_include/sys/os_utsname.h \
+  os_include/sys/os_wait.h \
+  Codeset_Symbols.h \
+  Svc_Conf_Param.h \
+  Obstack.h \
+  post.h \
+  pre.h \
+  streams.h \
+  svc_export.h
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/dep/include/Makefile.am b/dep/include/Makefile.am
index f3fa8689b08..5783b4bda27 100644
--- a/dep/include/Makefile.am
+++ b/dep/include/Makefile.am
@@ -60,7 +60,6 @@ EXTRA_DIST += \
 	mysql/config-os2.h \
 	mysql/config-win.h \
 	mysql/errmsg.h \
-	mysql/libmysqld.def \
 	mysql/Libmysql.def \
 	mysql/m_ctype.h \
 	mysql/m_string.h \
@@ -166,31 +165,32 @@ EXTRA_DIST += \
 
 #  Sockets header files for Win32 builds
 EXTRA_DIST += \
-	sockets\Base64.h \
-	sockets\CircularBuffer.h \
-	sockets\IFile.h \
-	sockets\Ipv4Address.h \
-	sockets\Ipv6Address.h \
-	sockets\ISocketHandler.h \
-	sockets\ListenSocket.h \
-	sockets\Mutex.h \
-	sockets\Parse.h \
-	sockets\RandomNumber.h \
-	sockets\ResolvServer.h \
-	sockets\ResolvSocket.h \
-	sockets\SctpSocket.h \
-	sockets\Socket.h \
-	sockets\socket_include.h \
-	sockets\SocketAddress.h \
-	sockets\SocketHandler.h \
-	sockets\sockets-config.h \
-	sockets\StdLog.h \
-	sockets\StdoutLog.h \
-	sockets\TcpSocket.h \
-	sockets\Thread.h \
-	sockets\UdpSocket.h \
-	sockets\Uid.h \
-	sockets\Utility.h
+	sockets/Base64.h \
+	sockets/Exception.h \
+	sockets/File.h \
+	sockets/IFile.h \
+	sockets/Ipv4Address.h \
+	sockets/Ipv6Address.h \
+	sockets/ISocketHandler.h \
+	sockets/ListenSocket.h \
+	sockets/Lock.h \
+	sockets/Mutex.h \
+	sockets/Parse.h \
+	sockets/ResolvServer.h \
+	sockets/ResolvSocket.h \
+	sockets/SctpSocket.h \
+	sockets/SocketAddress.h \
+	sockets/Socket.h \
+	sockets/SocketHandler.h \
+	sockets/socket_include.h \
+	sockets/sockets-config.h \
+	sockets/StdLog.h \
+	sockets/StdoutLog.h \
+	sockets/StreamSocket.h \
+	sockets/TcpSocket.h \
+	sockets/Thread.h \
+	sockets/UdpSocket.h \
+	sockets/Utility.h
 
 #  VLD header files for Win32 builds
 EXTRA_DIST += \
diff --git a/dep/lib/Makefile.am b/dep/lib/Makefile.am
index 921a48c2083..ca24a5af75c 100644
--- a/dep/lib/Makefile.am
+++ b/dep/lib/Makefile.am
@@ -40,11 +40,12 @@ EXTRA_DIST += \
 	x64_Debug/libeay32.dll   \
 	x64_Debug/libeay32.lib   \
 	x64_Debug/libmySQL.dll   \
-	x64_Debug/libmySQL.lib
+	x64_Debug/libmysql.lib
 
 # Release libraries for Win64 builds.
 EXTRA_DIST += \
 	x64_release/libeay32.dll   \
 	x64_release/libeay32.lib   \
 	x64_release/libmySQL.dll   \
-	x64_release/libmySQL.lib
+	x64_release/libmysql.lib
+
diff --git a/src/bindings/interface/Makefile.am b/src/bindings/interface/Makefile.am
index 5da807d8a16..90301b46d15 100644
--- a/src/bindings/interface/Makefile.am
+++ b/src/bindings/interface/Makefile.am
@@ -25,28 +25,28 @@ lib_LTLIBRARIES = libtrinityscript.la
 libtrinityscript_la_CPPFLAGS = \
 $(MYSQL_INCLUDES) \
 $(POSTGRE_INCLUDES) \
+$(TRINI_INCLUDES) \
 -I$(top_srcdir)/dep/include \
 -I$(top_srcdir)/src/shared \
 -I$(top_srcdir)/src/framework \
 -I$(top_srcdir)/src/game
 
 libtrinityscript_la_SOURCES = \
-	ScriptMgr.cpp \
-	ScriptMgr.h \
-	config.h \
-	system.cpp \
-	Scripts/sc_default.cpp \
-	Scripts/sc_defines.cpp \
-	Scripts/sc_defines.h
+$(srcdir)/ScriptMgr.cpp \
+$(srcdir)/ScriptMgr.h \
+$(srcdir)/config.h \
+$(srcdir)/system.cpp \
+$(srcdir)/Scripts/sc_default.cpp \
+$(srcdir)/Scripts/sc_defines.cpp \
+$(srcdir)/Scripts/sc_defines.h
 
 ## libtool settings
 #  API versioning
-libtrinityscript_la_LIBFLAGS = -version-info 0:0:1
+libtrinityscript_la_LIBFLAGS = -version-info 0:0:0
 libtrinityscript_la_LIBADD = $(MYSQL_LIBS) $(POSTGRE_LIBS)
 
 ## Additional files to include when running 'make dist'
 #  Scripts defaults.
 EXTRA_DIST = \
-	Scripts/sc_default.cpp \
-	Scripts/sc_defines.cpp \
-	Scripts/sc_defines.h
+        Readme.txt
+
diff --git a/src/bindings/scripts/Makefile.am b/src/bindings/scripts/Makefile.am
index 1507899259b..b6222045b7a 100644
--- a/src/bindings/scripts/Makefile.am
+++ b/src/bindings/scripts/Makefile.am
@@ -30,6 +30,7 @@ $(POSTGRE_INCLUDES) \
 -I$(top_srcdir)/src/framework \
 -I$(top_srcdir)/src/game \
 -I$(srcdir)/include \
+$(TRINI_INCLUDES) \
 -D_TRINITY_SCRIPT_CONFIG='"$(sysconfdir)/trinityscript.conf"'
 
 libtrinityscript_la_SOURCES = \
@@ -41,7 +42,6 @@ include/sc_creature.cpp \
 include/sc_creature.h \
 include/sc_gossip.h \
 include/sc_instance.h \
-include/sc_item.h \
 scripts/areatrigger/areatrigger_scripts.cpp \
 scripts/boss/boss_emeriss.cpp \
 scripts/boss/boss_lethon.cpp \
@@ -395,17 +395,13 @@ system.cpp
 libtrinityscript_la_LIBFLAGS = -version-info 0:0:1
 libtrinityscript_la_LIBADD =  $(MYSQL_LIBS) $(POSTGRE_LIBS)
 
-## Additional files to include when running 'make dist'
-# Scripts defaults.
-EXTRA_DIST = \
-	Scripts/sc_default.cpp \
-	Scripts/sc_defines.cpp \
-	Scripts/sc_defines.h
-
 ## Additional files to install
 sysconf_DATA = \
 	trinityscript.conf.dist
 
+EXTRA_DIST =  \
+        trinityscript.conf.dist
+
 ## Prevend overwrite of the config file, if its already installed
 install-data-hook:
 	@list='$(sysconf_DATA)'; for p in $$list; do \
diff --git a/src/game/Makefile.am b/src/game/Makefile.am
index cffd1f7b093..7d0180931b8 100644
--- a/src/game/Makefile.am
+++ b/src/game/Makefile.am
@@ -29,6 +29,7 @@ noinst_LIBRARIES = libgame.a
 libgame_a_CPPFLAGS = \
 $(MYSQL_INCLUDES) \
 $(POSTGRE_INCLUDES) \
+$(TRINI_INCLUDES) \
 -I$(top_srcdir)/dep/include \
 -I$(top_srcdir)/src/framework \
 -I$(top_srcdir)/src/shared \
diff --git a/src/shared/vmap/Makefile.am b/src/shared/vmap/Makefile.am
index 322c94bfad1..795e7374c33 100644
--- a/src/shared/vmap/Makefile.am
+++ b/src/shared/vmap/Makefile.am
@@ -20,6 +20,7 @@ noinst_LIBRARIES = libvmaps.a
 
 ## Preprocessor flags
 libvmaps_a_CPPFLAGS = \
+$(TRINI_INCLUDES) \
 -I$(top_srcdir)/dep/include \
 -I$(top_srcdir)/dep/include/g3dlite
 
diff --git a/src/trinitycore/Makefile.am b/src/trinitycore/Makefile.am
index 6f69fd6021c..bde368cfa4b 100644
--- a/src/trinitycore/Makefile.am
+++ b/src/trinitycore/Makefile.am
@@ -23,6 +23,7 @@ bin_PROGRAMS = trinity-core
 trinity_core_CPPFLAGS = \
 $(MYSQL_INCLUDES) \
 $(POSTGRE_INCLUDES) \
+$(TRINI_INCLUDES) \
 -I$(top_srcdir)/dep/include \
 -I$(top_srcdir)/src/shared \
 -I$(top_srcdir)/src/framework \
@@ -58,12 +59,15 @@ trinity_core_LDADD += $(top_builddir)/src/bindings/interface/libtrinityscript.la
 endif
 
 ## Linker flags
-trinity_core_LDFLAGS = $(MYSQL_LIBS) $(POSTGRE_LIBS) $(ZLIB) $(COMPATLIB) $(SSLLIB) $(ACE_LIBS) -export-dynamic
+trinity_core_LDFLAGS = $(MYSQL_LIBS) $(POSTGRE_LIBS) $(ZLIB) $(COMPATLIB) $(SSLLIB) $(TRINI_LIBS) -export-dynamic
 
 ## Additional files to install
 sysconf_DATA = \
 	trinitycore.conf.dist
 
+EXTRA_DIST =  \
+        trinitycore.conf.dist
+
 ## Prevend overwrite of the config file, if its already installed
 install-data-hook:
 	@list='$(sysconf_DATA)'; for p in $$list; do \
diff --git a/src/trinityrealm/Makefile.am b/src/trinityrealm/Makefile.am
index 8a2b78359ef..ddbb80c0fdb 100644
--- a/src/trinityrealm/Makefile.am
+++ b/src/trinityrealm/Makefile.am
@@ -23,6 +23,7 @@ bin_PROGRAMS = trinity-realm
 trinity_realm_CPPFLAGS = \
 $(MYSQL_INCLUDES) \
 $(POSTGRE_INCLUDES) \
+$(TRINI_INCLUDES) \
 -I$(top_srcdir)/dep/include \
 -I$(top_srcdir)/src/framework \
 -I$(top_srcdir)/src/shared \
@@ -45,7 +46,7 @@ $(top_builddir)/dep/src/sockets/libmangossockets.a \
 $(top_builddir)/dep/src/zthread/libZThread.la
 
 ## Linker flags
-trinity_realm_LDFLAGS = $(MYSQL_LIBS) $(POSTGRE_LIBS) $(ZLIB) $(COMPATLIB) $(SSLLIB) $(ACE_LIBS)
+trinity_realm_LDFLAGS = $(MYSQL_LIBS) $(POSTGRE_LIBS) $(ZLIB) $(COMPATLIB) $(SSLLIB) $(TRINI_LIBS)
 
 ## Additional files to install
 sysconf_DATA = \
@@ -64,6 +65,5 @@ install-data-hook:
 	done
 
 ## Additional files to include when running 'make dist'
-#  Include realm list daemon configuration
-# EXTRA_DIST =  
+EXTRA_DIST =  trinityrealm.conf.dist