* Removed all unneeded Makefile.am files that were leftover from merges with

* MaNGOS

--HG--
branch : trunk

1 files changed, 0 insertions, 67 deletions

diff --git a/src/trinitycore/Makefile.am b/src/trinitycore/Makefile.am
deleted file mode 100644
index f0ac432dab1..00000000000
--- a/src/trinitycore/Makefile.am
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
-#
-# Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-## Process this file with automake to produce Makefile.in
-
-## CPP flags for includes, defines, etc.
-AM_CPPFLAGS = $(TRINI_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir)/../../dep/include -I$(srcdir)/../framework -I$(srcdir)/../shared  -I$(srcdir)/../game -I$(srcdir) -DSYSCONFDIR=\"$(sysconfdir)/\"
-
-## Build world list daemon as standalone program
-bin_PROGRAMS = trinity-worldd
-trinity_worldd_SOURCES = \
-    CliRunnable.cpp \
-    CliRunnable.h \
-    Main.cpp \
-    Master.cpp \
-    Master.h \
-    RASocket.cpp \
-    RASocket.h \
-    WorldRunnable.cpp \
-    WorldRunnable.h
-
-## Link world daemon against the shared library
-<<<<<<< HEAD:src/mangosd/Makefile.am
-trinity_worldd_LDADD = ../bindings/scripts/libtrinityscript.la ../game/libmangosgame.a ../shared/Database/libmangosdatabase.a ../shared/Config/libmangosconfig.a ../shared/Auth/libmangosauth.a ../shared/libmangosshared.a ../shared/vmap/libmangosvmaps.a ../framework/libmangosframework.a ../../dep/src/sockets/libmangossockets.a  ../../dep/src/zthread/libZThread.la ../../dep/src/g3dlite/libg3dlite.a
-trinity_worldd_LDFLAGS = -L../../dep/src/sockets -L../../dep/src/zthread -L../../dep/src/g3dlite -L../bindings/scripts/ -L$(libdir) $(TRINI_LIBS) -export-dynamic
-=======
-mangos_worldd_LDADD = ../bindings/universal/libmangosscript.la ../game/libmangosgame.a ../shared/Database/libmangosdatabase.a ../shared/Config/libmangosconfig.a ../shared/Auth/libmangosauth.a ../shared/libmangosshared.a ../shared/vmap/libmangosvmaps.a ../framework/libmangosframework.a ../../dep/src/sockets/libmangossockets.a  ../../dep/src/g3dlite/libg3dlite.a
-mangos_worldd_LDFLAGS = -L../../dep/src/sockets -L../../dep/src/g3dlite -L../bindings/universal/ -L$(libdir) $(MANGOS_LIBS) -export-dynamic
->>>>>>> 00c7d15a78b1dcdbf888b768c55424183b2231e4:src/mangosd/Makefile.am
-
-## Additional files to include when running 'make dist'
-#  Include world daemon configuration
-EXTRA_DIST = \
-    mangosd.conf.dist
-
-## Additional files to install
-sysconf_DATA = \
-    mangosd.conf.dist
-
-install-data-hook:
-	@list='$(sysconf_DATA)'; for p in $$list; do \
-      dest=`echo $$p | sed -e s/.dist//`; \
-      if test -f $(DESTDIR)$(sysconfdir)/$$dest; then \
-        echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/$$dest"; \
-      else \
-        echo " $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$dest"; \
-        $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$dest; \
-      fi; \
-    done
-
-clean-local:
-	rm -f $(sysconf_DATA)