diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Makefile.am | 2 | ||||
| -rw-r--r-- | src/shared/Makefile.am | 2 | ||||
| -rw-r--r-- | src/trinitycore/Makefile.am | 5 | ||||
| -rw-r--r-- | src/trinityrealm/Makefile.am | 5 |
4 files changed, 2 insertions, 12 deletions
diff --git a/src/game/Makefile.am b/src/game/Makefile.am index 6d9fc63af82..cffd1f7b093 100644 --- a/src/game/Makefile.am +++ b/src/game/Makefile.am @@ -30,8 +30,6 @@ libgame_a_CPPFLAGS = \ $(MYSQL_INCLUDES) \ $(POSTGRE_INCLUDES) \ -I$(top_srcdir)/dep/include \ --I$(top_srcdir)/dep/ACE_wrappers \ --I$(top_builddir)/dep/ACE_wrappers \ -I$(top_srcdir)/src/framework \ -I$(top_srcdir)/src/shared \ -I$(top_srcdir)/src/shared/vmap diff --git a/src/shared/Makefile.am b/src/shared/Makefile.am index 4111be0798e..4df10557532 100644 --- a/src/shared/Makefile.am +++ b/src/shared/Makefile.am @@ -30,8 +30,6 @@ libshared_a_CPPFLAGS = \ $(MYSQL_INCLUDES) \ $(POSTGRE_INCLUDES) \ -I$(top_srcdir)/dep/include \ --I$(top_srcdir)/dep/ACE_wrappers \ --I$(top_builddir)/dep/ACE_wrappers \ -I$(top_srcdir)/src/framework # libmangosshared library will later be reused by ... diff --git a/src/trinitycore/Makefile.am b/src/trinitycore/Makefile.am index 6f74bd1c658..6f69fd6021c 100644 --- a/src/trinitycore/Makefile.am +++ b/src/trinitycore/Makefile.am @@ -24,8 +24,6 @@ trinity_core_CPPFLAGS = \ $(MYSQL_INCLUDES) \ $(POSTGRE_INCLUDES) \ -I$(top_srcdir)/dep/include \ --I$(top_srcdir)/dep/ACE_wrappers \ --I$(top_builddir)/dep/ACE_wrappers \ -I$(top_srcdir)/src/shared \ -I$(top_srcdir)/src/framework \ -I$(top_srcdir)/src/game \ @@ -51,7 +49,6 @@ $(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/ACE_wrappers/ace/libACE.la \ $(top_builddir)/dep/src/g3dlite/libg3dlite.a if USE_TSCRIPTS @@ -61,7 +58,7 @@ trinity_core_LDADD += $(top_builddir)/src/bindings/interface/libtrinityscript.la endif ## Linker flags -trinity_core_LDFLAGS = $(MYSQL_LIBS) $(POSTGRE_LIBS) $(ZLIB) $(COMPATLIB) $(SSLLIB) -export-dynamic +trinity_core_LDFLAGS = $(MYSQL_LIBS) $(POSTGRE_LIBS) $(ZLIB) $(COMPATLIB) $(SSLLIB) $(ACE_LIBS) -export-dynamic ## Additional files to install sysconf_DATA = \ diff --git a/src/trinityrealm/Makefile.am b/src/trinityrealm/Makefile.am index e8ba49aa509..8a2b78359ef 100644 --- a/src/trinityrealm/Makefile.am +++ b/src/trinityrealm/Makefile.am @@ -24,8 +24,6 @@ trinity_realm_CPPFLAGS = \ $(MYSQL_INCLUDES) \ $(POSTGRE_INCLUDES) \ -I$(top_srcdir)/dep/include \ --I$(top_srcdir)/dep/ACE_wrappers \ --I$(top_builddir)/dep/ACE_wrappers \ -I$(top_srcdir)/src/framework \ -I$(top_srcdir)/src/shared \ -D_TRINITY_REALM_CONFIG='"$(sysconfdir)/trinityrealm.conf"' @@ -44,11 +42,10 @@ 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/ACE_wrappers/ace/libACE.la \ $(top_builddir)/dep/src/zthread/libZThread.la ## Linker flags -trinity_realm_LDFLAGS = $(MYSQL_LIBS) $(POSTGRE_LIBS) $(ZLIB) $(COMPATLIB) $(SSLLIB) +trinity_realm_LDFLAGS = $(MYSQL_LIBS) $(POSTGRE_LIBS) $(ZLIB) $(COMPATLIB) $(SSLLIB) $(ACE_LIBS) ## Additional files to install sysconf_DATA = \ |