* src/Makefile.am (drivers_LTLIBRARIES), (multimedia_LTLIBRARIES):
	New primaries.  Use them to simplify the library specifications,
	and remove several now-redundant variables.
	(AM_LDFLAGS): Use to set -module -avoid-version.

Index: src/Makefile.am
===================================================================
RCS file: /cvs/xorg/driver/xf86-video-ati/src/Makefile.am,v
retrieving revision 1.10
diff -u -r1.10 Makefile.am
--- src/Makefile.am	8 Dec 2005 17:55:18 -0000	1.10
+++ src/Makefile.am	2 Mar 2006 09:17:41 -0000
@@ -23,9 +23,15 @@
 # this is obnoxious:
 # -module lets us name the module exactly how we want
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
-# _ladir passes a dummy rpath to libtool so the thing will actually link
+# add libraries to dirprefix_LTLIBRARIES so they will end up in dirprefix
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
 
+AM_LDFLAGS = -module -avoid-version
+driversdir = @moduledir@/drivers
+multimediadir = @moduledir@/multimedia
+drivers_LTLIBRARIES =
+multimedia_LTLIBRARIES =
+
 if DRI
 ATIMISC_DRI_SRCS = atidri.c
 R128_DRI_SRCS = r128_dri.c
@@ -43,17 +49,13 @@
 
 AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@
 
-ati_drv_la_LTLIBRARIES = ati_drv.la
-ati_drv_la_LDFLAGS = -module -avoid-version
-ati_drv_ladir = @moduledir@/drivers
+drivers_LTLIBRARIES += ati_drv.la
 ati_drv_la_SOURCES = \
 	ati.c atiadapter.c atibus.c atichip.c atiident.c atioption.c \
 	atiprobe.c atividmem.c atimodule.c $(ATI_CPIO_SOURCES) \
 	radeon_probe.c r128_probe.c
 
-atimisc_drv_la_LTLIBRARIES = atimisc_drv.la
-atimisc_drv_la_LDFLAGS = -module -avoid-version
-atimisc_drv_ladir = @moduledir@/drivers
+drivers_LTLIBRARIES += atimisc_drv.la
 atimisc_drv_la_SOURCES = \
 	atiaccel.c atiadjust.c atiaudio.c aticlock.c aticonfig.c aticonsole.c \
 	aticursor.c atidac.c atidecoder.c atidsp.c atifillin.c atii2c.c \
@@ -63,37 +65,26 @@
 	atixv.c atiload.c atimisc.c $(ATIMISC_DRI_SRCS) $(ATIMISC_DGA_SOURCES) \
 	$(ATIMISC_CPIO_SOURCES)
 
-r128_drv_la_LTLIBRARIES = r128_drv.la
-r128_drv_la_LDFLAGS = -module -avoid-version
-r128_drv_ladir = @moduledir@/drivers
+drivers_LTLIBRARIES += r128_drv.la
 r128_drv_la_SOURCES = \
 	r128_accel.c r128_cursor.c r128_dga.c r128_driver.c \
 	r128_video.c r128_misc.c $(R128_DRI_SRCS)
 
-radeon_drv_la_LTLIBRARIES = radeon_drv.la
-radeon_drv_la_LDFLAGS = -module -avoid-version
-radeon_drv_ladir = @moduledir@/drivers
+drivers_LTLIBRARIES += radeon_drv.la
 radeon_drv_la_SOURCES = \
 	radeon_accel.c radeon_mergedfb.c radeon_cursor.c radeon_dga.c \
 	radeon_driver.c radeon_video.c radeon_bios.c radeon_mm_i2c.c \
 	radeon_vip.c radeon_misc.c radeon_exa.c $(RADEON_DRI_SRCS)
 
-theatre_detect_drv_la_LTLIBRARIES = theatre_detect_drv.la
-theatre_detect_drv_la_LDFLAGS = -module -avoid-version
-theatre_detect_drv_ladir = @moduledir@/multimedia
+multimedia_LTLIBRARIES += theatre_detect_drv.la
 theatre_detect_drv_la_SOURCES = \
 	theatre_detect.c theatre_detect_module.c
 
-theatre_drv_la_LTLIBRARIES = theatre_drv.la
-theatre_drv_la_LDFLAGS = -module -avoid-version
-theatre_drv_ladir = @moduledir@/multimedia
-
+multimedia_LTLIBRARIES += theatre_drv.la
 theatre_drv_la_SOURCES = \
 	theatre.c theatre_module.c
 
-theatre200_drv_la_LTLIBRARIES = theatre200_drv.la
-theatre200_drv_la_LDFLAGS = -module -avoid-version
-theatre200_drv_ladir = @moduledir@/multimedia
+multimedia_LTLIBRARIES += theatre200_drv.la
 theatre200_drv_la_CFLAGS = \
 	$(AM_CFLAGS) -DMICROC_DIR=\"$(theatre200_drv_ladir)\"
 theatre200_drv_la_SOURCES = \