summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorEgbert Eich <eich@freedesktop.org>2014-02-07 16:21:47 +0100
committerAdam Jackson <ajax@redhat.com>2015-09-23 14:28:56 -0400
commitdabf7c3590b427c185089128ecfd967f188f2658 (patch)
treeb39bb3c46b935f3039d9bef95778f555ca00e56e /hw
parentc7f84c880bbbb508016ad80390a11961b1c4214d (diff)
libxf86config: Remove
The library used by the Xserver to read and parse the configuration file could be built so that it culd be installed as a separate lib and used by external programs. Apparently there has not been any interest in this for quite a while as this library has been broken for a long time now in the sense that it was calling functions provided by the Xserver which were not implemented for the external library. Since this library is useless as it is anyway when built let's drop support for it. Signed-off-by: Egbert Eich <eich@freedesktop.org> Reviewed-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/xfree86/parser/Makefile.am14
-rw-r--r--hw/xfree86/parser/configProcs.h3
2 files changed, 1 insertions, 16 deletions
diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
index 4d0bb4fd8..8e496bfb0 100644
--- a/hw/xfree86/parser/Makefile.am
+++ b/hw/xfree86/parser/Makefile.am
@@ -1,12 +1,4 @@
-if INSTALL_LIBXF86CONFIG
noinst_LTLIBRARIES = libxf86config_internal.la
-lib_LTLIBRARIES = libxf86config.la
-LIBHEADERS = \
- xf86Optrec.h \
- xf86Parser.h
-else
-noinst_LTLIBRARIES = libxf86config_internal.la
-endif
INTERNAL_SOURCES= \
Device.c \
@@ -31,12 +23,6 @@ INTERNAL_SOURCES= \
libxf86config_internal_la_SOURCES = \
$(INTERNAL_SOURCES)
-libxf86config_la_SOURCES = \
- $(top_srcdir)/os/xprintf.c \
- $(INTERNAL_SOURCES)
-libxf86config_la_CFLAGS = $(AM_CFLAGS)
-libxf86config_la_LDFLAGS = -static
-
AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DDATADIR=\"$(datadir)\"
diff --git a/hw/xfree86/parser/configProcs.h b/hw/xfree86/parser/configProcs.h
index e6c231e2d..171f8e85f 100644
--- a/hw/xfree86/parser/configProcs.h
+++ b/hw/xfree86/parser/configProcs.h
@@ -27,8 +27,7 @@
/* Private procs. Public procs are in xf86Parser.h and xf86Optrec.h */
-/* exported functions are/were used by the X Server, and need to be
- * made public when installing libxf86config */
+/* exported functions are/were used by the X Server */
/* Device.c */
XF86ConfDevicePtr xf86parseDeviceSection(void);