From 381be46465fcecf32043629f4fdae3ff7fc7338c Mon Sep 17 00:00:00 2001 From: Alan Hourihane Date: Fri, 28 Sep 2007 16:56:42 +0100 Subject: [PATCH] Don't link XGL_LIBS in xgl Link glucose in with libxgl to pull in symbols. --- hw/xfree86/glucose/Makefile.am | 4 +++- xgl/Makefile.am | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/xfree86/glucose/Makefile.am b/hw/xfree86/glucose/Makefile.am index 0b7cafa63..4e315e74d 100644 --- a/hw/xfree86/glucose/Makefile.am +++ b/hw/xfree86/glucose/Makefile.am @@ -13,6 +13,8 @@ libglucose_la_SOURCES = \ glucosemodule.c libglucose_la_LIBADD = \ - ../../../glucose/libglucose.la + ../../../glucose/libglucose.la \ + ../../../xgl/libxgl.la + include $(top_srcdir)/cpprules.in diff --git a/xgl/Makefile.am b/xgl/Makefile.am index 494a73beb..b386ce036 100644 --- a/xgl/Makefile.am +++ b/xgl/Makefile.am @@ -38,5 +38,3 @@ libxgl_la_SOURCES = \ xgltrap.c \ xglwindow.c \ xglxv.c - -libxgl_la_LIBADD = $(XGL_LIBS)