From 506129ed424ee334736a9867d924794fe3b8d8b8 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Wed, 20 May 2015 02:38:53 +1000 Subject: [PATCH] Fix flags order in GL examples for uninstalled build --- tests/examples/gl/generic/cube/Makefile.am | 4 ++-- tests/examples/gl/generic/cubeyuv/Makefile.am | 5 ++--- tests/examples/gl/generic/doublecube/Makefile.am | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/examples/gl/generic/cube/Makefile.am b/tests/examples/gl/generic/cube/Makefile.am index 7262533e57..e1b0cef6f7 100644 --- a/tests/examples/gl/generic/cube/Makefile.am +++ b/tests/examples/gl/generic/cube/Makefile.am @@ -4,6 +4,6 @@ noinst_PROGRAMS = cube cube_SOURCES = main.cpp cube_CXXFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \ - $(GST_CXXFLAGS) $(GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -cube_LDADD=$(GST_LIBS) -lgstvideo-$(GST_API_VERSION) $(GL_LIBS) + $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(GL_CFLAGS) +cube_LDADD=$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) $(GST_LIBS) $(GL_LIBS) diff --git a/tests/examples/gl/generic/cubeyuv/Makefile.am b/tests/examples/gl/generic/cubeyuv/Makefile.am index 98697f002b..b232871270 100644 --- a/tests/examples/gl/generic/cubeyuv/Makefile.am +++ b/tests/examples/gl/generic/cubeyuv/Makefile.am @@ -4,6 +4,5 @@ noinst_PROGRAMS = cubeyuv cubeyuv_SOURCES = main.cpp cubeyuv_CXXFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \ - $(GST_CXXFLAGS) $(GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -cubeyuv_LDADD=$(GST_LIBS) $(GL_LIBS) -lgstvideo-$(GST_API_VERSION) - + $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(GL_CFLAGS) +cubeyuv_LDADD=$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) $(GST_LIBS) $(GL_LIBS) diff --git a/tests/examples/gl/generic/doublecube/Makefile.am b/tests/examples/gl/generic/doublecube/Makefile.am index a13182906e..7f1489561d 100644 --- a/tests/examples/gl/generic/doublecube/Makefile.am +++ b/tests/examples/gl/generic/doublecube/Makefile.am @@ -4,6 +4,6 @@ noinst_PROGRAMS = doublecube doublecube_SOURCES = main.cpp doublecube_CXXFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \ - $(GST_CXXFLAGS) $(GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -doublecube_LDADD=$(GST_LIBS) $(GL_LIBS) -lgstvideo-$(GST_API_VERSION) + $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(GL_CFLAGS) +doublecube_LDADD=$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) $(GST_LIBS) $(GL_LIBS)