summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--hw/xfree86/i2c/Makefile.am26
2 files changed, 15 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index dadb3dd17..094c12a54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Aug 25 17:15:01 2005 Søren Sandmann <sandmann@redhat.com>
+
+ * hw/xfree86/i2c/Makefile.am (module_LTLIBRARIES): Add all the
+ drivers to the module_LTLIBRARIES instead of having separate
+ variables for them. Pointed out by Kristian Høgsberg.
+
2005-08-25 Kristian Høgsberg <krh@redhat.com>
* hw/xfree86/os-support/solaris/Makefile.am (EXTRA_DIST): Remove
diff --git a/hw/xfree86/i2c/Makefile.am b/hw/xfree86/i2c/Makefile.am
index 2b136f987..4022673ba 100644
--- a/hw/xfree86/i2c/Makefile.am
+++ b/hw/xfree86/i2c/Makefile.am
@@ -1,4 +1,12 @@
-module_LTLIBRARIES = libi2c.la
+module_LTLIBRARIES = \
+ libi2c.la \
+ bt829_drv.la \
+ fi1236_drv.la \
+ msp3430_drv.la \
+ tda8425_drv.la \
+ tda9850_drv.la \
+ tda9885_drv.la \
+ uda1380_drv.la
libi2c_la_LDFLAGS = -avoid-version
libi2c_la_SOURCES = xf86i2c.c xf86i2cmodule.c
@@ -9,42 +17,26 @@ AM_CFLAGS = $(XORG_CFLAGS)
sdk_HEADERS = xf86i2c.h bt829.h fi1236.h msp3430.h tda8425.h tda9850.h tda9885.h uda1380.h i2c_def.h
-
-
#
# i2c drivers
#
-bt829_drv_la_LTLIBRARIES = bt829_drv.la
bt829_drv_la_LDFLAGS = -module -avoid-version
-bt829_drv_ladir = @moduledir@/multimedia
bt829_drv_la_SOURCES = bt829.c bt829.h bt829_module.c
-fi1236_drv_la_LTLIBRARIES = fi1236_drv.la
fi1236_drv_la_LDFLAGS = -module -avoid-version
-fi1236_drv_ladir = @moduledir@/multimedia
fi1236_drv_la_SOURCES = fi1236.c fi1236.h fi1236_module.c
-msp3430_drv_la_LTLIBRARIES = msp3430_drv.la
msp3430_drv_la_LDFLAGS = -module -avoid-version
-msp3430_drv_ladir = @moduledir@/multimedia
msp3430_drv_la_SOURCES = msp3430.c msp3430.h msp3430_module.c
-tda8425_drv_la_LTLIBRARIES = tda8425_drv.la
tda8425_drv_la_LDFLAGS = -module -avoid-version
-tda8425_drv_ladir = @moduledir@/multimedia
tda8425_drv_la_SOURCES = tda8425.c tda8425.h tda8425_module.c
-tda9850_drv_la_LTLIBRARIES = tda9850_drv.la
tda9850_drv_la_LDFLAGS = -module -avoid-version
-tda9850_drv_ladir = @moduledir@/multimedia
tda9850_drv_la_SOURCES = tda9850.c tda9850.h tda9850_module.c
-tda9885_drv_la_LTLIBRARIES = tda9885_drv.la
tda9885_drv_la_LDFLAGS = -module -avoid-version
-tda9885_drv_ladir = @moduledir@/multimedia
tda9885_drv_la_SOURCES = tda9885.c tda9885.h tda9885_module.c
-uda1380_drv_la_LTLIBRARIES = uda1380_drv.la
uda1380_drv_la_LDFLAGS = -module -avoid-version
-uda1380_drv_ladir = @moduledir@/multimedia
uda1380_drv_la_SOURCES = uda1380.c uda1380.h uda1380_module.c