diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 27 | ||||
| -rw-r--r-- | tests/examples/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/examples/generic/Makefile.am | 29 | ||||
| -rw-r--r-- | tests/test-display.c (renamed from tests/examples/generic/test-display.c) | 0 | ||||
| -rw-r--r-- | tests/test-surfaces.c (renamed from tests/examples/generic/test-surfaces.c) | 0 | ||||
| -rw-r--r-- | tests/test-windows.c (renamed from tests/examples/generic/test-windows.c) | 0 |
7 files changed, 26 insertions, 36 deletions
diff --git a/configure.ac b/configure.ac index 7ada7797..35f39f9d 100644 --- a/configure.ac +++ b/configure.ac @@ -152,6 +152,4 @@ AC_OUTPUT([ sys/vaapiconvert/Makefile sys/vaapisink/Makefile tests/Makefile - tests/examples/Makefile - tests/examples/generic/Makefile ]) diff --git a/tests/Makefile.am b/tests/Makefile.am index cbf577e6..cc7cdcf6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,29 @@ -SUBDIRS = examples +noinst_PROGRAMS = \ + test-display \ + test-surfaces \ + test-windows \ + $(NULL) + +TEST_CFLAGS = \ + $(GST_CFLAGS) \ + -I$(top_srcdir)/gst-libs \ + $(X11_CFLAGS) + +TEST_LIBS = \ + $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-@GST_MAJORMINOR@.la \ + $(X11_LIBS) + +test_display_SOURCES = test-display.c +test_display_CFLAGS = $(TEST_CFLAGS) +test_display_LDADD = $(TEST_LIBS) + +test_surfaces_SOURCES = test-surfaces.c +test_surfaces_CFLAGS = $(TEST_CFLAGS) +test_surfaces_LDADD = $(TEST_LIBS) + +test_windows_SOURCES = test-windows.c +test_windows_CFLAGS = $(TEST_CFLAGS) +test_windows_LDADD = $(TEST_LIBS) # Extra clean files so that maintainer-clean removes *everything* MAINTAINERCLEANFILES = Makefile.in diff --git a/tests/examples/Makefile.am b/tests/examples/Makefile.am deleted file mode 100644 index f09ad590..00000000 --- a/tests/examples/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -SUBDIRS = generic - -# Extra clean files so that maintainer-clean removes *everything* -MAINTAINERCLEANFILES = Makefile.in diff --git a/tests/examples/generic/Makefile.am b/tests/examples/generic/Makefile.am deleted file mode 100644 index cc7cdcf6..00000000 --- a/tests/examples/generic/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -noinst_PROGRAMS = \ - test-display \ - test-surfaces \ - test-windows \ - $(NULL) - -TEST_CFLAGS = \ - $(GST_CFLAGS) \ - -I$(top_srcdir)/gst-libs \ - $(X11_CFLAGS) - -TEST_LIBS = \ - $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-@GST_MAJORMINOR@.la \ - $(X11_LIBS) - -test_display_SOURCES = test-display.c -test_display_CFLAGS = $(TEST_CFLAGS) -test_display_LDADD = $(TEST_LIBS) - -test_surfaces_SOURCES = test-surfaces.c -test_surfaces_CFLAGS = $(TEST_CFLAGS) -test_surfaces_LDADD = $(TEST_LIBS) - -test_windows_SOURCES = test-windows.c -test_windows_CFLAGS = $(TEST_CFLAGS) -test_windows_LDADD = $(TEST_LIBS) - -# Extra clean files so that maintainer-clean removes *everything* -MAINTAINERCLEANFILES = Makefile.in diff --git a/tests/examples/generic/test-display.c b/tests/test-display.c index 4a510d53..4a510d53 100644 --- a/tests/examples/generic/test-display.c +++ b/tests/test-display.c diff --git a/tests/examples/generic/test-surfaces.c b/tests/test-surfaces.c index d201bdbd..d201bdbd 100644 --- a/tests/examples/generic/test-surfaces.c +++ b/tests/test-surfaces.c diff --git a/tests/examples/generic/test-windows.c b/tests/test-windows.c index 07db884d..07db884d 100644 --- a/tests/examples/generic/test-windows.c +++ b/tests/test-windows.c |