diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2006-11-05 15:16:56 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2006-11-05 15:16:56 +0000 |
| commit | d73a763dd8a00220373a2756e56009b83631b846 (patch) | |
| tree | 30e0419588c215df6c66704b43fba409e20d95da /src | |
| parent | 9554ee177df48f2ddd69e1bcc75caa7dad9b921e (diff) | |
| download | xine-lib-d73a763dd8a00220373a2756e56009b83631b846.tar.gz xine-lib-d73a763dd8a00220373a2756e56009b83631b846.tar.bz2 | |
Fix a compile problem which can mean that the Xv output plugin isn't linked
with libXv.
Problem was that the pkgconfig test sets XV_LIBS, but XV_LIB was used
elsewhere. So we change XV_LIB -> XV_LIBS.
The same change is made for XVMC_LIB and XXMC_LIB in case of future use of
pkgconfig.
CVS patchset: 8360
CVS date: 2006/11/05 15:16:56
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_out/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am index 64d95b4f8..2121c009d 100644 --- a/src/video_out/Makefile.am +++ b/src/video_out/Makefile.am @@ -95,18 +95,18 @@ xineplug_vo_out_xshm_la_CFLAGS = $(VISIBILITY_FLAG) $(X_CFLAGS) $(MLIB_CFLAGS) - xineplug_vo_out_xshm_la_LDFLAGS = -avoid-version -module xineplug_vo_out_xv_la_SOURCES = $(X11OSD) deinterlace.c video_out_xv.c -xineplug_vo_out_xv_la_LIBADD = $(XV_LIB) $(X_LIBS) -lXext $(X_PRE_LIBS) -lX11 $(XINE_LIB) $(THREAD_LIBS) +xineplug_vo_out_xv_la_LIBADD = $(XV_LIBS) $(X_LIBS) -lXext $(X_PRE_LIBS) -lX11 $(XINE_LIB) $(THREAD_LIBS) xineplug_vo_out_xv_la_CFLAGS = $(VISIBILITY_FLAG) $(X_CFLAGS) -fno-strict-aliasing xineplug_vo_out_xv_la_LDFLAGS = -avoid-version -module xineplug_vo_out_xvmc_la_SOURCES = deinterlace.c video_out_xvmc.c -xineplug_vo_out_xvmc_la_LIBADD = $(XVMC_LIB) $(XV_LIB) $(X_LIBS) -lXext $(X_PRE_LIBS) -lX11 $(XINE_LIB) $(THREAD_LIBS) +xineplug_vo_out_xvmc_la_LIBADD = $(XVMC_LIBS) $(XV_LIBS) $(X_LIBS) -lXext $(X_PRE_LIBS) -lX11 $(XINE_LIB) $(THREAD_LIBS) xineplug_vo_out_xvmc_la_CFLAGS = $(VISIBILITY_FLAG) $(X_CFLAGS) xineplug_vo_out_xvmc_la_LDFLAGS = -avoid-version -module xineplug_vo_out_xxmc_la_SOURCES = $(X11OSD) deinterlace.c video_out_xxmc.c\ xvmc_mocomp.c xvmc_vld.c xxmc.h -xineplug_vo_out_xxmc_la_LIBADD = $(XXMC_LIB) $(XV_LIB) $(X_LIBS) -lXext $(X_PRE_LIBS) -lX11 $(XINE_LIB) $(THREAD_LIBS) +xineplug_vo_out_xxmc_la_LIBADD = $(XXMC_LIBS) $(XV_LIBS) $(X_LIBS) -lXext $(X_PRE_LIBS) -lX11 $(XINE_LIB) $(THREAD_LIBS) xineplug_vo_out_xxmc_la_CFLAGS = $(VISIBILITY_FLAG) $(X_CFLAGS) -fno-strict-aliasing xineplug_vo_out_xxmc_la_LDFLAGS = -avoid-version -module |