dixmods-deps.patch revision 957
f6df6236fcf18524e049bba12b69704af32eff90Josh Andlerdiff -urp -x '*~' -x '*.orig' hw/xfree86/dixmods/Makefile.am hw/xfree86/dixmods/Makefile.am
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler--- hw/xfree86/dixmods/Makefile.am 2009-05-08 17:45:57.848078000 -0700
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler+++ hw/xfree86/dixmods/Makefile.am 2009-05-08 17:46:07.162324000 -0700
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler@@ -36,6 +36,7 @@ libdbe_la_SOURCES = dbemodule.c
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler libfb_la_LDFLAGS = -avoid-version
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler libfb_la_LIBADD = $(top_builddir)/fb/libfb.la
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler+libfb_la_LIBADD += -lpixman-1
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler libfb_la_SOURCES = $(top_builddir)/fb/fbcmap_mi.c fbmodule.c
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler libfb_la_CFLAGS = $(AM_CFLAGS)
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler@@ -47,6 +48,8 @@ libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACC
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler libglx_la_LDFLAGS = -avoid-version -mimpure-text
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler GLXDRI_LIBRARY = $(top_builddir)/glx/libglxdri.la
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler+libglx_la_LDFLAGS += -R$(extsmoduledir:amd64/extensions=extensions/amd64)
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler+libglx_la_LDFLAGS += -Wl,-N,libdri.so -Wl,-N,libdri2.so
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler libglx_la_LIBADD = \
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler $(top_builddir)/glx/libglx.la \
f6df6236fcf18524e049bba12b69704af32eff90Josh Andlerdiff -urp -x '*~' -x '*.orig' hw/xfree86/int10/Makefile.am hw/xfree86/int10/Makefile.am
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler--- hw/xfree86/int10/Makefile.am 2007-10-17 07:01:23.000000000 -0700
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler+++ hw/xfree86/int10/Makefile.am 2009-05-08 17:46:07.162854000 -0700
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler@@ -42,3 +42,5 @@ libint10_la_SOURCES = stub.c xf86int10mo
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler+libint10_la_LIBADD = $(PCIACCESS_LIBS)
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler--- hw/xfree86/shadowfb/Makefile.am~ Tue Apr 15 23:14:18 2008
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler+++ hw/xfree86/shadowfb/Makefile.am Wed Apr 7 07:33:34 2010
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler@@ -7,3 +7,5 @@
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler INCLUDES = $(XORG_INCS)
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler+libshadowfb_la_LIBADD = -lXfont
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler--- hw/xfree86/vbe/Makefile.am~ Tue Apr 15 23:14:18 2008
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler+++ hw/xfree86/vbe/Makefile.am Tue Apr 20 16:01:20 2010
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler@@ -8,3 +8,5 @@
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler -I$(srcdir)/../int10
f6df6236fcf18524e049bba12b69704af32eff90Josh Andler+libvbe_la_LIBADD = ../int10/libint10.la