Project

General

Profile

Feature #4044 » libraries.patch

Ken Mays, 2013-08-23 03:59 PM

View differences:

src/Makefile.in 2013-08-23 11:08:24.730632600 -0400
452 452
intel_drv_ladir = @moduledir@/drivers
453 453
intel_drv_la_LIBADD = legacy/liblegacy.la @PCIACCESS_LIBS@ \
454 454
	$(XORG_LIBS) $(am__append_2) $(am__append_4)
455
NULL := #
455
#NULL := #
456 456
intel_drv_la_SOURCES = \
457 457
	i915_pciids.h \
458 458
	intel_list.h \
459
-- src/Makefile.am.orig	2013-08-23 11:18:06.321488900 -0400
459
++ src/Makefile.am	2013-08-23 11:21:41.552363500 -0400
......
38 38
intel_drv_la_LDFLAGS = -module -avoid-version
39 39
intel_drv_ladir = @moduledir@/drivers
40 40
intel_drv_la_LIBADD = legacy/liblegacy.la @PCIACCESS_LIBS@ $(XORG_LIBS)
41
intel_drv_la_LDFLAGS += -R $(moduledir) -R $(moduledir)/extensions
42
intel_drv_la_LIBADD += -lfb -lshadowfb -lXfont -lm \
43
       -lvbe -lvgahw -lexa -lglx $(XORG_LIBS)
41 44

  
42 45
if SNA
43 46
SUBDIRS += sna
......
49 52
intel_drv_la_LIBADD += uxa/libuxa.la
50 53
endif
51 54

  
52
NULL:=#
55
#NULL:=#
53 56

  
54 57
intel_drv_la_SOURCES = \
55 58
	i915_pciids.h \
56
-- src/legacy/Makefile.in.orig	2013-08-23 11:17:58.591581900 -0400
59
++ src/legacy/Makefile.in	2013-08-23 11:19:23.468393900 -0400
......
381 381
top_srcdir = @top_srcdir@
382 382
SUBDIRS = $(am__append_1)
383 383
noinst_LTLIBRARIES = liblegacy.la
384
NULL := #
384
#NULL := #
385 385
liblegacy_la_SOURCES = legacy.h $(am__append_2)
386 386
liblegacy_la_LIBADD = $(am__append_3)
387 387
EXTRA_DIST = README
388
-- src/legacy/Makefile.am.orig	2013-08-23 11:31:10.576901200 -0400
388
++ src/legacy/Makefile.am	2013-08-23 11:35:46.935119400 -0400
......
1 1
SUBDIRS =
2 2
noinst_LTLIBRARIES = liblegacy.la
3 3

  
4
NULL:=#
4
#NULL:=#
5 5

  
6
liblegacy_la_SOURCES = legacy.h
7
liblegacy_la_LIBADD =
6
liblegacy_la_SOURCES = legacy.h \
7
                      i810/i810_accel.c \
8
                      i810/i810_cursor.c \
9
                      i810/i810_dga.c \
10
                      i810/i810_dri.c \
11
                      i810/i810_driver.c \
12
                      i810/i810_hwmc.c \
13
                      i810/i810_memory.c \
14
                      i810/i810_video.c \
15
                      i810/i810_wmark.c
16

  
17
AM_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ -I $(top_srcdir)/src
18
liblegacy_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@
8 19

  
9 20
if ! KMS_ONLY
10 21
SUBDIRS += i810
(4-4/6)