1265N/Adiff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am

1265N/Aindex 72be889..38afb02 100644

1265N/A--- a/hw/xfree86/Makefile.am

1265N/A+++ b/hw/xfree86/Makefile.am

1265N/A@@ -27,8 +27,8 @@ endif

1265N/A

1265N/A SUBDIRS = common ddc i2c x86emu $(INT10_SUBDIR) fbdevhw os-support parser \

1265N/A ramdac shadowfb $(VBE_SUBDIR) $(VGAHW_SUBDIR) $(XAA_SUBDIR) \

1265N/A- loader dixmods exa modes \

1265N/A- $(DRI_SUBDIR) $(DRI2_SUBDIR) $(XF86UTILS_SUBDIR) doc man

1265N/A+ loader $(DRI_SUBDIR) $(DRI2_SUBDIR) dixmods exa modes \

1265N/A+ $(XF86UTILS_SUBDIR) doc man

1265N/A

1265N/A DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \

1265N/A parser ramdac shadowfb vbe vgahw xaa \

1265N/A@@ -38,7 +38,7 @@ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \

1265N/A bin_PROGRAMS = Xorg

1265N/A nodist_Xorg_SOURCES = sdksyms.c

1265N/A

1265N/A-AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@

1265N/A+AM_CFLAGS = $(DIX_CFLAGS) $(PIXMAN_CFLAGS) @XORG_CFLAGS@

1265N/A INCLUDES = $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \

1265N/A -I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac

1265N/A

1124N/Adiff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am

1265N/Aindex 35f46c8..cd9e744 100644

1124N/A--- a/hw/xfree86/dixmods/Makefile.am

1124N/A+++ b/hw/xfree86/dixmods/Makefile.am

1196N/A@@ -35,7 +35,9 @@ libdbe_la_LIBADD = $(top_builddir)/dbe/libdbe.la

1196N/A libdbe_la_SOURCES = dbemodule.c

606N/A

1265N/A libfb_la_LDFLAGS = -module -avoid-version

1196N/A+libfb_la_LDFLAGS += $(XORG_EXTERNS_FLAG)

705N/A libfb_la_LIBADD = $(top_builddir)/fb/libfb.la

705N/A+libfb_la_LIBADD += -lpixman-1

606N/A libfb_la_SOURCES = $(top_builddir)/fb/fbcmap_mi.c fbmodule.c

606N/A libfb_la_CFLAGS = $(AM_CFLAGS)

606N/A

1265N/A@@ -45,8 +47,11 @@ libwfb_la_SOURCES = $(top_builddir)/fb/fbcmap_mi.c fbmodule.c

1196N/A libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER

1196N/A

1265N/A libglx_la_LDFLAGS = -module -avoid-version

1196N/A+libglx_la_LDFLAGS += $(XORG_EXTERNS_FLAG)

1265N/A if AIGLX_DRI_LOADER

705N/A GLXDRI_LIBRARY = $(top_builddir)/glx/libglxdri.la

1265N/A+libglx_la_LDFLAGS += -R$(extsmoduledir) -Wl,../dri/.libs/libdri.so

1265N/A+libglx_la_LDFLAGS += -Wl,../dri2/.libs/libdri2.so $(LIBDRM_LIBS)

705N/A endif

705N/A libglx_la_LIBADD = \

705N/A $(top_builddir)/glx/libglx.la \

1265N/A@@ -59,6 +63,9 @@ librecord_la_SOURCES = recordmod.c

1196N/A

1265N/A libshadow_la_LDFLAGS = -module -avoid-version

1196N/A libshadow_la_LIBADD = $(top_builddir)/miext/shadow/libshadow.la

1265N/A+libshadow_la_DEPENDENCIES = libfb.la

1265N/A+libshadow_la_LDFLAGS += -R$(moduledir) -Wl,.libs/libfb.so

1196N/A+libshadow_la_LDFLAGS += $(XORG_EXTERNS_FLAG)

1196N/A libshadow_la_SOURCES = shmodule.c

606N/A

1196N/A libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c

1196N/Adiff --git a/hw/xfree86/dixmods/extmod/Makefile.am b/hw/xfree86/dixmods/extmod/Makefile.am

1265N/Aindex 87c28a4..81e8345 100644

1196N/A--- a/hw/xfree86/dixmods/extmod/Makefile.am

1196N/A+++ b/hw/xfree86/dixmods/extmod/Makefile.am

1196N/A@@ -28,3 +28,5 @@ libextmod_la_SOURCES = modinit.c \

1196N/A $(XF86VMODE_SRCS) \

1196N/A $(XV_SRCS)

1196N/A libextmod_la_LIBADD = $(top_builddir)/Xext/libXextmodule.la

606N/A+

1196N/A+libextmod_la_LDFLAGS += $(XORG_EXTERNS_FLAG)

1196N/Adiff --git a/hw/xfree86/i2c/Makefile.am b/hw/xfree86/i2c/Makefile.am

1265N/Aindex 0b80cc8..1d7e6e4 100644

1196N/A--- a/hw/xfree86/i2c/Makefile.am

1196N/A+++ b/hw/xfree86/i2c/Makefile.am

1196N/A@@ -22,22 +22,30 @@ sdk_HEADERS = xf86i2c.h bt829.h fi1236.h msp3430.h tda8425.h tda9850.h tda9885.h

1196N/A # i2c drivers

1196N/A #

1196N/A bt829_drv_la_LDFLAGS = -module -avoid-version

1196N/A+bt829_drv_la_LDFLAGS += $(XORG_EXTERNS_FLAG)

1196N/A bt829_drv_la_SOURCES = bt829.c bt829.h bt829_module.c

1196N/A

1196N/A fi1236_drv_la_LDFLAGS = -module -avoid-version

1196N/A+fi1236_drv_la_LDFLAGS += $(XORG_EXTERNS_FLAG)

1196N/A+fi1236_drv_la_LDFLAGS += -Wl,-R,$(multimediadir) -Wl,-N,tda9885_drv.so

1196N/A fi1236_drv_la_SOURCES = fi1236.c fi1236.h fi1236_module.c

1196N/A

1196N/A msp3430_drv_la_LDFLAGS = -module -avoid-version

1196N/A+msp3430_drv_la_LDFLAGS += $(XORG_EXTERNS_FLAG)

1196N/A msp3430_drv_la_SOURCES = msp3430.c msp3430.h msp3430_module.c

1196N/A

1196N/A tda8425_drv_la_LDFLAGS = -module -avoid-version

1196N/A+tda8425_drv_la_LDFLAGS += $(XORG_EXTERNS_FLAG)

1196N/A tda8425_drv_la_SOURCES = tda8425.c tda8425.h tda8425_module.c

1196N/A

1196N/A tda9850_drv_la_LDFLAGS = -module -avoid-version

1196N/A+tda9850_drv_la_LDFLAGS += $(XORG_EXTERNS_FLAG)

1196N/A tda9850_drv_la_SOURCES = tda9850.c tda9850.h tda9850_module.c

1196N/A

1196N/A tda9885_drv_la_LDFLAGS = -module -avoid-version

1196N/A+tda9885_drv_la_LDFLAGS += $(XORG_EXTERNS_FLAG)

1196N/A tda9885_drv_la_SOURCES = tda9885.c tda9885.h tda9885_module.c

1196N/A

1196N/A uda1380_drv_la_LDFLAGS = -module -avoid-version

1196N/A+uda1380_drv_la_LDFLAGS += $(XORG_EXTERNS_FLAG)

1196N/A uda1380_drv_la_SOURCES = uda1380.c uda1380.h uda1380_module.c

1124N/Adiff --git a/hw/xfree86/shadowfb/Makefile.am b/hw/xfree86/shadowfb/Makefile.am

1265N/Aindex 39c6610..a45ad24 100644

1124N/A--- a/hw/xfree86/shadowfb/Makefile.am

1124N/A+++ b/hw/xfree86/shadowfb/Makefile.am

1196N/A@@ -7,3 +7,6 @@ sdk_HEADERS = shadowfb.h

957N/A INCLUDES = $(XORG_INCS)

957N/A

957N/A AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)

957N/A+

1196N/A+libshadowfb_la_LDFLAGS += -z ignore $(XORG_EXTERNS_FLAG)

1196N/A+libshadowfb_la_LIBADD = $(XSERVER_SYS_LIBS) -lXfont

1124N/Adiff --git a/hw/xfree86/vbe/Makefile.am b/hw/xfree86/vbe/Makefile.am

1265N/Aindex 4b794e6..4c2a47a 100644

1124N/A--- a/hw/xfree86/vbe/Makefile.am

1124N/A+++ b/hw/xfree86/vbe/Makefile.am

1196N/A@@ -8,3 +8,6 @@ AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)

957N/A

957N/A INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \

957N/A -I$(srcdir)/../int10

957N/A+

1196N/A+libvbe_la_LDFLAGS += $(XORG_EXTERNS_FLAG)

957N/A+libvbe_la_LIBADD = ../int10/libint10.la