summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArkadiusz Miskiewicz <arekm@maven.pl>2009-07-03 11:03:32 +0200
committerKeith Packard <keithp@keithp.com>2009-07-06 13:23:29 -0700
commitc859b736d1d23c5dc2f53958b1e76660e6d45018 (patch)
treeaffbf63482075aa99f893b094b3afc7384779188
parent6f82ca0f8bfc074474407cb5ffe782c3c128f838 (diff)
xfree86: remove duplicate header entries in Makefile.am
fixes https://bugs.freedesktop.org/show_bug.cgi?id=22547 This bug was fixed in a big clean-up commit in master, which cannot be backported (see commit b1dac41fb3853ca8182048ea57b88b6e84ecceb3) Signed-off-by: RĂ©mi Cardona <remi@gentoo.org> Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--hw/xfree86/common/Makefile.am2
-rw-r--r--hw/xfree86/parser/Makefile.am4
2 files changed, 2 insertions, 4 deletions
diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
index 77ab4c386..b38c14a7d 100644
--- a/hw/xfree86/common/Makefile.am
+++ b/hw/xfree86/common/Makefile.am
@@ -47,7 +47,7 @@ sdk_HEADERS = compiler.h fourcc.h xf86.h xf86Module.h xf86Opt.h \
xf86PciInfo.h xf86Priv.h xf86Privstr.h xf86Resources.h \
xf86cmap.h xf86fbman.h xf86str.h xf86RAC.h xf86Xinput.h xisb.h \
$(XVSDKINCS) xorgVersion.h \
- xf86sbusBus.h xf86xv.h xf86xvmc.h xf86xvpriv.h
+ xf86sbusBus.h xf86xvpriv.h
DISTCLEANFILES = xf86Build.h
CLEANFILES = $(BUILT_SOURCES)
diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
index 7f599f9c4..6ed181461 100644
--- a/hw/xfree86/parser/Makefile.am
+++ b/hw/xfree86/parser/Makefile.am
@@ -35,6 +35,4 @@ EXTRA_DIST = \
xf86tokens.h
sdk_HEADERS = \
- $(LIBHEADERS) \
- xf86Parser.h \
- xf86Optrec.h
+ $(LIBHEADERS)