Context Navigation

← Previous Change
Next Change →

Changeset 17 for trunk

Timestamp:

11/19/08 13:23:22 (17 years ago)

Author:

yumileroy

Message:

[svn] * Restore make dist.

Original author: derex_tri
Date: 2008-10-06 04:27:18-05:00

Location:

trunk

Files:

: 10 modified

Makefile.am (modified) (1 diff)
configure.ac (modified) (3 diffs)
dep/include/Makefile.am (modified) (2 diffs)
dep/lib/Makefile.am (modified) (2 diffs)
src/bindings/interface/Makefile.am (modified) (3 diffs)
src/bindings/scripts/Makefile.am (modified) (3 diffs)
src/game/Makefile.am (modified) (1 diff)
src/shared/vmap/Makefile.am (modified) (1 diff)
src/trinitycore/Makefile.am (modified) (2 diffs)
src/trinityrealm/Makefile.am (modified) (3 diffs)

Legend:

: Unmodified
: Added
: Removed

trunk/Makefile.am

r7	r17
21	21
22	22	## Additional files to include when running 'make dist'
23		# Win32 project workspace for Visual Studio .NET 2003
24		EXTRA_DIST = \
25		win/mangosdVC71.sln \
26		win/VC71/framework.vcproj \
27		win/VC71/game.vcproj \
28		win/VC71/TrinityCore.vcproj \
29		win/VC71/TrinityRealm.vcproj \
30		win/VC71/shared.vcproj \
31		win/VC71/zlib.vcproj \
32		win/VC71/g3dlite.vcproj \
33		win/VC71/zthread.vcproj
	23	EXTRA_DIST = win contrib sql
34	24
35		~~# Win32 project workspace for Visual Studio .NET 2005~~
36		~~EXTRA_DIST += \~~
37		~~win/mangosdVC80.sln \~~
38		~~win/VC80/framework.vcproj \~~
39		~~win/VC80/game.vcproj \~~
40		~~win/VC80/TrinityCore.vcproj \~~
41		~~win/VC80/TrinityRealm.vcproj \~~
42		~~win/VC80/shared.vcproj \~~
43		~~win/VC80/zlib.vcproj \~~
44		~~win/VC80/g3dlite.vcproj \~~
45		~~win/VC80/zthread.vcproj~~
46	25
47		~~# Win32 project workspace for Visual Studio .NET 2008~~
48		~~EXTRA_DIST += \~~
49		~~win/mangosdVC90.sln \~~
50		~~win/VC90/framework.vcproj \~~
51		~~win/VC90/game.vcproj \~~
52		~~win/VC90/TrinityCore.vcproj \~~
53		~~win/VC90/TrinityRealm.vcproj \~~
54		~~win/VC90/shared.vcproj \~~
55		~~win/VC90/zlib.vcproj \~~
56		~~win/VC90/g3dlite.vcproj \~~
57		~~win/VC90/zthread.vcproj~~
58	26
	27
	28

trunk/configure.ac

r16	r17
19	19	# Turn on all warnings and error messages, and enforce GNU
20	20	# standards for the package.
21		AM_INIT_AUTOMAKE([-Wall -Werror gnu])
	21	AM_INIT_AUTOMAKE([-Wall -Werror gnu tar-pax])
22	22	AM_MAINTAINER_MODE
23	23
…	…
259	259
260	260	if test X$tri_need_to_build_ace = Xyes; then
261		~~CXXFLAGS="-I\$(top_srcdir)/dep/ACE_wrappers -I\$(top_builddir)/dep/ACE_wrappers $CXXFLAG~~S"
262		~~ACE_LIBS="\$(top_builddir)/dep/ACE_wrappers/ace/libACE.la~~"
	261	TRINI_INCLUDES="-I\$(top_srcdir)/dep/ACE_wrappers -I\$(top_builddir)/dep/ACE_wrappers $TRINI_INCLUDES"
	262	TRINI_LIBS="\$(top_builddir)/dep/ACE_wrappers/ace/libACE.la $TRINI_LIBS"
263	263	else
264		~~ACE_LIBS="-lACE~~"
	264	TRINI_LIBS="-lACE $TRINI_LIBS"
265	265	fi
266	266
…	…
279	279	AC_SUBST(MANGOSD_ENABLE_CLI)
280	280	AC_SUBST(MANGOSD_ENABLE_RA)
281		AC_SUBST(ACE_LIBS)
	281	AC_SUBST(TRINI_INCLUDES)
	282	AC_SUBST(TRINI_LIBS)
282	283
283	284	## Set output files.

trunk/dep/include/Makefile.am

r2	r17
61	61	mysql/config-win.h \
62	62	mysql/errmsg.h \
63		~~mysql/libmysqld.def \~~
64	63	mysql/Libmysql.def \
65	64	mysql/m_ctype.h \
…	…
167	166	# Sockets header files for Win32 builds
168	167	EXTRA_DIST += \
169		sockets\Base64.h \
170		sockets\CircularBuffer.h \
171		sockets\IFile.h \
172		sockets\Ipv4Address.h \
173		sockets\Ipv6Address.h \
174		sockets\ISocketHandler.h \
175		sockets\ListenSocket.h \
176		sockets\Mutex.h \
177		sockets\Parse.h \
178		sockets\RandomNumber.h \
179		sockets\ResolvServer.h \
180		sockets\ResolvSocket.h \
181		sockets\SctpSocket.h \
182		sockets\Socket.h \
183		sockets\socket_include.h \
184		sockets\SocketAddress.h \
185		sockets\SocketHandler.h \
186		sockets\sockets-config.h \
187		sockets\StdLog.h \
188		sockets\StdoutLog.h \
189		sockets\TcpSocket.h \
190		sockets\Thread.h \
191		sockets\UdpSocket.h \
192		sockets\Uid.h \
193		sockets\Utility.h
	168	sockets/Base64.h \
	169	sockets/Exception.h \
	170	sockets/File.h \
	171	sockets/IFile.h \
	172	sockets/Ipv4Address.h \
	173	sockets/Ipv6Address.h \
	174	sockets/ISocketHandler.h \
	175	sockets/ListenSocket.h \
	176	sockets/Lock.h \
	177	sockets/Mutex.h \
	178	sockets/Parse.h \
	179	sockets/ResolvServer.h \
	180	sockets/ResolvSocket.h \
	181	sockets/SctpSocket.h \
	182	sockets/SocketAddress.h \
	183	sockets/Socket.h \
	184	sockets/SocketHandler.h \
	185	sockets/socket_include.h \
	186	sockets/sockets-config.h \
	187	sockets/StdLog.h \
	188	sockets/StdoutLog.h \
	189	sockets/StreamSocket.h \
	190	sockets/TcpSocket.h \
	191	sockets/Thread.h \
	192	sockets/UdpSocket.h \
	193	sockets/Utility.h
194	194
195	195	# VLD header files for Win32 builds

trunk/dep/lib/Makefile.am

r2	r17
41	41	x64_Debug/libeay32.lib \
42	42	x64_Debug/libmySQL.dll \
43		x64_Debug/libmy~~SQL~~.lib
	43	x64_Debug/libmysql.lib
44	44
45	45	# Release libraries for Win64 builds.
…	…
48	48	x64_release/libeay32.lib \
49	49	x64_release/libmySQL.dll \
50		x64_release/libmySQL.lib
	50	x64_release/libmysql.lib
	51

trunk/src/bindings/interface/Makefile.am

r2	r17
26	26	$(MYSQL_INCLUDES) \
27	27	$(POSTGRE_INCLUDES) \
	28	$(TRINI_INCLUDES) \
28	29	-I$(top_srcdir)/dep/include \
29	30	-I$(top_srcdir)/src/shared \
…	…
32	33
33	34	libtrinityscript_la_SOURCES = \
34		ScriptMgr.cpp \
35		ScriptMgr.h \
36		config.h \
37		system.cpp \
38		Scripts/sc_default.cpp \
39		Scripts/sc_defines.cpp \
40		Scripts/sc_defines.h
	35	$(srcdir)/ScriptMgr.cpp \
	36	$(srcdir)/ScriptMgr.h \
	37	$(srcdir)/config.h \
	38	$(srcdir)/system.cpp \
	39	$(srcdir)/Scripts/sc_default.cpp \
	40	$(srcdir)/Scripts/sc_defines.cpp \
	41	$(srcdir)/Scripts/sc_defines.h
41	42
42	43	## libtool settings
43	44	# API versioning
44		libtrinityscript_la_LIBFLAGS = -version-info 0:0:1
	45	libtrinityscript_la_LIBFLAGS = -version-info 0:0:0
45	46	libtrinityscript_la_LIBADD = $(MYSQL_LIBS) $(POSTGRE_LIBS)
46	47
…	…
48	49	# Scripts defaults.
49	50	EXTRA_DIST = \
50		Scripts/sc_default.cpp \
51		Scripts/sc_defines.cpp \
52		Scripts/sc_defines.h
	51	Readme.txt
	52

trunk/src/bindings/scripts/Makefile.am

r13	r17
31	31	-I$(top_srcdir)/src/game \
32	32	-I$(srcdir)/include \
	33	$(TRINI_INCLUDES) \
33	34	-D_TRINITY_SCRIPT_CONFIG='"$(sysconfdir)/trinityscript.conf"'
34	35
…	…
42	43	include/sc_gossip.h \
43	44	include/sc_instance.h \
44		~~include/sc_item.h \~~
45	45	scripts/areatrigger/areatrigger_scripts.cpp \
46	46	scripts/boss/boss_emeriss.cpp \
…	…
396	396	libtrinityscript_la_LIBADD = $(MYSQL_LIBS) $(POSTGRE_LIBS)
397	397
398		~~## Additional files to include when running 'make dist'~~
399		~~# Scripts defaults.~~
400		~~EXTRA_DIST = \~~
401		~~Scripts/sc_default.cpp \~~
402		~~Scripts/sc_defines.cpp \~~
403		~~Scripts/sc_defines.h~~
404
405	398	## Additional files to install
406	399	sysconf_DATA = \
407	400	trinityscript.conf.dist
	401
	402	EXTRA_DIST = \
	403	trinityscript.conf.dist
408	404
409	405	## Prevend overwrite of the config file, if its already installed

trunk/src/game/Makefile.am

r8	r17
30	30	$(MYSQL_INCLUDES) \
31	31	$(POSTGRE_INCLUDES) \
	32	$(TRINI_INCLUDES) \
32	33	-I$(top_srcdir)/dep/include \
33	34	-I$(top_srcdir)/src/framework \

trunk/src/shared/vmap/Makefile.am

r2	r17
21	21	## Preprocessor flags
22	22	libvmaps_a_CPPFLAGS = \
	23	$(TRINI_INCLUDES) \
23	24	-I$(top_srcdir)/dep/include \
24	25	-I$(top_srcdir)/dep/include/g3dlite

trunk/src/trinitycore/Makefile.am

r8	r17
24	24	$(MYSQL_INCLUDES) \
25	25	$(POSTGRE_INCLUDES) \
	26	$(TRINI_INCLUDES) \
26	27	-I$(top_srcdir)/dep/include \
27	28	-I$(top_srcdir)/src/shared \
…	…
59	60
60	61	## Linker flags
61		trinity_core_LDFLAGS = $(MYSQL_LIBS) $(POSTGRE_LIBS) $(ZLIB) $(COMPATLIB) $(SSLLIB) $(~~ACE~~_LIBS) -export-dynamic
	62	trinity_core_LDFLAGS = $(MYSQL_LIBS) $(POSTGRE_LIBS) $(ZLIB) $(COMPATLIB) $(SSLLIB) $(TRINI_LIBS) -export-dynamic
62	63
63	64	## Additional files to install
64	65	sysconf_DATA = \
65	66	trinitycore.conf.dist
	67
	68	EXTRA_DIST = \
	69	trinitycore.conf.dist
66	70
67	71	## Prevend overwrite of the config file, if its already installed

trunk/src/trinityrealm/Makefile.am

r8	r17
24	24	$(MYSQL_INCLUDES) \
25	25	$(POSTGRE_INCLUDES) \
	26	$(TRINI_INCLUDES) \
26	27	-I$(top_srcdir)/dep/include \
27	28	-I$(top_srcdir)/src/framework \
…	…
46	47
47	48	## Linker flags
48		trinity_realm_LDFLAGS = $(MYSQL_LIBS) $(POSTGRE_LIBS) $(ZLIB) $(COMPATLIB) $(SSLLIB) $(~~ACE~~_LIBS)
	49	trinity_realm_LDFLAGS = $(MYSQL_LIBS) $(POSTGRE_LIBS) $(ZLIB) $(COMPATLIB) $(SSLLIB) $(TRINI_LIBS)
49	50
50	51	## Additional files to install
…	…
65	66
66	67	## Additional files to include when running 'make dist'
67		# Include realm list daemon configuration
68		# EXTRA_DIST =
	68	EXTRA_DIST = trinityrealm.conf.dist
69	69

Context Navigation

Changeset 17 for trunk

Legend:

Download in other formats: