From cb9521ab056988410a64b8d93db87654738be6c2 Mon Sep 17 00:00:00 2001 From: Julien Isorce Date: Mon, 24 Mar 2014 12:12:42 +0000 Subject: [PATCH] gl: deploy egl headers in gst/gl/egl instead of gst/gl https://bugzilla.gnome.org/show_bug.cgi?id=703343 --- gst-libs/gst/gl/Makefile.am | 7 ++----- gst-libs/gst/gl/egl/Makefile.am | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 gst-libs/gst/gl/egl/Makefile.am diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am index 3923259106..83d579f318 100644 --- a/gst-libs/gst/gl/Makefile.am +++ b/gst-libs/gst/gl/Makefile.am @@ -86,11 +86,8 @@ libgstgl_@GST_API_VERSION@_la_LIBADD += android/libgstgl-android.la endif if USE_EGL -libgstgl_@GST_API_VERSION@_la_SOURCES += egl/gstglcontext_egl.c \ - egl/gstgldisplay_egl.c -libgstgl_@GST_API_VERSION@_la_LIBADD += $(top_builddir)/gst-libs/gst/egl/libgstegl-$(GST_API_VERSION).la -libgstgl_@GST_API_VERSION@include_HEADERS += egl/gstgldisplay_egl.h -noinst_HEADERS += egl/gstglcontext_egl.h +SUBDIRS += egl +libgstgl_@GST_API_VERSION@_la_LIBADD += egl/libgstgl-egl.la endif nodist_libgstgl_@GST_API_VERSION@include_HEADERS = \ diff --git a/gst-libs/gst/gl/egl/Makefile.am b/gst-libs/gst/gl/egl/Makefile.am new file mode 100644 index 0000000000..2848c541c9 --- /dev/null +++ b/gst-libs/gst/gl/egl/Makefile.am @@ -0,0 +1,27 @@ +## Process this file with automake to produce Makefile.in + +noinst_LTLIBRARIES = libgstgl-egl.la + +libgstgl_egl_la_SOURCES = \ + gstgldisplay_egl.c \ + gstglcontext_egl.c + +noinst_HEADERS = \ + gstglcontext_egl.h + +libgstgl_eglincludedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/gl/egl +libgstgl_eglinclude_HEADERS = \ + gstgldisplay_egl.h + +libgstgl_egl_la_LIBADD = $(top_builddir)/gst-libs/gst/egl/libgstegl-$(GST_API_VERSION).la + +libgstgl_egl_la_CFLAGS = \ + -I$(top_srcdir)/gst-libs \ + $(GL_CFLAGS) \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) \ + $(GST_CFLAGS) + +libgstgl_egl_la_LDFLAGS = \ + $(GST_LIB_LDFLAGS) \ + $(GST_ALL_LDFLAGS)