[RFC PATCH:xf86-video-intel 11/15] Link with modules needed to build with no-undefined linking
Alan Coopersmith
alan.coopersmith at oracle.com
Fri May 25 08:02:15 PDT 2012
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
src/Makefile.am | 7 ++++++-
src/legacy/i810/Makefile.am | 3 +++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index d057e43..31bb5e6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,7 +31,8 @@ AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @PCIACCESS_CFLAGS@
intel_drv_la_LTLIBRARIES = intel_drv.la
intel_drv_la_LDFLAGS = -module -avoid-version
intel_drv_ladir = @moduledir@/drivers
-intel_drv_la_LIBADD = legacy/liblegacy.la @PCIACCESS_LIBS@
+intel_drv_la_LIBADD = legacy/liblegacy.la @PCIACCESS_LIBS@ @XORG_LIBS@
+intel_drv_la_LIBADD += -L$(moduledir) -lfb
if SNA
SUBDIRS += sna
@@ -95,6 +96,7 @@ intel_drv_la_SOURCES += \
$(NULL)
intel_drv_la_LIBADD += \
$(DRI_LIBS) \
+ -L$(moduledir)/extensions -ldri2 \
$(NULL)
endif
@@ -103,5 +105,8 @@ intel_drv_la_SOURCES += \
intel_hwmc.h \
intel_hwmc.c \
$(NULL)
+intel_drv_la_LIBADD += \
+ -L$(moduledir)/extensions -lextmod \
+ $(NULL)
endif
endif
diff --git a/src/legacy/i810/Makefile.am b/src/legacy/i810/Makefile.am
index e7fa04f..6240c2c 100644
--- a/src/legacy/i810/Makefile.am
+++ b/src/legacy/i810/Makefile.am
@@ -20,11 +20,14 @@ liblegacy_i810_la_SOURCES = \
i810_video.c \
i810_wmark.c
+liblegacy_i810_la_LIBADD = -L$(moduledir) -lvbe -lvgahw -lshadowfb -lxaa -lm
+
if DRI
liblegacy_i810_la_SOURCES +=\
i810_dri.c \
i810_dri.h \
$(NULL)
+liblegacy_i810_la_LIBADD += -L$(moduledir)/extensions -ldri
if XVMC
liblegacy_i810_la_SOURCES += \
--
1.7.9.2
More information about the xorg-devel
mailing list