diff options
author | Michael Roitzsch <mroi@users.sourceforge.net> | 2002-08-24 10:01:32 +0000 |
---|---|---|
committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2002-08-24 10:01:32 +0000 |
commit | 6efe8033c4edbd4f39beb943eb20fb51ddba25c3 (patch) | |
tree | 8cbb2e7c370dad33f0e06975fcb717cb7fd22eae /src | |
parent | 1ca95308b8b60cd674153c161ae348c1148df7a4 (diff) | |
download | xine-lib-6efe8033c4edbd4f39beb943eb20fb51ddba25c3.tar.gz xine-lib-6efe8033c4edbd4f39beb943eb20fb51ddba25c3.tar.bz2 |
linking fixes
CVS patchset: 2507
CVS date: 2002/08/24 10:01:32
Diffstat (limited to 'src')
-rw-r--r-- | src/dxr3/Makefile.am | 7 | ||||
-rw-r--r-- | src/video_out/Makefile.am | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am index 356ffc851..6d75ccbcd 100644 --- a/src/dxr3/Makefile.am +++ b/src/dxr3/Makefile.am @@ -11,7 +11,7 @@ if HAVE_X11 link_x_libs = $(X_LIBS) -lXext endif if HAVE_LIBFAME -link_fame = -lfame +link_fame = $(LIBFAME_LIBS) endif if HAVE_LIBRTE link_rte = -lrte @@ -20,13 +20,16 @@ endif lib_LTLIBRARIES = $(dxr3_modules) xineplug_decode_dxr3_video_la_SOURCES = dxr3_decode_video.c dxr3_scr.c +xineplug_decode_dxr3_video_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la xineplug_decode_dxr3_video_la_LDFLAGS = -avoid-version -module xineplug_decode_dxr3_spu_la_SOURCES = dxr3_decode_spu.c nav_read.c +xineplug_decode_dxr3_spu_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la xineplug_decode_dxr3_spu_la_LDFLAGS = -avoid-version -module xineplug_vo_out_dxr3_la_SOURCES = video_out_dxr3.c dxr3_mpeg_encoders.c alphablend.c dxr3_spu_encoder.c -xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_x_libs) +xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_x_libs) \ + $(top_builddir)/src/xine-utils/libxineutils.la xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module noinst_HEADERS = dxr3.h dxr3_scr.h video_out_dxr3.h nav_types.h nav_read.h alphablend.h bswap.h diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am index c73fd76b5..99cd43fe1 100644 --- a/src/video_out/Makefile.am +++ b/src/video_out/Makefile.am @@ -84,7 +84,8 @@ xineplug_vo_out_aa_la_LDFLAGS = -avoid-version -module xineplug_vo_out_fb_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \ alphablend.c video_out_fb.c -xineplug_vo_out_fb_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.la +xineplug_vo_out_fb_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.la \ + $(top_builddir)/src/xine-engine/libxine.la xineplug_vo_out_fb_la_LDFLAGS = -avoid-version -module xineplug_vo_out_directfb_la_SOURCES = alphablend.c video_out_directfb.c |