From f520a8933ac659d52b66049b2bb2402a9d50c48b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sun, 31 Dec 2006 17:23:36 +0000 Subject: Link to libdha as suggested by Jason Tackaberry, this should be the last linking error. CVS patchset: 8483 CVS date: 2006/12/31 17:23:36 --- src/video_out/vidix/drivers/Makefile.am | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/video_out/vidix/drivers/Makefile.am b/src/video_out/vidix/drivers/Makefile.am index 9e31be6cb..55bb51f2f 100644 --- a/src/video_out/vidix/drivers/Makefile.am +++ b/src/video_out/vidix/drivers/Makefile.am @@ -23,45 +23,53 @@ endif lib_LTLIBRARIES = $(vidix_drivers) radeon_vid_la_SOURCES = radeon_vid.c -radeon_vid_la_LIBADD = -lm +radeon_vid_la_LIBADD = -lm $(top_builddir)/src/video_out/vidix/libdha.la radeon_vid_la_LDFLAGS = -avoid-version -module rage128_vid_la_SOURCES = radeon_vid.c +rage128_vid_la_LIBADD = $(top_builddir)/src/video_out/vidix/libdha.la rage128_vid_la_LDFLAGS = -avoid-version -module rage128_vid_la_CFLAGS = -DRAGE128 $(AM_CFLAGS) pm2_vid_la_SOURCES = pm2_vid.c +pm2_vid_la_LIBADD = $(top_builddir)/src/video_out/vidix/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/vidix/libdha.la pm3_vid_la_LDFLAGS = -avoid-version -module mach64_vid_la_SOURCES = mach64_vid.c +mach64_la_LIBADD = $(top_builddir)/src/video_out/vidix/libdha.la mach64_vid_la_LDFLAGS = -avoid-version -module mga_vid_la_SOURCES = mga_vid.c -mga_vid_la_LIBADD = -lm +mga_vid_la_LIBADD = -lm $(top_builddir)/src/video_out/vidix/libdha.la mga_vid_la_LDFLAGS = -avoid-version -module mga_crtc2_vid_la_SOURCES = mga_vid.c -mga_crtc2_vid_la_LIBADD = -lm +mga_crtc2_vid_la_LIBADD = -lm $(top_builddir)/src/video_out/vidix/libdha.la mga_crtc2_vid_la_LDFLAGS = -avoid-version -module mga_crtc2_vid_la_CFLAGS = -DCRTC2 $(AM_CFLAGS) cyberblade_vid_la_SOURCES = cyberblade_vid.c +cyberblade_vid_la_LIBADD = $(top_builddir)/src/video_out/vidix/libdha.la cyberblade_vid_la_LDFLAGS = -avoid-version -module unichrome_vid_la_SOURCES = unichrome_vid.c +unichrome_vid_la_LIBADD = $(top_builddir)/src/video_out/vidix/libdha.la unichrome_vid_la_LDFLAGS = -avoid-version -module nvidia_vid_la_SOURCES = nvidia_vid.c +nvidia_vid_la_LIBADD = $(top_builddir)/src/video_out/vidix/libdha.la nvidia_vid_la_LDFLAGS = -avoid-version -module sis_vid_la_SOURCES = sis_vid.c sis_bridge.c +sis_vid_la_LIBADD = $(top_builddir)/src/video_out/vidix/libdha.la sis_vid_la_LDFLAGS = -avoid-version -module savage_vid_la_SOURCES = savage_vid.c -savage_vid_la_LIBADD = -lm +savage_vid_la_LIBADD = -lm $(top_builddir)/src/video_out/vidix/libdha.la savage_vid_la_LDFLAGS = -avoid-version -module noinst_HEADERS = mach64.h glint_regs.h pm3_regs.h radeon.h savage_regs.h \ -- cgit v1.2.3