Author: torangan
Date: Wed Feb 27 21:36:15 2008
New Revision: 24129
URL: http://svn.gna.org/viewcvs/wesnoth?rev=24129&view=rev
Log:
allow compilation with LDFLAGS=-Wl,--as-needed again
Modified:
trunk/src/Makefile.am
Modified: trunk/src/Makefile.am
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/Makefile.am?rev=24129&r1=24128&r2=24129&view=diff
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Wed Feb 27 21:36:15 2008
@@ -41,7 +41,9 @@
pkgdatadir=$(datadir)/@DATADIR@
-THELIBS = -L. -lwesnoth-core $(SDL_IMAGE_LIBS) $(SDL_MIXER_LIBS)
$(SDL_NET_LIBS) \
+INTERNALLIBS = -lwesnoth-core
+
+THELIBS = -L. $(SDL_IMAGE_LIBS) $(SDL_MIXER_LIBS) $(SDL_NET_LIBS) \
$(SDL_TTF_LIBS) $(SDL_LIBS) $(PYTHON_LIBS) $(FREETYPE_LIBS) $(LIBINTL) \
$(BOOST_IOSTREAMS_LIBS)
@@ -116,7 +118,7 @@
game.cpp \
$(wesnoth_source)
-wesnoth_LDADD = $(THELIBS) libwesnoth.a
+wesnoth_LDADD = $(INTERNALLIBS) libwesnoth.a $(THELIBS)
wesnoth_DEPENDENCIES=libwesnoth-core.a libwesnoth.a
#############################################################################
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
