driver/xf86-video-intel/libraries.patch

	libraries.patch revision 1351
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste--- src/Makefile.in Fri Sep 14 12:39:05 2012
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste+++ src/Makefile.in Fri Sep 14 12:39:15 2012
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste@@ -454,7 +454,7 @@
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste intel_drv_la_LIBADD = legacy/liblegacy.la @PCIACCESS_LIBS@ \
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste    $(am__append_2) $(am__append_4) $(am__append_7) \
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste    $(am__append_10)
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste-NULL := #
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste+#NULL := #
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste intel_drv_la_SOURCES = intel_list.h intel_options.h intel_options.c \
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste    intel_module.c compat-api.h $(NULL) $(am__append_5) \
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste    $(am__append_8) $(am__append_9) $(am__append_11)
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste--- src/legacy/Makefile.in  Fri Sep 14 12:40:07 2012
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste+++ src/legacy/Makefile.in  Fri Sep 14 12:40:17 2012
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste@@ -316,7 +316,7 @@
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste top_srcdir = @top_srcdir@
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste SUBDIRS = $(am__append_1)
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste noinst_LTLIBRARIES = liblegacy.la
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste-NULL := #
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste+#NULL := #
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste liblegacy_la_SOURCES = legacy.h $(am__append_2)
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste liblegacy_la_LIBADD = $(am__append_3)
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste EXTRA_DIST = README
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste--- src/Makefile.am Fri Sep 14 12:40:49 2012
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste+++ src/Makefile.am Fri Sep 14 12:43:18 2012
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste@@ -32,6 +32,9 @@
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste intel_drv_la_LDFLAGS = -module -avoid-version
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste intel_drv_ladir = @moduledir@/drivers
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste intel_drv_la_LIBADD = legacy/liblegacy.la @PCIACCESS_LIBS@
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste+intel_drv_la_LDFLAGS += -R $(moduledir) -R $(moduledir)/extensions
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste+intel_drv_la_LIBADD += -lfb -lshadowfb -lXfont -lm \
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste+       -lvbe -lvgahw -lexa -lglx $(XORG_LIBS)
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste if SNA
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste SUBDIRS += sna
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste@@ -38,7 +41,7 @@
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste intel_drv_la_LIBADD += sna/libsna.la
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste endif
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste-NULL:=#
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste+#NULL:=#
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste
c1294b91b94412bc057d660950ed0d3b3091bd38Jaco Jooste intel_drv_la_SOURCES = \
    intel_list.h \
--- src/legacy/Makefile.am  Fri Sep 14 12:43:52 2012
+++ src/legacy/Makefile.am  Fri Sep 14 12:45:12 2012
@@ -1,11 +1,22 @@
 SUBDIRS =
 noinst_LTLIBRARIES = liblegacy.la

-NULL:=#
+#NULL:=#

-liblegacy_la_SOURCES = legacy.h
-liblegacy_la_LIBADD =
+liblegacy_la_SOURCES = legacy.h \
+                      i810/i810_accel.c \
+                      i810/i810_cursor.c \
+                      i810/i810_dga.c \
+                      i810/i810_dri.c \
+                      i810/i810_driver.c \
+                      i810/i810_hwmc.c \
+                      i810/i810_memory.c \
+                      i810/i810_video.c \
+                      i810/i810_wmark.c

+AM_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ -I$(top_srcdir)/src
+liblegacy_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@
+
 if ! KMS_ONLY
 SUBDIRS += i810
 liblegacy_la_SOURCES +=