diff options
| author | Jason Ekstrand <[email protected]> | 2015-08-14 17:25:04 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-08-17 11:25:03 -0700 |
| commit | 6a7ca4ef2cd3f39d3b5e77051cb3f3175e9e60df (patch) | |
| tree | d5413781ac9e9ecfc22cf403fa7465d6a7cadb34 /src/Makefile.am | |
| parent | b4c02253c4e1a7bc5a7a6369045210932f5de605 (diff) | |
| parent | d3e23f1ff915c01541f8df375b50b93b3da565a8 (diff) | |
Merge remote-tracking branch 'mesa-public/master' into vulkan
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index d41a087ae1c..da638a811fb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,8 +19,6 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -AUTOMAKE_OPTIONS = subdir-objects - SUBDIRS = . gtest util mapi/glapi/gen mapi if NEED_OPENGL_COMMON @@ -37,16 +35,12 @@ if HAVE_EGL_PLATFORM_WAYLAND SUBDIRS += egl/wayland/wayland-egl egl/wayland/wayland-drm endif -if HAVE_EGL_DRIVER_DRI2 -SUBDIRS += egl/drivers/dri2 -endif - if HAVE_GBM SUBDIRS += gbm endif if HAVE_EGL -SUBDIRS += egl/main +SUBDIRS += egl endif if HAVE_GALLIUM @@ -54,8 +48,6 @@ SUBDIRS += gallium endif EXTRA_DIST = \ - egl/drivers/haiku \ - egl/docs \ getopt hgl SConscript AM_CFLAGS = $(VISIBILITY_CFLAGS) |