diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-01-01 17:35:04 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-01-01 17:35:04 +0000 |
| commit | f6ad0cf7c06e14f4f9e09e56a546db1692cfe09d (patch) | |
| tree | 3889c94ee31c8c7a6f8a3bf97f70617476284e95 /src/dxr3 | |
| parent | 9285ce63facf833394d79d4e5be6adfa4c70eac6 (diff) | |
| parent | 284db4a4fc4941b7a3b903d3ab23b04840517fd1 (diff) | |
| download | xine-lib-f6ad0cf7c06e14f4f9e09e56a546db1692cfe09d.tar.gz xine-lib-f6ad0cf7c06e14f4f9e09e56a546db1692cfe09d.tar.bz2 | |
Merge (with adjustment) from 1.1.
--HG--
rename : src/libfaad/Makefile.am => contrib/libfaad/Makefile.am
rename : include/xine.h.in => include/xine.h
rename : src/libffmpeg/Makefile.am => src/combined/ffmpeg/Makefile.am
rename : src/libmpeg2/Makefile.am => src/video_dec/libmpeg2/Makefile.am
Diffstat (limited to 'src/dxr3')
| -rw-r--r-- | src/dxr3/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am index f53a2d081..8cef3753c 100644 --- a/src/dxr3/Makefile.am +++ b/src/dxr3/Makefile.am @@ -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) $(LTLIBINTL) $(DYNAMIC_LD_LIBS) -lm +xineplug_vo_out_dxr3_la_LIBADD = $(XINE_LIB) $(link_fame) $(link_rte) $(link_x_libs) $(LTLIBINTL) $(DYNAMIC_LD_LIBS) -lm |