Index: /trunk/src/trinityrealm/Makefile.am
===================================================================
--- /trunk/src/trinityrealm/Makefile.am (revision 8)
+++ /trunk/src/trinityrealm/Makefile.am (revision 17)
@@ -24,4 +24,5 @@
 $(MYSQL_INCLUDES) \
 $(POSTGRE_INCLUDES) \
+$(TRINI_INCLUDES) \
 -I$(top_srcdir)/dep/include \
 -I$(top_srcdir)/src/framework \
@@ -46,5 +47,5 @@
 
 ## 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
@@ -65,5 +66,4 @@
 
 ## Additional files to include when running 'make dist'
-#  Include realm list daemon configuration
-# EXTRA_DIST =  
+EXTRA_DIST =  trinityrealm.conf.dist
 
Index: /trunk/src/shared/vmap/Makefile.am
===================================================================
--- /trunk/src/shared/vmap/Makefile.am (revision 2)
+++ /trunk/src/shared/vmap/Makefile.am (revision 17)
@@ -21,4 +21,5 @@
 ## Preprocessor flags
 libvmaps_a_CPPFLAGS = \
+$(TRINI_INCLUDES) \
 -I$(top_srcdir)/dep/include \
 -I$(top_srcdir)/dep/include/g3dlite
Index: /trunk/src/game/Makefile.am
===================================================================
--- /trunk/src/game/Makefile.am (revision 8)
+++ /trunk/src/game/Makefile.am (revision 17)
@@ -30,4 +30,5 @@
 $(MYSQL_INCLUDES) \
 $(POSTGRE_INCLUDES) \
+$(TRINI_INCLUDES) \
 -I$(top_srcdir)/dep/include \
 -I$(top_srcdir)/src/framework \
Index: /trunk/src/trinitycore/Makefile.am
===================================================================
--- /trunk/src/trinitycore/Makefile.am (revision 8)
+++ /trunk/src/trinitycore/Makefile.am (revision 17)
@@ -24,4 +24,5 @@
 $(MYSQL_INCLUDES) \
 $(POSTGRE_INCLUDES) \
+$(TRINI_INCLUDES) \
 -I$(top_srcdir)/dep/include \
 -I$(top_srcdir)/src/shared \
@@ -59,9 +60,12 @@
 
 ## 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
Index: /trunk/src/bindings/interface/Makefile.am
===================================================================
--- /trunk/src/bindings/interface/Makefile.am (revision 2)
+++ /trunk/src/bindings/interface/Makefile.am (revision 17)
@@ -26,4 +26,5 @@
 $(MYSQL_INCLUDES) \
 $(POSTGRE_INCLUDES) \
+$(TRINI_INCLUDES) \
 -I$(top_srcdir)/dep/include \
 -I$(top_srcdir)/src/shared \
@@ -32,15 +33,15 @@
 
 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)
 
@@ -48,5 +49,4 @@
 #  Scripts defaults.
 EXTRA_DIST = \
-	Scripts/sc_default.cpp \
-	Scripts/sc_defines.cpp \
-	Scripts/sc_defines.h
+        Readme.txt
+
Index: /trunk/src/bindings/scripts/Makefile.am
===================================================================
--- /trunk/src/bindings/scripts/Makefile.am (revision 13)
+++ /trunk/src/bindings/scripts/Makefile.am (revision 17)
@@ -31,4 +31,5 @@
 -I$(top_srcdir)/src/game \
 -I$(srcdir)/include \
+$(TRINI_INCLUDES) \
 -D_TRINITY_SCRIPT_CONFIG='"$(sysconfdir)/trinityscript.conf"'
 
@@ -42,5 +43,4 @@
 include/sc_gossip.h \
 include/sc_instance.h \
-include/sc_item.h \
 scripts/areatrigger/areatrigger_scripts.cpp \
 scripts/boss/boss_emeriss.cpp \
@@ -396,14 +396,10 @@
 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
Index: /trunk/configure.ac
===================================================================
--- /trunk/configure.ac (revision 16)
+++ /trunk/configure.ac (revision 17)
@@ -19,5 +19,5 @@
 #  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
 
@@ -259,8 +259,8 @@
 
 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
 
@@ -279,5 +279,6 @@
 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.
Index: /trunk/dep/include/Makefile.am
===================================================================
--- /trunk/dep/include/Makefile.am (revision 2)
+++ /trunk/dep/include/Makefile.am (revision 17)
@@ -61,5 +61,4 @@
 	mysql/config-win.h \
 	mysql/errmsg.h \
-	mysql/libmysqld.def \
 	mysql/Libmysql.def \
 	mysql/m_ctype.h \
@@ -167,29 +166,30 @@
 #  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
Index: /trunk/dep/lib/Makefile.am
===================================================================
--- /trunk/dep/lib/Makefile.am (revision 2)
+++ /trunk/dep/lib/Makefile.am (revision 17)
@@ -41,5 +41,5 @@
 	x64_Debug/libeay32.lib   \
 	x64_Debug/libmySQL.dll   \
-	x64_Debug/libmySQL.lib
+	x64_Debug/libmysql.lib
 
 # Release libraries for Win64 builds.
@@ -48,3 +48,4 @@
 	x64_release/libeay32.lib   \
 	x64_release/libmySQL.dll   \
-	x64_release/libmySQL.lib
+	x64_release/libmysql.lib
+
Index: /trunk/Makefile.am
===================================================================
--- /trunk/Makefile.am (revision 7)
+++ /trunk/Makefile.am (revision 17)
@@ -21,38 +21,8 @@
 
 ## 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
+EXTRA_DIST = win contrib sql
 
-# 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
 
+
+