summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2019-07-23 14:33:45 -0400
committerAdam Jackson <ajax@redhat.com>2019-10-02 10:03:26 -0400
commitb2de577f6388c6dd7a463e5cebb8b1366bb45d1f (patch)
tree17045289d20a4fe028d56eaf7ac69f5d8c931ce0 /Makefile.am
parente7b5af451c101608d8cc003e8dd0ff83ded17146 (diff)
xfree86: Merge vbe into int10
There's not really a good reason to keep these separate, the vbe code requires int10 and is not very large. This change eliminates the build-time options for vbe; if you build int10, you get vbe. Gitlab: https://gitlab.freedesktop.org/xorg/xserver/issues/692 Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am1
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 89e6006f3..575296509 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -180,7 +180,6 @@ EXTRA_DIST += \
hw/xfree86/parser/meson.build \
hw/xfree86/ramdac/meson.build \
hw/xfree86/shadowfb/meson.build \
- hw/xfree86/vbe/meson.build \
hw/xfree86/vgahw/meson.build \
hw/xfree86/x86emu/meson.build \
hw/xfree86/xkb/meson.build \