From 396d3a7762abd0dd84042833b75f2ebf9d100bb0 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Wed, 8 Jul 2009 11:26:46 -0700 Subject: [PATCH] Fix build of drivers with 1.6.2 when not using --install-libxf86config c859b736d1d23c5dc2f53958b1e76660e6d45018 removed duplicate entries for these from the Makefile, but removed a different set than was done in master branch, causing xf86Parser.h to not be installed, which in turn breaks the build of drivers like -ati, -intel & -nv that use xf86Modes.h, which includes xf86Parser.h Signed-off-by: Alan Coopersmith Signed-off-by: Keith Packard --- hw/xfree86/parser/Makefile.am | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am index 6ed181461..a2774a47e 100644 --- a/hw/xfree86/parser/Makefile.am +++ b/hw/xfree86/parser/Makefile.am @@ -1,8 +1,5 @@ if INSTALL_LIBXF86CONFIG lib_LIBRARIES = libxf86config.a -LIBHEADERS = \ - xf86Optrec.h \ - xf86Parser.h else noinst_LIBRARIES = libxf86config.a endif @@ -30,9 +27,8 @@ AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) EXTRA_DIST = \ Configint.h \ configProcs.h \ - xf86Optrec.h \ - xf86Parser.h \ xf86tokens.h sdk_HEADERS = \ - $(LIBHEADERS) + xf86Optrec.h \ + xf86Parser.h