From: Matt Turner <mattst88@gmail.com>
Date: Sun, 7 Dec 2014 07:04:12 +0000 (-0800)
Subject: egl: Drop unnecessary Makefile.am.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7a08a1e61b888142e9dbb40a9f93839036850626;p=mesa.git

egl: Drop unnecessary Makefile.am.
---

diff --git a/configure.ac b/configure.ac
index e9319b7b896..dc7bbceda01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2146,7 +2146,6 @@ AC_CONFIG_FILES([Makefile
 		src/egl/drivers/dri2/Makefile
 		src/egl/main/Makefile
 		src/egl/main/egl.pc
-		src/egl/wayland/Makefile
 		src/egl/wayland/wayland-drm/Makefile
 		src/egl/wayland/wayland-egl/Makefile
 		src/egl/wayland/wayland-egl/wayland-egl.pc
diff --git a/src/Makefile.am b/src/Makefile.am
index 6be8140329a..1e8f26479b3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,7 +32,7 @@ SUBDIRS += glx
 endif
 
 if HAVE_EGL_PLATFORM_WAYLAND
-SUBDIRS += egl/wayland
+SUBDIRS += egl/wayland/wayland-egl egl/wayland/wayland-drm
 endif
 
 if HAVE_EGL_DRIVER_DRI2
diff --git a/src/egl/wayland/Makefile.am b/src/egl/wayland/Makefile.am
deleted file mode 100644
index ca7207c1ce9..00000000000
--- a/src/egl/wayland/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = wayland-drm wayland-egl