diff options
author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-06-12 22:32:26 +0100 |
---|---|---|
committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-06-12 22:32:26 +0100 |
commit | 58d9467d1b2188463b216b79b51a423559e97a75 (patch) | |
tree | 233624f3ae7213c376b6b293160b153061ed7e43 /src/xine-engine | |
parent | aba1fd253b3a2c5cfa13e13eefea469e4e3dff9b (diff) | |
parent | 125e98b02c9d62e09e154f176aacc2b9c51fd164 (diff) | |
download | xine-lib-58d9467d1b2188463b216b79b51a423559e97a75.tar.gz xine-lib-58d9467d1b2188463b216b79b51a423559e97a75.tar.bz2 |
A nice simple merge from 1.1.
Hopefully, I've applied all of the $(LTLIBINTL) changes correctly...
Diffstat (limited to 'src/xine-engine')
-rw-r--r-- | src/xine-engine/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index 8e4a9777a..082b06be9 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -35,7 +35,7 @@ libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \ libxine_la_DEPENDENCIES = $(XINEUTILS_LIB) $(XDG_BASEDIR_DEPS) \ $(pthread_dep) $(LIBXINEPOSIX) libxine_la_LIBADD = $(PTHREAD_LIBS) $(DYNAMIC_LD_LIBS) $(LTLIBINTL) $(ZLIB_LIBS) \ - -lm $(XINEUTILS_LIB) $(LIBICONV) $(FT2_LIBS) $(FONTCONFIG_LIBS) \ + -lm $(XINEUTILS_LIB) $(LTLIBICONV) $(FT2_LIBS) $(FONTCONFIG_LIBS) \ $(LIBXINEPOSIX) $(RT_LIBS) $(NET_LIBS) $(XDG_BASEDIR_LIBS) libxine_la_LDFLAGS = $(AM_LDFLAGS) $(def_ldflags) \ |