egl: make sure entrypoints list is always sorted

[mesa.git] / src / egl / Makefile.am

diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index 0b463c8deb06bde473b1aebafbf11b1303db4625..3477f797d77c41bdff4732823ff516c5d97ac944 100644 (file)
--- a/src/egl/Makefile.am
+++ b/src/egl/Makefile.am
@@ -49,7 +49,7 @@ libEGL_la_LDFLAGS = \
 dri2_backend_FILES =
 dri3_backend_FILES =
 
-if HAVE_EGL_PLATFORM_X11
+if HAVE_PLATFORM_X11
 AM_CFLAGS += -DHAVE_X11_PLATFORM
 AM_CFLAGS += $(XCB_DRI2_CFLAGS)
 libEGL_la_LIBADD += $(XCB_DRI2_LIBS)
@@ -57,12 +57,14 @@ dri2_backend_FILES += drivers/dri2/platform_x11.c
 
 if HAVE_DRI3
 dri3_backend_FILES += \
-       drivers/dri2/platform_x11_dri3.c
+       drivers/dri2/platform_x11_dri3.c \
+       drivers/dri2/platform_x11_dri3.h
+
 libEGL_la_LIBADD += $(top_builddir)/src/loader/libloader_dri3_helper.la
 endif
 endif
 
-if HAVE_EGL_PLATFORM_WAYLAND
+if HAVE_PLATFORM_WAYLAND
 AM_CFLAGS += -DHAVE_WAYLAND_PLATFORM
 AM_CFLAGS += $(WAYLAND_CFLAGS)
 libEGL_la_LIBADD += $(WAYLAND_LIBS)
@@ -82,14 +84,20 @@ AM_CFLAGS += -DHAVE_SURFACELESS_PLATFORM
 dri2_backend_FILES += drivers/dri2/platform_surfaceless.c
 endif
 
-if HAVE_EGL_DRIVER_DRI2
+if HAVE_EGL_PLATFORM_ANDROID
+AM_CFLAGS += -DHAVE_ANDROID_PLATFORM
+AM_CFLAGS += $(ANDROID_CFLAGS)
+libEGL_la_LIBADD += $(ANDROID_LIBS)
+dri2_backend_FILES += drivers/dri2/platform_android.c
+endif
+
 AM_CFLAGS += \
        -I$(top_srcdir)/src/loader \
        -I$(top_srcdir)/src/egl/drivers/dri2 \
        -I$(top_srcdir)/src/gbm/backends/dri \
        -I$(top_srcdir)/src/egl/wayland/wayland-egl \
-       -I$(top_srcdir)/src/egl/wayland/wayland-drm \
        -I$(top_builddir)/src/egl/wayland/wayland-drm \
+       -I$(top_srcdir)/src/egl/wayland/wayland-drm \
        -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" \
        -D_EGL_BUILT_IN_DRIVER_DRI2
 
@@ -99,8 +107,7 @@ libEGL_la_SOURCES += \
        $(dri3_backend_FILES)
 
 libEGL_la_LIBADD += $(top_builddir)/src/loader/libloader.la
-libEGL_la_LIBADD += $(DLOPEN_LIBS) $(LIBDRM_LIBS)
-endif
+libEGL_la_LIBADD += $(DLOPEN_LIBS) $(LIBDRM_LIBS) $(CLOCK_LIB)
 
 include $(top_srcdir)/install-lib-links.mk
 
@@ -119,12 +126,12 @@ egl_HEADERS = \
        $(top_srcdir)/include/EGL/eglmesaext.h \
        $(top_srcdir)/include/EGL/eglplatform.h
 
-TESTS = egl-symbols-check
+TESTS = egl-symbols-check \
+       egl-entrypoint-check
 
 EXTRA_DIST = \
-       egl-symbols-check \
+       $(TESTS) \
        SConscript \
        drivers/haiku \
-       docs \
        main/egl.def \
        main/README.txt