From 7966dfa47c4d2b022ebf0f25a2db3901376e6cbd Mon Sep 17 00:00:00 2001 From: Thomas Hellstrom Date: Fri, 17 Jun 2011 08:18:13 +0200 Subject: [PATCH] vmwgfx, saa: Build saa as a convenience library instead of as a shared object. Signed-off-by: Thomas Hellstrom --- configure.ac | 2 +- saa/Makefile.am | 4 ++-- vmwgfx/Makefile.am | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index d4580ee..8deae86 100644 --- a/configure.ac +++ b/configure.ac @@ -124,7 +124,7 @@ AC_SUBST([DRIVER_NAME]) VMWGFX_DIRS= if test x$BUILD_VMWGFX = xyes; then - VMWGFX_DIRS="vmwgfx saa" + VMWGFX_DIRS="saa vmwgfx" AC_CONFIG_FILES([ saa/Makefile vmwgfx/Makefile diff --git a/saa/Makefile.am b/saa/Makefile.am index 4f56d3f..849ced9 100644 --- a/saa/Makefile.am +++ b/saa/Makefile.am @@ -1,7 +1,7 @@ -libsaa_la_LTLIBRARIES = libsaa.la -libsaa_ladir = @libdir@ +noinst_LTLIBRARIES = libsaa.la libsaa_la_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) +libsaa_la_LDFLAGS = -static libsaa_la_SOURCES = \ saa.c \ saa_pixmap.c \ diff --git a/vmwgfx/Makefile.am b/vmwgfx/Makefile.am index db58405..ce4b115 100644 --- a/vmwgfx/Makefile.am +++ b/vmwgfx/Makefile.am @@ -1,7 +1,7 @@ vmwgfx_drv_la_LTLIBRARIES = vmwgfx_drv.la vmwgfx_drv_la_LDFLAGS = -module -avoid-version vmwgfx_drv_la_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) @LIBDRM_CFLAGS@ @XATRACKER_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/saa -vmwgfx_drv_la_LIBADD = @LIBDRM_LIBS@ $(top_srcdir)/saa/.libs/libsaa.la\ +vmwgfx_drv_la_LIBADD = @LIBDRM_LIBS@ $(top_srcdir)/saa/libsaa.la\ @XATRACKER_LIBS@ vmwgfx_drv_ladir = @moduledir@/drivers -- 2.7.4