[vlc-commits] EGL: cleanup build rules

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Feb 19 16:23:00 2011 +0200| [02c56916fe436d4af5d19758aa280654adff0e0f] | committer: Rémi Denis-Courmont

EGL: cleanup build rules

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=02c56916fe436d4af5d19758aa280654adff0e0f
---

 configure.ac                    |    9 +--------
 modules/video_output/Modules.am |   11 +++--------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index aff587d..c5c82a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3249,14 +3249,7 @@ AC_SUBST([GL_LIBS])
 dnl
 dnl  EGL
 dnl
-AC_ARG_ENABLE(egl,
-  [  --enable-egl            EGL support (default disabled)],, [
-  enable_egl="no"
-])
-AS_IF([test "${enable_egl}" != "no"], [
-  PKG_CHECK_MODULES(EGL, [egl])
-  VLC_ADD_PLUGIN([egl])
-])
+PKG_ENABLE_MODULES_VLC([EGL], [], [egl], [EGL support], [auto])
 
 dnl
 dnl  SDL module
diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am
index 116e56b..66e2707 100644
--- a/modules/video_output/Modules.am
+++ b/modules/video_output/Modules.am
@@ -94,14 +94,9 @@ libvlc_LTLIBRARIES += libdrawable_plugin.la
 endif
 
 ### EGL ###
-libegl_plugin_la_SOURCES = \
-	opengl.h opengl.c \
-	egl.c
-#FIXME FIXME FIXME
-libegl_plugin_la_CFLAGS = $(AM_CFLAGS) \
-	$(EGL_CFLAGS) $(GL_CFLAGS)
-libegl_plugin_la_LIBADD = $(AM_LIBADD) \
-	$(EGL_LIBS) $(GL_LIBS)
+libegl_plugin_la_SOURCES = egl.c
+libegl_plugin_la_CFLAGS = $(AM_CFLAGS) $(EGL_CFLAGS)
+libegl_plugin_la_LIBADD = $(AM_LIBADD) $(EGL_LIBS)
 if !HAVE_WIN32
 libegl_plugin_la_LIBADD += -ldl $(X_LIBS) $(X_PRE_LIBS) -lX11
 endif