*Continue to fix makefiles.
--HG-- branch : trunk
This commit is contained in:
megamage
+26
-49
@@ -18,68 +18,45 @@
|
|||||||
|
|
||||||
## Process this file with automake to produce Makefile.in
|
## 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
|
## Build world list daemon as standalone program
|
||||||
bin_PROGRAMS = trinity-core
|
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
|
||||||
|
|
||||||
## Preprocessor flags
|
## Link world daemon against the shared library
|
||||||
trinity_core_CPPFLAGS = \
|
trinity_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/zthread/libZThread.la ../../dep/src/g3dlite/libg3dlite.a
|
||||||
$(MYSQL_INCLUDES) \
|
trinity_worldd_LDFLAGS = -L../../dep/src/sockets -L../../dep/src/zthread -L../../dep/src/g3dlite -L../bindings/universal/ -L$(libdir) $(TRINI_LIBS) -export-dynamic
|
||||||
$(POSTGRE_INCLUDES) \
|
|
||||||
$(TRINI_INCLUDES) \
|
|
||||||
-I$(top_srcdir)/dep/include \
|
|
||||||
-I$(top_srcdir)/src/shared \
|
|
||||||
-I$(top_srcdir)/src/framework \
|
|
||||||
-I$(top_srcdir)/src/game \
|
|
||||||
-D_TRINITY_CORE_CONFIG='"$(sysconfdir)/trinitycore.conf"'
|
|
||||||
|
|
||||||
## Sources
|
## Additional files to include when running 'make dist'
|
||||||
trinity_core_SOURCES = \
|
# Include world daemon configuration
|
||||||
$(srcdir)/CliRunnable.cpp \
|
EXTRA_DIST = \
|
||||||
$(srcdir)/CliRunnable.h \
|
mangosd.conf.dist
|
||||||
$(srcdir)/Main.cpp \
|
|
||||||
$(srcdir)/Master.cpp \
|
|
||||||
$(srcdir)/Master.h \
|
|
||||||
$(srcdir)/RASocket.cpp \
|
|
||||||
$(srcdir)/RASocket.h \
|
|
||||||
$(srcdir)/WorldRunnable.cpp \
|
|
||||||
$(srcdir)/WorldRunnable.h
|
|
||||||
|
|
||||||
## Convenience libs to add
|
|
||||||
trinity_core_LDADD = \
|
|
||||||
$(top_builddir)/src/game/libgame.a \
|
|
||||||
$(top_builddir)/src/shared/libshared.a \
|
|
||||||
$(top_builddir)/src/shared/vmap/libvmaps.a \
|
|
||||||
$(top_builddir)/src/framework/libmangosframework.a \
|
|
||||||
$(top_builddir)/dep/src/sockets/libmangossockets.a \
|
|
||||||
$(top_builddir)/dep/src/zthread/libZThread.la \
|
|
||||||
$(top_builddir)/dep/src/g3dlite/libg3dlite.a
|
|
||||||
|
|
||||||
if USE_TSCRIPTS
|
|
||||||
trinity_core_LDADD += $(top_builddir)/src/bindings/scripts/libtrinityscript.la
|
|
||||||
else
|
|
||||||
trinity_core_LDADD += $(top_builddir)/src/bindings/interface/libtrinityscript.la
|
|
||||||
endif
|
|
||||||
|
|
||||||
## Linker flags
|
|
||||||
trinity_core_LDFLAGS = $(MYSQL_LIBS) $(POSTGRE_LIBS) $(ZLIB) $(COMPATLIB) $(SSLLIB) $(TRINI_LIBS) -export-dynamic
|
|
||||||
|
|
||||||
## Additional files to install
|
## Additional files to install
|
||||||
sysconf_DATA = \
|
sysconf_DATA = \
|
||||||
trinitycore.conf.dist
|
mangosd.conf.dist
|
||||||
|
|
||||||
EXTRA_DIST = \
|
|
||||||
trinitycore.conf.dist
|
|
||||||
|
|
||||||
## Prevend overwrite of the config file, if its already installed
|
|
||||||
install-data-hook:
|
install-data-hook:
|
||||||
@list='$(sysconf_DATA)'; for p in $$list; do \
|
@list='$(sysconf_DATA)'; for p in $$list; do \
|
||||||
dest=`echo $$p | sed -e s/.dist//`; \
|
dest=`echo $$p | sed -e s/.dist//`; \
|
||||||
if test -f $(DESTDIR)$(sysconfdir)/$$dest; then \
|
if test -f $(DESTDIR)$(sysconfdir)/$$dest; then \
|
||||||
echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/$$dest"; \
|
echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/$$dest"; \
|
||||||
else \
|
else \
|
||||||
echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$dest"; \
|
echo " $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$dest"; \
|
||||||
$(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$dest; \
|
$(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$dest; \
|
||||||
fi; \
|
fi; \
|
||||||
done
|
done
|
||||||
|
|
||||||
|
clean-local:
|
||||||
|
rm -f $(sysconf_DATA)
|
||||||
|
|||||||
+23
-36
@@ -18,55 +18,42 @@
|
|||||||
|
|
||||||
## Process this file with automake to produce Makefile.in
|
## 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) -DSYSCONFDIR=\"$(sysconfdir)/\"
|
||||||
|
|
||||||
## Build realm list daemon as standalone program
|
## Build realm list daemon as standalone program
|
||||||
bin_PROGRAMS = trinity-realm
|
bin_PROGRAMS = trinity-realmd
|
||||||
|
trinity_realmd_SOURCES = \
|
||||||
|
AuthCodes.h \
|
||||||
|
AuthSocket.cpp \
|
||||||
|
AuthSocket.h \
|
||||||
|
Main.cpp \
|
||||||
|
RealmList.cpp \
|
||||||
|
RealmList.h
|
||||||
|
|
||||||
## Preprocessor flags
|
## Link realm list daemon against the shared library
|
||||||
trinity_realm_CPPFLAGS = \
|
trinity_realmd_LDADD = ../shared/Database/libmangosdatabase.a ../shared/Config/libmangosconfig.a ../shared/Auth/libmangosauth.a ../shared/libmangosshared.a ../framework/libmangosframework.a ../../dep/src/sockets/libmangossockets.a ../../dep/src/zthread/libZThread.la
|
||||||
$(MYSQL_INCLUDES) \
|
trinity_realmd_LDFLAGS = -L../../dep/src/sockets -L../../dep/src/zthread -L$(libdir) $(TRINI_LIBS)
|
||||||
$(POSTGRE_INCLUDES) \
|
|
||||||
$(TRINI_INCLUDES) \
|
|
||||||
-I$(top_srcdir)/dep/include \
|
|
||||||
-I$(top_srcdir)/src/framework \
|
|
||||||
-I$(top_srcdir)/src/shared \
|
|
||||||
-D_TRINITY_REALM_CONFIG='"$(sysconfdir)/trinityrealm.conf"'
|
|
||||||
|
|
||||||
## Sources
|
## Additional files to include when running 'make dist'
|
||||||
trinity_realm_SOURCES = \
|
# Include realm list daemon configuration
|
||||||
$(srcdir)/AuthCodes.h \
|
EXTRA_DIST = \
|
||||||
$(srcdir)/AuthSocket.cpp \
|
realmd.conf.dist
|
||||||
$(srcdir)/AuthSocket.h \
|
|
||||||
$(srcdir)/Main.cpp \
|
|
||||||
$(srcdir)/RealmList.cpp \
|
|
||||||
$(srcdir)/RealmList.h
|
|
||||||
|
|
||||||
## Convenience libs to add
|
|
||||||
trinity_realm_LDADD = \
|
|
||||||
$(top_builddir)/src/shared/libshared.a \
|
|
||||||
$(top_builddir)/src/framework/libmangosframework.a \
|
|
||||||
$(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) $(TRINI_LIBS)
|
|
||||||
|
|
||||||
## Additional files to install
|
## Additional files to install
|
||||||
sysconf_DATA = \
|
sysconf_DATA = \
|
||||||
trinityrealm.conf.dist
|
realmd.conf.dist
|
||||||
|
|
||||||
## Prevend overwrite of the config file, if its already installed
|
|
||||||
install-data-hook:
|
install-data-hook:
|
||||||
@list='$(sysconf_DATA)'; for p in $$list; do \
|
@list='$(sysconf_DATA)'; for p in $$list; do \
|
||||||
dest=`echo $$p | sed -e s/.dist//`; \
|
dest=`echo $$p | sed -e s/.dist//`; \
|
||||||
if test -f $(DESTDIR)$(sysconfdir)/$$dest; then \
|
if test -f $(DESTDIR)$(sysconfdir)/$$dest; then \
|
||||||
echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/$$dest"; \
|
echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/$$dest"; \
|
||||||
else \
|
else \
|
||||||
echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$dest"; \
|
echo " $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$dest"; \
|
||||||
$(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$dest; \
|
$(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$dest; \
|
||||||
fi; \
|
fi; \
|
||||||
done
|
done
|
||||||
|
|
||||||
## Additional files to include when running 'make dist'
|
clean-local:
|
||||||
EXTRA_DIST = trinityrealm.conf.dist
|
rm -f $(sysconf_DATA)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user