diff options
| author | James Stembridge <jstembridge@users.sourceforge.net> | 2003-03-14 21:07:04 +0000 |
|---|---|---|
| committer | James Stembridge <jstembridge@users.sourceforge.net> | 2003-03-14 21:07:04 +0000 |
| commit | 0fa75a7d2d7de3e46410a9918eb84de281e5247f (patch) | |
| tree | ae88cacbd6bd92e3525ce9eff7516ed06fbffc37 | |
| parent | 913b21e51fd0470c8168db8ee111f7c7156570f2 (diff) | |
| download | xine-lib-0fa75a7d2d7de3e46410a9918eb84de281e5247f.tar.gz xine-lib-0fa75a7d2d7de3e46410a9918eb84de281e5247f.tar.bz2 | |
include dha code in xineplug_vo_out_vidix.so rather than each and every vidix driver
CVS patchset: 4416
CVS date: 2003/03/14 21:07:04
| -rw-r--r-- | src/video_out/Makefile.am | 4 | ||||
| -rw-r--r-- | src/video_out/vidix/drivers/Makefile.am | 11 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am index 82430d317..9c745ffeb 100644 --- a/src/video_out/Makefile.am +++ b/src/video_out/Makefile.am @@ -109,7 +109,9 @@ xineplug_vo_out_sdl_la_LIBADD = $(SDL_LIBS) $(XINE_LIB) xineplug_vo_out_sdl_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_vo_out_vidix_la_SOURCES = alphablend.c video_out_vidix.c -xineplug_vo_out_vidix_la_LIBADD = $(X_LIBS) $(top_builddir)/src/video_out/vidix/libvidix.la +xineplug_vo_out_vidix_la_LIBADD = $(X_LIBS) \ + $(top_builddir)/src/video_out/vidix/libvidix.la \ + $(top_builddir)/src/video_out/libdha/libdha.la xineplug_vo_out_vidix_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_vo_out_pgx64_la_SOURCES = alphablend.c video_out_pgx64.c diff --git a/src/video_out/vidix/drivers/Makefile.am b/src/video_out/vidix/drivers/Makefile.am index 5bcf5d73d..e2843305c 100644 --- a/src/video_out/vidix/drivers/Makefile.am +++ b/src/video_out/vidix/drivers/Makefile.am @@ -20,7 +20,7 @@ endif lib_LTLIBRARIES = $(vidix_drivers) radeon_vid_la_SOURCES = radeon_vid.c -radeon_vid_la_LIBADD = $(top_builddir)/src/video_out/libdha/libdha.la -lm +radeon_vid_la_LIBADD = -lm radeon_vid_la_LDFLAGS = -avoid-version -module rage128_vid.c: @@ -36,15 +36,12 @@ rage128_vid.lo: $(rage128_vid_la_SOURCES) $(LTCOMPILE) -DRAGE128 -c -o $@ `test -f $*.c || echo '$(srcdir)/'`$*.c rage128_vid_la_SOURCES = rage128_vid.c -rage128_vid_la_LIBADD = $(top_builddir)/src/video_out/libdha/libdha.la rage128_vid_la_LDFLAGS = -avoid-version -module pm2_vid_la_SOURCES = pm2_vid.c -pm2_vid_la_LIBADD = $(top_builddir)/src/video_out/libdha/libdha.la pm2_vid_la_LDFLAGS = -avoid-version -module pm3_vid_la_SOURCES = pm3_vid.c -pm3_vid_la_LIBADD = $(top_builddir)/src/video_out/libdha/libdha.la pm3_vid_la_LDFLAGS = -avoid-version -module mach64_vid.lo: @@ -54,11 +51,10 @@ mach64_vid.lo: $(LTCOMPILE) -c -o $@ `test -f $*.c || echo '$(srcdir)/'`$*.c mach64_vid_la_SOURCES = mach64_vid.c -mach64_vid_la_LIBADD = $(top_builddir)/src/video_out/libdha/libdha.la mach64_vid_la_LDFLAGS = -avoid-version -module mga_vid_la_SOURCES = mga_vid.c -mga_vid_la_LIBADD = $(top_builddir)/src/video_out/libdha/libdha.la -lm +mga_vid_la_LIBADD = -lm mga_vid_la_LDFLAGS = -avoid-version -module mga_crtc2_vid.c: @@ -74,11 +70,10 @@ mga_crtc2_vid.lo: $(mga_crtc2_vid_la_SOURCES) $(LTCOMPILE) -DCRTC2 -c -o $@ `test -f $*.c || echo '$(srcdir)/'`$*.c mga_crtc2_vid_la_SOURCES = mga_crtc2_vid.c -mga_crtc2_vid_la_LIBADD = $(top_builddir)/src/video_out/libdha/libdha.la -lm +mga_crtc2_vid_la_LIBADD = -lm mga_crtc2_vid_la_LDFLAGS = -avoid-version -module cyberblade_vid_la_SOURCES = cyberblade_vid.c -cyberblade_vid_la_LIBADD = $(top_builddir)/src/video_out/libdha/libdha.la cyberblade_vid_la_LDFLAGS = -avoid-version -module noinst_HEADERS = mach64.h nvidia.h glint_regs.h pm3_regs.h radeon.h \ |