1351N/A--- src/Makefile.in Fri Sep 14 12:39:05 2012
1351N/A+++ src/Makefile.in Fri Sep 14 12:39:15 2012
1351N/A@@ -454,7 +454,7 @@
1265N/A intel_drv_la_LIBADD = legacy/liblegacy.la @PCIACCESS_LIBS@ \
1265N/A $(am__append_2) $(am__append_4) $(am__append_7) \
1265N/A $(am__append_10)
1265N/A-NULL := #
1265N/A+#NULL := #
1351N/A intel_drv_la_SOURCES = intel_list.h intel_options.h intel_options.c \
1351N/A intel_module.c compat-api.h $(NULL) $(am__append_5) \
1351N/A $(am__append_8) $(am__append_9) $(am__append_11)
1351N/A--- src/legacy/Makefile.in Fri Sep 14 12:40:07 2012
1351N/A+++ src/legacy/Makefile.in Fri Sep 14 12:40:17 2012
1351N/A@@ -316,7 +316,7 @@
1265N/A top_srcdir = @top_srcdir@
1265N/A SUBDIRS = $(am__append_1)
1265N/A noinst_LTLIBRARIES = liblegacy.la
1265N/A-NULL := #
1265N/A+#NULL := #
1265N/A liblegacy_la_SOURCES = legacy.h $(am__append_2)
1265N/A liblegacy_la_LIBADD = $(am__append_3)
1265N/A EXTRA_DIST = README
1351N/A--- src/Makefile.am Fri Sep 14 12:40:49 2012
1351N/A+++ src/Makefile.am Fri Sep 14 12:43:18 2012
1351N/A@@ -32,6 +32,9 @@
957N/A intel_drv_la_LDFLAGS = -module -avoid-version
199N/A intel_drv_ladir = @moduledir@/drivers
1265N/A intel_drv_la_LIBADD = legacy/liblegacy.la @PCIACCESS_LIBS@
1447N/A+intel_drv_la_LDFLAGS += -R $(moduledir)
1447N/A+intel_drv_la_LIBADD += $(XORG_EXTERNS_FLAG) -lfb -lshadowfb -lm \
1447N/A+ -lvbe -lvgahw -lexa $(XORG_LIBS)
1265N/A
1265N/A if SNA
1265N/A SUBDIRS += sna
1351N/A@@ -38,7 +41,7 @@
1265N/A intel_drv_la_LIBADD += sna/libsna.la
1265N/A endif
1265N/A
1265N/A-NULL:=#
1265N/A+#NULL:=#
1265N/A
1265N/A intel_drv_la_SOURCES = \
1351N/A intel_list.h \
1351N/A--- src/legacy/Makefile.am Fri Sep 14 12:43:52 2012
1351N/A+++ src/legacy/Makefile.am Fri Sep 14 12:45:12 2012
1351N/A@@ -1,11 +1,22 @@
1265N/A SUBDIRS =
1265N/A noinst_LTLIBRARIES = liblegacy.la
1089N/A
1265N/A-NULL:=#
1265N/A+#NULL:=#
1351N/A
1351N/A-liblegacy_la_SOURCES = legacy.h
1351N/A-liblegacy_la_LIBADD =
1265N/A+liblegacy_la_SOURCES = legacy.h \
1265N/A+ i810/i810_accel.c \
1265N/A+ i810/i810_cursor.c \
1265N/A+ i810/i810_dga.c \
1265N/A+ i810/i810_dri.c \
1265N/A+ i810/i810_driver.c \
1265N/A+ i810/i810_hwmc.c \
1265N/A+ i810/i810_memory.c \
1265N/A+ i810/i810_video.c \
1265N/A+ i810/i810_wmark.c
1265N/A
1265N/A+AM_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ -I$(top_srcdir)/src
1265N/A+liblegacy_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@
1351N/A+
1265N/A if ! KMS_ONLY
1265N/A SUBDIRS += i810
1351N/A liblegacy_la_SOURCES +=