Author: cazfi
Date: Wed Apr 2 01:04:28 2014
New Revision: 24747
URL: http://svn.gna.org/viewcvs/freeciv?rev=24747&view=rev
Log:
Add LUA_LIBS, TOLUA_LIBS, and LUASQL_LIBS to the libraries actually needing
them, not
to the final executables linked against those libraries.
Reported by Patrick Welche <prlw1>
See bug #21696
Modified:
branches/S2_4/client/Makefile.am
branches/S2_4/client/luascript/Makefile.am
branches/S2_4/common/scriptcore/Makefile.am
branches/S2_4/manual/Makefile.am
branches/S2_4/modinst/Makefile.am
branches/S2_4/server/Makefile.am
Modified: branches/S2_4/client/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/client/Makefile.am?rev=24747&r1=24746&r2=24747&view=diff
==============================================================================
--- branches/S2_4/client/Makefile.am (original)
+++ branches/S2_4/client/Makefile.am Wed Apr 2 01:04:28 2014
@@ -180,7 +180,6 @@
libfcgui-gtk2.la \
$(top_builddir)/common/libfreeciv.la \
$(INTLLIBS) $(CLIENT_LIBS) $(SOUND_LIBS) $(LIB_GGZMOD) $(CLIENTICON) \
- $(LUA_LIBS) $(TOLUA_LIBS) $(LUASQL_LIBS) \
$(MAPIMG_WAND_LIBS) \
$(GUI_gtk2_LIBS)
endif
@@ -197,7 +196,6 @@
libfcgui-gtk3.la \
$(top_builddir)/common/libfreeciv.la \
$(INTLLIBS) $(CLIENT_LIBS) $(SOUND_LIBS) $(LIB_GGZMOD) $(CLIENTICON) \
- $(LUA_LIBS) $(TOLUA_LIBS) $(LUASQL_LIBS) \
$(MAPIMG_WAND_LIBS) \
$(GUI_gtk3_LIBS)
endif
@@ -214,7 +212,6 @@
libfcgui-sdl.la \
$(top_builddir)/common/libfreeciv.la \
$(INTLLIBS) $(CLIENT_LIBS) $(SOUND_LIBS) $(LIB_GGZMOD) $(CLIENTICON) \
- $(LUA_LIBS) $(TOLUA_LIBS) $(LUASQL_LIBS) \
$(MAPIMG_WAND_LIBS) \
$(GUI_sdl_LIBS)
endif
@@ -230,7 +227,6 @@
libfcgui-xaw.la \
$(top_builddir)/common/libfreeciv.la \
$(INTLLIBS) $(CLIENT_LIBS) $(SOUND_LIBS) $(LIB_GGZMOD) $(CLIENTICON) \
- $(LUA_LIBS) $(TOLUA_LIBS) $(LUASQL_LIBS) \
$(MAPIMG_WAND_LIBS) \
$(GUI_xaw_LIBS)
endif
@@ -246,7 +242,6 @@
libfcgui-qt.la \
$(top_builddir)/common/libfreeciv.la \
$(INTLLIBS) $(CLIENT_LIBS) $(SOUND_LIBS) $(LIB_GGZMOD) $(CLIENTICON) \
- $(LUA_LIBS) $(TOLUA_LIBS) $(LUASQL_LIBS) \
$(MAPIMG_WAND_LIBS) \
$(GUI_qt_LIBS)
endif
@@ -262,7 +257,6 @@
libfcgui-stub.la \
$(top_builddir)/common/libfreeciv.la \
$(INTLLIBS) $(CLIENT_LIBS) $(SOUND_LIBS) $(LIB_GGZMOD) $(CLIENTICON) \
- $(LUA_LIBS) $(TOLUA_LIBS) $(LUASQL_LIBS) \
$(MAPIMG_WAND_LIBS) \
$(GUI_stub_LIBS)
endif
Modified: branches/S2_4/client/luascript/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/client/luascript/Makefile.am?rev=24747&r1=24746&r2=24747&view=diff
==============================================================================
--- branches/S2_4/client/luascript/Makefile.am (original)
+++ branches/S2_4/client/luascript/Makefile.am Wed Apr 2 01:04:28 2014
@@ -26,6 +26,9 @@
tolua_client_gen.c \
tolua_client_gen.h
+libscripting_client_la_LIBADD = \
+ $(LUA_LIBS) $(TOLUA_LIBS) $(LUASQL_LIBS)
+
tolua_client_gen.c tolua_client_gen.h: tolua_client.pkg
$(TOLUA) -n client -o $(srcdir)/tolua_client_gen.c \
-H $(srcdir)/tolua_client_gen.h $(srcdir)/tolua_client.pkg
Modified: branches/S2_4/common/scriptcore/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/common/scriptcore/Makefile.am?rev=24747&r1=24746&r2=24747&view=diff
==============================================================================
--- branches/S2_4/common/scriptcore/Makefile.am (original)
+++ branches/S2_4/common/scriptcore/Makefile.am Wed Apr 2 01:04:28 2014
@@ -57,6 +57,9 @@
tolua_signal_gen.c \
tolua_signal_gen.h
+libscriptcore_la_LIBADD = \
+ $(LUA_LIBS) $(TOLUA_LIBS) $(LUASQL_LIBS)
+
tolua_common_a_gen.c tolua_common_a_gen.h: tolua_common_a.pkg
$(TOLUA) -n common_a -o $(srcdir)/tolua_common_a_gen.c \
-H $(srcdir)/tolua_common_a_gen.h $(srcdir)/tolua_common_a.pkg
Modified: branches/S2_4/manual/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/manual/Makefile.am?rev=24747&r1=24746&r2=24747&view=diff
==============================================================================
--- branches/S2_4/manual/Makefile.am (original)
+++ branches/S2_4/manual/Makefile.am Wed Apr 2 01:04:28 2014
@@ -23,7 +23,6 @@
$(top_builddir)/server/libfreeciv-srv.la \
../client/helpdata.lo \
$(top_builddir)/common/libfreeciv.la \
- $(LUA_LIBS) $(TOLUA_LIBS) $(LUASQL_LIBS) \
$(INTLLIBS) $(MAPIMG_WAND_LIBS) \
$(FCDB_MYSQL_LIBS) $(FCDB_POSTGRES_LIBS) $(FCDB_SQLITE3_LIBS) \
$(SERVER_LIBS) $(LIB_GGZDMOD)
Modified: branches/S2_4/modinst/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/modinst/Makefile.am?rev=24747&r1=24746&r2=24747&view=diff
==============================================================================
--- branches/S2_4/modinst/Makefile.am (original)
+++ branches/S2_4/modinst/Makefile.am Wed Apr 2 01:04:28 2014
@@ -28,7 +28,6 @@
freeciv_modpack_LDADD = \
$(top_builddir)/common/libfreeciv.la \
- $(LUA_LIBS) $(TOLUA_LIBS) $(LUASQL_LIBS) \
$(MAPIMG_WAND_LIBS) \
$(MP_gtk_LIBS) \
$(MPICON)
Modified: branches/S2_4/server/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/server/Makefile.am?rev=24747&r1=24746&r2=24747&view=diff
==============================================================================
--- branches/S2_4/server/Makefile.am (original)
+++ branches/S2_4/server/Makefile.am Wed Apr 2 01:04:28 2014
@@ -133,14 +133,14 @@
$(top_builddir)/server/scripting/libscripting_server.la
libfreeciv_srv_la_LIBADD = \
- $(srvlibs)
+ $(srvlibs) \
+ $(LUA_LIBS) $(TOLUA_LIBS) $(LUASQL_LIBS)
freeciv_server_LDFLAGS = $(GGZDMOD_LDFLAGS)
freeciv_server_LDADD = \
./libfreeciv-srv.la \
$(top_builddir)/common/libfreeciv.la \
- $(LUA_LIBS) $(TOLUA_LIBS) $(LUASQL_LIBS) \
$(INTLLIBS) \
$(MAPIMG_WAND_LIBS) \
$(FCDB_MYSQL_LIBS) $(FCDB_POSTGRES_LIBS) $(FCDB_SQLITE3_LIBS) \
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
