From 21e9ad2b8ef06ef7320ce9223101e3ed97e76771 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Thu, 12 Jun 2014 13:06:31 +1000 Subject: [PATCH] gl/examples: add the srcdir and builddir includes And remove references to $(GST_PLUGINS_GL_*) --- tests/examples/gl/clutter/Makefile.am | 9 ++++++--- tests/examples/gl/cocoa/Makefile.am | 5 +++-- tests/examples/gl/generic/cube/Makefile.am | 5 +++-- tests/examples/gl/generic/cubeyuv/Makefile.am | 5 +++-- tests/examples/gl/generic/doublecube/Makefile.am | 5 +++-- tests/examples/gl/generic/recordgraphic/Makefile.am | 5 +++-- tests/examples/gl/gtk/Makefile.am | 3 ++- tests/examples/gl/gtk/filtervideooverlay/Makefile.am | 5 +++-- tests/examples/gl/gtk/fxtest/Makefile.am | 10 ++++++---- tests/examples/gl/gtk/gtkvideooverlay/Makefile.am | 5 +++-- tests/examples/gl/gtk/switchvideooverlay/Makefile.am | 5 +++-- tests/examples/gl/sdl/Makefile.am | 4 ++-- 12 files changed, 40 insertions(+), 26 deletions(-) diff --git a/tests/examples/gl/clutter/Makefile.am b/tests/examples/gl/clutter/Makefile.am index 51576b3eb6..cb8796c43d 100644 --- a/tests/examples/gl/clutter/Makefile.am +++ b/tests/examples/gl/clutter/Makefile.am @@ -7,7 +7,8 @@ noinst_PROGRAMS += cluttershare cluttershare_SOURCES = cluttershare.c -cluttershare_CFLAGS=$(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \ +cluttershare_CFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \ + $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_CFLAGS) $(GL_CFLAGS) $(CLUTTER_CFLAGS) cluttershare_LDADD=$(CLUTTER_LIBS) $(GST_PLUGINS_BASE_LIBS) \ $(GST_LIBS) $(GL_LIBS) \ @@ -24,7 +25,8 @@ noinst_PROGRAMS += clutteractor clutteractortee clutteractor_SOURCES = clutteractor.c -clutteractor_CFLAGS=$(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ +clutteractor_CFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \ + $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ $(GL_CFLAGS) $(CLUTTER_CFLAGS) \ $(CLUTTER_GLX_CFLAGS) $(CLUTTER_X11_CFLAGS) $(XCOMPOSITE_CFLAGS) clutteractor_LDADD=$(CLUTTER_LIBS) $(CLUTTER_GLX_LIBS) $(CLUTTER_X11_LIBS) \ @@ -33,7 +35,8 @@ clutteractor_LDADD=$(CLUTTER_LIBS) $(CLUTTER_GLX_LIBS) $(CLUTTER_X11_LIBS) \ clutteractortee_SOURCES = clutteractortee.c -clutteractortee_CFLAGS=$(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ +clutteractortee_CFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \ + $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ $(GL_CFLAGS) $(CLUTTER_CFLAGS) \ $(CLUTTER_GLX_CFLAGS) $(CLUTTER_X11_CFLAGS) $(XCOMPOSITE_CFLAGS) clutteractortee_LDADD=$(CLUTTER_LIBS) $(CLUTTER_GLX_LIBS) $(CLUTTER_X11_LIBS) \ diff --git a/tests/examples/gl/cocoa/Makefile.am b/tests/examples/gl/cocoa/Makefile.am index c13ec526e5..91349c0141 100755 --- a/tests/examples/gl/cocoa/Makefile.am +++ b/tests/examples/gl/cocoa/Makefile.am @@ -4,9 +4,10 @@ noinst_PROGRAMS = cocoa-videooverlay cocoa_videooverlay_SOURCES = cocoa-videooverlay.m -cocoa_videooverlay_OBJCFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ +cocoa_videooverlay_OBJCFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \ + $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ $(GL_CFLAGS) ${GL_OBJCFLAGS} -cocoa_videooverlay_LDADD=$(GST_PLUGINS_GL_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \ +cocoa_videooverlay_LDADD=$(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \ $(GL_LIBS) -lgstvideo-$(GST_API_VERSION) cocoa_videooverlay_LIBTOOLFLAGS = --tag=OBJC diff --git a/tests/examples/gl/generic/cube/Makefile.am b/tests/examples/gl/generic/cube/Makefile.am index 41a5e2c630..c0eb3a116a 100644 --- a/tests/examples/gl/generic/cube/Makefile.am +++ b/tests/examples/gl/generic/cube/Makefile.am @@ -3,6 +3,7 @@ noinst_PROGRAMS = cube cube_SOURCES = main.cpp -cube_CXXFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_CXXFLAGS) $(GL_CFLAGS) -cube_LDADD=$(GST_PLUGINS_GL_LIBS) $(GST_LIBS) $(GL_LIBS) +cube_CXXFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \ + $(GST_CXXFLAGS) $(GL_CFLAGS) +cube_LDADD=$(GST_LIBS) $(GL_LIBS) diff --git a/tests/examples/gl/generic/cubeyuv/Makefile.am b/tests/examples/gl/generic/cubeyuv/Makefile.am index 0fe4fcda9c..c6e7cfa4a2 100644 --- a/tests/examples/gl/generic/cubeyuv/Makefile.am +++ b/tests/examples/gl/generic/cubeyuv/Makefile.am @@ -3,6 +3,7 @@ noinst_PROGRAMS = cubeyuv cubeyuv_SOURCES = main.cpp -cubeyuv_CXXFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_CXXFLAGS) $(GL_CFLAGS) -cubeyuv_LDADD=$(GST_PLUGINS_GL_LIBS) $(GST_LIBS) $(GL_LIBS) +cubeyuv_CXXFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \ + $(GST_CXXFLAGS) $(GL_CFLAGS) +cubeyuv_LDADD=$(GST_LIBS) $(GL_LIBS) diff --git a/tests/examples/gl/generic/doublecube/Makefile.am b/tests/examples/gl/generic/doublecube/Makefile.am index 7a9184bb2e..4663a1d503 100644 --- a/tests/examples/gl/generic/doublecube/Makefile.am +++ b/tests/examples/gl/generic/doublecube/Makefile.am @@ -3,6 +3,7 @@ noinst_PROGRAMS = doublecube doublecube_SOURCES = main.cpp -doublecube_CXXFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_CXXFLAGS) $(GL_CFLAGS) -doublecube_LDADD=$(GST_PLUGINS_GL_LIBS) $(GST_LIBS) $(GL_LIBS) +doublecube_CXXFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \ + $(GST_CXXFLAGS) $(GL_CFLAGS) +doublecube_LDADD=$(GST_LIBS) $(GL_LIBS) diff --git a/tests/examples/gl/generic/recordgraphic/Makefile.am b/tests/examples/gl/generic/recordgraphic/Makefile.am index 4ee21ac3ba..2515f9234d 100644 --- a/tests/examples/gl/generic/recordgraphic/Makefile.am +++ b/tests/examples/gl/generic/recordgraphic/Makefile.am @@ -3,6 +3,7 @@ noinst_PROGRAMS = recordgraphic recordgraphic_SOURCES = main.cpp -recordgraphic_CXXFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(GL_CFLAGS) -recordgraphic_LDADD=$(GST_PLUGINS_GL_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ $(GST_LIBS) $(GL_LIBS) +recordgraphic_CXXFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \ + $(GST_CXXFLAGS) $(GL_CFLAGS) +recordgraphic_LDADD=$(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ $(GST_LIBS) $(GL_LIBS) diff --git a/tests/examples/gl/gtk/Makefile.am b/tests/examples/gl/gtk/Makefile.am index 2821b4e57e..a41566bc0b 100644 --- a/tests/examples/gl/gtk/Makefile.am +++ b/tests/examples/gl/gtk/Makefile.am @@ -4,7 +4,8 @@ SUBDIRS = . gtkvideooverlay filternovideooverlay filtervideooverlay fxtest switc noinst_LTLIBRARIES = libgstgtkhelper.la libgstgtkhelper_la_SOURCES = gstgtk.c gstgtk.h -libgstgtkhelper_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(GTK3_CFLAGS) +libgstgtkhelper_la_CFLAGS = -I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \ + $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(GTK3_CFLAGS) if HAVE_WINDOW_COCOA libgstgtkhelper_la_CFLAGS += -x objective-c diff --git a/tests/examples/gl/gtk/filtervideooverlay/Makefile.am b/tests/examples/gl/gtk/filtervideooverlay/Makefile.am index 4d7f129c24..2bf658b0f9 100644 --- a/tests/examples/gl/gtk/filtervideooverlay/Makefile.am +++ b/tests/examples/gl/gtk/filtervideooverlay/Makefile.am @@ -2,9 +2,10 @@ noinst_PROGRAMS = filtervideooverlay filtervideooverlay_SOURCES = main.cpp -filtervideooverlay_CXXFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) \ +filtervideooverlay_CXXFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \ + $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) \ $(GL_CFLAGS) $(GTK3_CFLAGS) filtervideooverlay_LDADD=../libgstgtkhelper.la \ - $(GTK3_LIBS) $(GST_PLUGINS_GL_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \ + $(GTK3_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \ $(GL_LIBS) -lgstvideo-$(GST_API_VERSION) diff --git a/tests/examples/gl/gtk/fxtest/Makefile.am b/tests/examples/gl/gtk/fxtest/Makefile.am index c5e5d1ae28..de052afc19 100644 --- a/tests/examples/gl/gtk/fxtest/Makefile.am +++ b/tests/examples/gl/gtk/fxtest/Makefile.am @@ -3,16 +3,18 @@ noinst_PROGRAMS += pixbufdrop fxtest_SOURCES = fxtest.c -fxtest_CFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ +fxtest_CFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \ + $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ $(GL_CFLAGS) $(GTK3_CFLAGS) fxtest_LDADD=../libgstgtkhelper.la \ - $(GTK3_LIBS) $(GST_PLUGINS_GL_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \ + $(GTK3_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \ $(GL_LIBS) -lgstvideo-$(GST_API_VERSION) pixbufdrop_SOURCES = pixbufdrop.c -pixbufdrop_CFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ +pixbufdrop_CFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \ + $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ $(GL_CFLAGS) $(GTK3_CFLAGS) pixbufdrop_LDADD=../libgstgtkhelper.la \ - $(GTK3_LIBS) $(GST_PLUGINS_GL_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \ + $(GTK3_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \ $(GL_LIBS) -lgstvideo-$(GST_API_VERSION) diff --git a/tests/examples/gl/gtk/gtkvideooverlay/Makefile.am b/tests/examples/gl/gtk/gtkvideooverlay/Makefile.am index c9dba8aa73..bab0e5bf80 100644 --- a/tests/examples/gl/gtk/gtkvideooverlay/Makefile.am +++ b/tests/examples/gl/gtk/gtkvideooverlay/Makefile.am @@ -2,9 +2,10 @@ noinst_PROGRAMS = gtkvideooverlay gtkvideooverlay_SOURCES = main.cpp -gtkvideooverlay_CXXFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) \ +gtkvideooverlay_CXXFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \ + $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) \ $(GL_CFLAGS) $(GTK3_CFLAGS) gtkvideooverlay_LDADD=../libgstgtkhelper.la \ - $(GTK3_LIBS) $(GST_PLUGINS_GL_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \ + $(GTK3_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \ $(GL_LIBS) -lgstvideo-$(GST_API_VERSION) diff --git a/tests/examples/gl/gtk/switchvideooverlay/Makefile.am b/tests/examples/gl/gtk/switchvideooverlay/Makefile.am index 12e25e75c4..dbe007cb30 100644 --- a/tests/examples/gl/gtk/switchvideooverlay/Makefile.am +++ b/tests/examples/gl/gtk/switchvideooverlay/Makefile.am @@ -2,9 +2,10 @@ noinst_PROGRAMS = switchvideooverlay switchvideooverlay_SOURCES = main.cpp -switchvideooverlay_CXXFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) \ +switchvideooverlay_CXXFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \ + $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) \ $(GL_CFLAGS) $(GTK3_CFLAGS) switchvideooverlay_LDADD=../libgstgtkhelper.la \ - $(GTK3_LIBS) $(GST_PLUGINS_GL_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \ + $(GTK3_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \ $(GL_LIBS) -lgstvideo-$(GST_API_VERSION) diff --git a/tests/examples/gl/sdl/Makefile.am b/tests/examples/gl/sdl/Makefile.am index c0cd8386b3..a26958cc69 100644 --- a/tests/examples/gl/sdl/Makefile.am +++ b/tests/examples/gl/sdl/Makefile.am @@ -7,11 +7,11 @@ noinst_PROGRAMS += sdlshare sdlshare_SOURCES = sdlshare.c -sdlshare_CFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_VIDEO_CFLAGS) $(GST_CFLAGS) \ +sdlshare_CFLAGS=$(GST_VIDEO_CFLAGS) $(GST_CFLAGS) \ $(GL_CFLAGS) $(SDL_CFLAGS) \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs -sdlshare_LDADD=$(GST_PLUGINS_GL_LIBS) $(GST_VIDEO_LIBS) $(GST_LIBS) \ +sdlshare_LDADD=$(GST_VIDEO_LIBS) $(GST_LIBS) \ $(GL_LIBS) $(SDL_LIBS) \ $(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_API_VERSION).la \ -lgstvideo-$(GST_API_VERSION)