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