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/dxr3 | |
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/dxr3')
-rw-r--r-- | src/dxr3/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am index 26743d43c..f53a2d081 100644 --- a/src/dxr3/Makefile.am +++ b/src/dxr3/Makefile.am @@ -25,15 +25,15 @@ xineplug_LTLIBRARIES = xineplug_decode_dxr3_video.la \ endif xineplug_decode_dxr3_video_la_SOURCES = dxr3_decode_video.c -xineplug_decode_dxr3_video_la_LIBADD = $(XINE_LIB) +xineplug_decode_dxr3_video_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) if WITH_EXTERNAL_DVDNAV xineplug_decode_dxr3_spu_la_SOURCES = dxr3_decode_spu.c -xineplug_decode_dxr3_spu_la_LIBADD = $(XINE_LIB) $(DVDNAV_LIBS) +xineplug_decode_dxr3_spu_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(DVDNAV_LIBS) xineplug_decode_dxr3_spu_la_CFLAGS = $(AM_CFLAGS) $(DVDNAV_CFLAGS) else xineplug_decode_dxr3_spu_la_SOURCES = dxr3_decode_spu.c nav_read.c -xineplug_decode_dxr3_spu_la_LIBADD = $(XINE_LIB) +xineplug_decode_dxr3_spu_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) xineplug_decode_dxr3_spu_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/input/libdvdnav endif @@ -43,4 +43,4 @@ xineplug_vo_out_dxr3_la_SOURCES = \ dxr3_scr.c \ video_out_dxr3.c -xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_x_libs) $(XINE_LIB) $(DYNAMIC_LD_LIBS) -lm +xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_x_libs) $(XINE_LIB) $(LTLIBINTL) $(DYNAMIC_LD_LIBS) -lm |