summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2010-11-23 11:38:50 -0800
committerDan Nicholson <dbn.lists@gmail.com>2011-01-08 08:42:33 -0800
commit60801ff8703ec36995139a6dd7b1fc26ae8854a6 (patch)
tree95ec4d825beea4c67d0239638d5bfc60a7945a38
parent86ca434a1ab766c1519ee7146b48dbfead843524 (diff)
xfree86: Convert libxf86config to static libtool library
In order to use libxf86config in a shared library, all the code must be compiled with -fPIC. Add proper PIC support for libxf86config by turning it into a libtool library. However, since we don't want to guarantee API or ABI stability, make sure it's only built static. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> Acked-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r--hw/xfree86/parser/Makefile.am7
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
index fb5d49e88..1cd70e7a5 100644
--- a/hw/xfree86/parser/Makefile.am
+++ b/hw/xfree86/parser/Makefile.am
@@ -1,6 +1,6 @@
if INSTALL_LIBXF86CONFIG
noinst_LTLIBRARIES = libxf86config_internal.la
-lib_LIBRARIES = libxf86config.a
+lib_LTLIBRARIES = libxf86config.la
LIBHEADERS = \
xf86Optrec.h \
xf86Parser.h
@@ -30,10 +30,11 @@ INTERNAL_SOURCES= \
libxf86config_internal_la_SOURCES = \
$(INTERNAL_SOURCES)
-libxf86config_a_SOURCES = \
+libxf86config_la_SOURCES = \
$(top_srcdir)/os/xprintf.c \
$(INTERNAL_SOURCES)
-libxf86config_a_CFLAGS = $(AM_CFLAGS)
+libxf86config_la_CFLAGS = $(AM_CFLAGS)
+libxf86config_la_LDFLAGS = -static
AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) \
-DSYSCONFDIR=\"$(sysconfdir)\" \