[RFC PATCH:xf86-video-ati 9/15] Link with modules needed to build with no-undefined linking

[Alan Coopersmith]

Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
 src/Makefile.am |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index dc77c02..4357135 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,11 +26,12 @@
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
 
-radeon_drv_la_LIBADD = $(LIBDRM_RADEON_LIBS)
+radeon_drv_la_LIBADD = $(LIBDRM_RADEON_LIBS) $(XORG_LIBS) -lpixman-1 -lm
+radeon_drv_la_LIBADD += -L$(moduledir) -lfb -lshadow -lxaa -lvgahw -lvbe -lint10
 
 if DRI
 RADEON_DRI_SRCS = radeon_dri.c
-radeon_drv_la_LIBADD += $(DRI_LIBS)
+radeon_drv_la_LIBADD += $(DRI_LIBS) -L$(moduledir)/extensions -ldri -lglx
 endif
 
 RADEON_ATOMBIOS_SOURCES = \
@@ -50,11 +51,13 @@ RADEON_ATOMBIOS_SOURCES = \
 
 if XF86DRM_MODE
 RADEON_KMS_SRCS=radeon_dri2.c radeon_kms.c drmmode_display.c radeon_vbo.c
+radeon_drv_la_LIBADD += -L$(moduledir)/extensions -ldri2
 endif
 
 if USE_EXA
 RADEON_EXA_SOURCES = radeon_exa.c r600_exa.c r6xx_accel.c r600_textured_videofuncs.c r600_shader.c radeon_exa_shared.c \
 	evergreen_exa.c evergreen_accel.c evergreen_shader.c evergreen_textured_videofuncs.c cayman_accel.c cayman_shader.c
+radeon_drv_la_LIBADD += -lexa
 endif
 
 AM_CFLAGS = \
@@ -87,6 +90,12 @@ ati_drv_la_SOURCES = \
 
 radeon_drv_la_LTLIBRARIES = radeon_drv.la
 radeon_drv_la_LDFLAGS = -module -avoid-version
+radeon_drv_la_LDFLAGS += -Wl,$(moduledir)/multimedia/fi1236_drv.so
+radeon_drv_la_LDFLAGS += -Wl,$(moduledir)/multimedia/msp3430_drv.so
+radeon_drv_la_LDFLAGS += -Wl,$(moduledir)/multimedia/tda9885_drv.so
+radeon_drv_la_LDFLAGS += -Wl,$(moduledir)/multimedia/uda1380_drv.so
+radeon_drv_la_LIBADD += theatre_detect_drv.la
+radeon_drv_la_LIBADD += theatre_drv.la
 radeon_drv_ladir = @moduledir@/drivers
 radeon_drv_la_SOURCES = \
 	radeon_accel.c radeon_cursor.c radeon_legacy_memory.c \
-- 
1.7.9.2