From 1d4007fbd9d4c2573815603f07d8e79fe1d377fc Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sun, 10 Nov 2013 17:37:54 -0800 Subject: [PATCH] egl/build: Drop two unnecessary Makefiles. Acked-by: Emil Velikov --- configure.ac | 2 -- src/Makefile.am | 6 +++++- src/egl/Makefile.am | 24 ------------------------ src/egl/drivers/Makefile.am | 26 -------------------------- 4 files changed, 5 insertions(+), 53 deletions(-) delete mode 100644 src/egl/Makefile.am delete mode 100644 src/egl/drivers/Makefile.am diff --git a/configure.ac b/configure.ac index ee5c2d19583..d2732aabf51 100644 --- a/configure.ac +++ b/configure.ac @@ -2022,8 +2022,6 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS" dnl Substitute the config AC_CONFIG_FILES([Makefile src/Makefile - src/egl/Makefile - src/egl/drivers/Makefile src/egl/drivers/dri2/Makefile src/egl/main/Makefile src/egl/main/egl.pc diff --git a/src/Makefile.am b/src/Makefile.am index 5b2549d9d9e..75e2a739cfc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,12 +33,16 @@ if HAVE_EGL_PLATFORM_WAYLAND SUBDIRS += egl/wayland endif +if HAVE_EGL_DRIVER_DRI2 +SUBDIRS += egl/drivers/dri2 +endif + if HAVE_GBM SUBDIRS += gbm endif if HAVE_EGL -SUBDIRS += egl +SUBDIRS += egl/main endif if HAVE_GALLIUM diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am deleted file mode 100644 index cff943f7545..00000000000 --- a/src/egl/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -# 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= - -SUBDIRS += drivers main diff --git a/src/egl/drivers/Makefile.am b/src/egl/drivers/Makefile.am deleted file mode 100644 index f0cc6d4a0c0..00000000000 --- a/src/egl/drivers/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -# 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_DRIVER_DRI2 -SUBDIRS += dri2 -endif -- 2.30.2