15 files changed, 27 insertions, 0 deletions
diff --git a/hw/xfree86/ddc/Makefile.am b/hw/xfree86/ddc/Makefile.am
index d4d85d2ad..1a1537ff5 100644
--- a/hw/xfree86/ddc/Makefile.am
+++ b/hw/xfree86/ddc/Makefile.am
@@ -1,6 +1,8 @@
 sdk_HEADERS = edid.h vdif.h xf86DDC.h
 
 module_LTLIBRARIES = libddc.la
+
+libddc_la_LDFLAGS = -avoid-version
 libddc_la_SOURCES = xf86DDC.c edid.c interpret_edid.c print_edid.c \
                    interpret_vdif.c print_vdif.c ddcProperty.c
 
diff --git a/hw/xfree86/fbdevhw/Makefile.am b/hw/xfree86/fbdevhw/Makefile.am
index a3283290c..651cfd673 100644
--- a/hw/xfree86/fbdevhw/Makefile.am
+++ b/hw/xfree86/fbdevhw/Makefile.am
@@ -1,5 +1,7 @@
 module_LTLIBRARIES = libfbdevhw.la
 
+libfbdevhw_la_LDFLAGS = -avoid-version
+
 #if FBDEVHW
 libfbdevhw_la_SOURCES = fbdevhw.c
 #else
diff --git a/hw/xfree86/i2c/Makefile.am b/hw/xfree86/i2c/Makefile.am
index 4632e7ee1..38d9130e7 100644
--- a/hw/xfree86/i2c/Makefile.am
+++ b/hw/xfree86/i2c/Makefile.am
@@ -1,5 +1,6 @@
 module_LTLIBRARIES = libi2c.la
 
+libi2c_la_LDFLAGS = -avoid-version
 libi2c_la_SOURCES = xf86i2c.c xf86i2cmodule.c
 
 INCLUDES = $(XORG_INCS)
diff --git a/hw/xfree86/int10/Makefile.am b/hw/xfree86/int10/Makefile.am
index 65e24c548..9680981c8 100644
--- a/hw/xfree86/int10/Makefile.am
+++ b/hw/xfree86/int10/Makefile.am
@@ -2,6 +2,8 @@ module_LTLIBRARIES = libint10.la
 
 sdk_HEADERS = xf86int10.h
 
+libint10_la_LDFLAGS = -avoid-version
+
 if INT10_VM86
 AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS)
 INCLUDES = $(XORG_INCS)
diff --git a/hw/xfree86/rac/Makefile.am b/hw/xfree86/rac/Makefile.am
index a4a751cd0..b125a1424 100644
--- a/hw/xfree86/rac/Makefile.am
+++ b/hw/xfree86/rac/Makefile.am
@@ -1,4 +1,5 @@
 module_LTLIBRARIES = librac.la
+librac_la_LDFLAGS = -avoid-version
 librac_la_SOURCES = xf86RACmodule.c xf86RAC.c
 
 sdk_HEADERS = xf86RAC.h
diff --git a/hw/xfree86/ramdac/Makefile.am b/hw/xfree86/ramdac/Makefile.am
index 9833431de..8fd861517 100644
--- a/hw/xfree86/ramdac/Makefile.am
+++ b/hw/xfree86/ramdac/Makefile.am
@@ -1,4 +1,7 @@
 module_LTLIBRARIES = libramdac.la
+
+libramdac_la_LDFLAGS = -avoid-version
+
 libramdac_la_SOURCES = xf86RamDacMod.c xf86RamDac.c xf86RamDacCmap.c \
                       xf86Cursor.c xf86HWCurs.c IBM.c BT.c TI.c \
 		      xf86BitOrder.c
diff --git a/hw/xfree86/scanpci/Makefile.am b/hw/xfree86/scanpci/Makefile.am
index 78aaffdd2..bd7324307 100644
--- a/hw/xfree86/scanpci/Makefile.am
+++ b/hw/xfree86/scanpci/Makefile.am
@@ -1,5 +1,8 @@
 module_LTLIBRARIES = libscanpci.la libpcidata.la
 
+libpcidata_la_LDFLAGS = -avoid-version
+libscanpci_la_LDFLAGS = -avoid-version
+
 libpcidata_la_SOURCES = xf86PciData.c
 libscanpci_la_SOURCES = xf86ScanPci.c
 
diff --git a/hw/xfree86/shadowfb/Makefile.am b/hw/xfree86/shadowfb/Makefile.am
index 8316eb660..cb5ebb14a 100644
--- a/hw/xfree86/shadowfb/Makefile.am
+++ b/hw/xfree86/shadowfb/Makefile.am
@@ -1,4 +1,5 @@
 module_LTLIBRARIES = libshadowfb.la
+libshadowfb_la_LDFLAGS = -avoid-version
 libshadowfb_la_SOURCES = sfbmodule.c shadow.c
 
 sdk_HEADERS = shadowfb.h
diff --git a/hw/xfree86/vbe/Makefile.am b/hw/xfree86/vbe/Makefile.am
index c27541ae6..02fdb4837 100644
--- a/hw/xfree86/vbe/Makefile.am
+++ b/hw/xfree86/vbe/Makefile.am
@@ -1,4 +1,5 @@
 module_LTLIBRARIES = libvbe.la
+libvbe_la_LDFLAGS = -avoid-version
 libvbe_la_SOURCES = vbe.c vbeModes.c vbe_module.c
 
 sdk_HEADERS = vbe.h vbeModes.h
diff --git a/hw/xfree86/vgahw/Makefile.am b/hw/xfree86/vgahw/Makefile.am
index 5e8c41f49..ff351a839 100644
--- a/hw/xfree86/vgahw/Makefile.am
+++ b/hw/xfree86/vgahw/Makefile.am
@@ -1,4 +1,5 @@
 module_LTLIBRARIES = libvgahw.la
+libvgahw_la_LDFLAGS = -avoid-version
 libvgahw_la_SOURCES = vgaHW.c vgaHWmodule.c
 INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c
 AM_CFLAGS = $(XORG_CFLAGS)
diff --git a/hw/xfree86/xaa/Makefile.am b/hw/xfree86/xaa/Makefile.am
index 36e2adae7..4a60a9caf 100644
--- a/hw/xfree86/xaa/Makefile.am
+++ b/hw/xfree86/xaa/Makefile.am
@@ -8,6 +8,8 @@ MSB_FIXED = mf-xaaBitmap.c mf3-xaaBitmap.c mf-xaaStipple.c mf3-xaaStipple.c \
             mf-xaaTEGlyph.c
 POLYSEG = s-xaaLine.c s-xaaDashLine.c
 
+libxaa_la_LDFLAGS = -avoid-version
+
 module_LTLIBRARIES = libxaa.la
 libxaa_la_SOURCES = xaaInit.c xaaGC.c xaaInitAccel.c xaaFallback.c \
                    xaaBitBlt.c xaaCpyArea.c xaaGCmisc.c xaaCpyWin.c \
diff --git a/hw/xfree86/xf1bpp/Makefile.am b/hw/xfree86/xf1bpp/Makefile.am
index 6525d3bb6..216467609 100644
--- a/hw/xfree86/xf1bpp/Makefile.am
+++ b/hw/xfree86/xf1bpp/Makefile.am
@@ -2,6 +2,8 @@ module_LTLIBRARIES = libxf1bpp.la
 
 sdk_HEADERS = xf1bpp.h mfbmap.h mfbunmap.h
 
+libxf1bpp_la_LDFLAGS = -avoid-version
+
 libxf1bppgen_a_SOURCES = \
         mfbseg.c \
         mfbpgbwht.c \
diff --git a/hw/xfree86/xf4bpp/Makefile.am b/hw/xfree86/xf4bpp/Makefile.am
index 863c0e9c9..fb42b3856 100644
--- a/hw/xfree86/xf4bpp/Makefile.am
+++ b/hw/xfree86/xf4bpp/Makefile.am
@@ -2,6 +2,8 @@ module_LTLIBRARIES = libxf4bpp.la
 
 sdk_HEADERS = xf4bpp.h
 
+libxf4bpp_la_LDFLAGS = -avoid-version
+
 libxf4bpp_la_SOURCES = \
         ppcArea.c \
         ppcBStore.c \
diff --git a/hw/xfree86/xf8_16bpp/Makefile.am b/hw/xfree86/xf8_16bpp/Makefile.am
index 450db2712..c800cbbc7 100644
--- a/hw/xfree86/xf8_16bpp/Makefile.am
+++ b/hw/xfree86/xf8_16bpp/Makefile.am
@@ -6,6 +6,8 @@ INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb
 
 AM_CFLAGS = $(XORG_CFLAGS)
 
+libxf8_16bpp_la_LDFLAGS = -avoid-version
+
 libxf8_16bpp_la_SOURCES = \
 	cfb8_16module.c \
 	cfbscrinit.c \
diff --git a/hw/xfree86/xf8_32wid/Makefile.am b/hw/xfree86/xf8_32wid/Makefile.am
index fc3dd6ebd..c97821415 100644
--- a/hw/xfree86/xf8_32wid/Makefile.am
+++ b/hw/xfree86/xf8_32wid/Makefile.am
@@ -2,6 +2,8 @@ module_LTLIBRARIES = libxf8_32wid.la
 
 sdk_HEADERS = cfb8_32wid.h
 
+libxf8_32wid_la_LDFLAGS = -avoid-version
+
 INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb
 AM_CFLAGS = $(XORG_CFLAGS)