summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarlo Bramini <carlo.bramix@libero.it>2012-06-05 12:18:46 +0300
committerCarlo Bramini <carlo.bramix@libero.it>2012-06-05 12:18:46 +0300
commit43d2cc9a1598132bda53d1e95bf7f90e5cc82fab (patch)
tree87fc334d0474ca7d81f47c0789636d4b42f4fe2b /src
parente6dddfdfa6cfa00c5e87e99f5c13e24cadf8204d (diff)
downloadxine-lib-43d2cc9a1598132bda53d1e95bf7f90e5cc82fab.tar.gz
xine-lib-43d2cc9a1598132bda53d1e95bf7f90e5cc82fab.tar.bz2
Fixed -no-undefined handling with mingw and cygwin
"-no-undefined" is not a linker flag, it's a libtool flag, so it must be removed from LDFLAGS for CYGWIN and MINGW. There is already another variable for that purpose.
Diffstat (limited to 'src')
-rw-r--r--src/xine-engine/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index 67ae63fae..535be3557 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -10,7 +10,7 @@ lib_LTLIBRARIES = libxine.la
XINEUTILS_LIB = $(top_builddir)/src/xine-utils/libxineutils.la
DEF_FILE = libxine-$(XINE_MAJOR).def
if WIN32
-def_ldflags=-Wl,--output-def,$(DEF_FILE) $(LDFLAGS_NOUNDEFINED)
+def_ldflags=-Wl,--output-def,$(DEF_FILE)
endif
libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \
@@ -30,7 +30,7 @@ libxine_la_LIBADD = $(PTHREAD_LIBS) $(DYNAMIC_LD_LIBS) $(LTLIBINTL) $(ZLIB_LIBS)
-lm $(XINEUTILS_LIB) $(LTLIBICONV) $(FT2_LIBS) $(FONTCONFIG_LIBS) \
$(LIBXINEPOSIX) $(RT_LIBS) $(NET_LIBS)
-libxine_la_LDFLAGS = \
+libxine_la_LDFLAGS = $(LDFLAGS_NOUNDEFINED) \
-version-info $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE) \
$(def_ldflags)