[svn] * Restore make dist.

--HG--
branch : trunk

6 files changed, 25 insertions, 23 deletions

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