diff --git a/configure.ac b/configure.ac
index 492565139ed..7ba0164e72e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2158,6 +2158,7 @@ AC_CONFIG_FILES([configs/autoconf
 		src/egl/drivers/Makefile
 		src/egl/drivers/dri2/Makefile
 		src/egl/drivers/glx/Makefile
+		src/egl/Makefile
 		src/egl/main/Makefile
 		src/egl/main/egl.pc
 		src/egl/wayland/Makefile
diff --git a/src/egl/.gitignore b/src/egl/.gitignore
new file mode 100644
index 00000000000..5fc607b9e2f
--- /dev/null
+++ b/src/egl/.gitignore
@@ -0,0 +1 @@
+/Makefile
diff --git a/src/egl/Makefile b/src/egl/Makefile
deleted file mode 100644
index 361f6889580..00000000000
--- a/src/egl/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# src/egl/Makefile
-
-TOP = ../..
-include $(TOP)/configs/current
-
-SUBDIRS =
-
-ifneq ($(findstring wayland, $(EGL_PLATFORMS)),)
-SUBDIRS += wayland
-endif
-
-SUBDIRS += drivers main
-
-default: subdirs
-
-
-subdirs:
-	@for dir in $(SUBDIRS) ; do \
-		if [ -d $$dir ] ; then \
-			(cd $$dir && $(MAKE)) || exit 1 ; \
-		fi \
-	done
-
-install:
-	@for dir in $(SUBDIRS) ; do \
-		if [ -d $$dir ] ; then \
-			(cd $$dir && $(MAKE) install) || exit 1 ; \
-		fi \
-	done
-
-clean:
-	-@for dir in $(SUBDIRS) ; do \
-		if [ -d $$dir ] ; then \
-			(cd $$dir && $(MAKE) clean) ; \
-		fi \
-	done
diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
new file mode 100644
index 00000000000..e6380ecdedf
--- /dev/null
+++ b/src/egl/Makefile.am
@@ -0,0 +1,28 @@
+# Copyright © 2012 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+
+SUBDIRS=
+
+if HAVE_EGL_PLATFORM_WAYLAND
+SUBDIRS += wayland
+endif
+
+SUBDIRS += drivers main