egl: Drop unnecessary Makefile.am.
authorMatt Turner <mattst88@gmail.com>
Sun, 7 Dec 2014 07:04:12 +0000 (23:04 -0800)
committerMatt Turner <mattst88@gmail.com>
Fri, 12 Dec 2014 20:11:48 +0000 (12:11 -0800)
configure.ac
src/Makefile.am
src/egl/wayland/Makefile.am [deleted file]

index e9319b7b8964e4db6edcf0600d2e25db3d00bbb8..dc7bbceda01fc8e2674ea0ed99028728736c306e 100644 (file)
@@ -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
index 6be8140329a8f76955d4239ce5b2d973941e9613..1e8f26479b359c283d07eb50d87d77c8a73c4a05 100644 (file)
@@ -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 (file)
index ca7207c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = wayland-drm wayland-egl