diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | examples/.gitignore | 1 | ||||
| -rw-r--r-- | examples/Makefile.am | 9 | ||||
| -rw-r--r-- | tests/.gitignore | 1 | ||||
| -rw-r--r-- | tests/Makefile.am | 11 | ||||
| -rw-r--r-- | tests/test-yuv-upload.c (renamed from examples/test-colorspace.c) | 0 |
7 files changed, 16 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index a0ede4c..a817b79 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,12 +1,12 @@ QUIET_GEN = $(Q:@=@echo ' GEN '$@;) -SUBDIRS = build clutter-gst examples +SUBDIRS = build clutter-gst tests examples if BUILD_GTK_DOC SUBDIRS += doc endif -DIST_SUBDIRS = build clutter-gst examples doc +DIST_SUBDIRS = build clutter-gst tests examples doc ACLOCAL_AMFLAGS = -I build/autotools diff --git a/configure.ac b/configure.ac index dc2c8b8..11a3cc8 100644 --- a/configure.ac +++ b/configure.ac @@ -122,6 +122,7 @@ AC_OUTPUT([ build/autotools/shave-libtool clutter-gst/Makefile clutter-gst/clutter-gst-version.h + tests/Makefile examples/Makefile doc/Makefile doc/reference/Makefile diff --git a/examples/.gitignore b/examples/.gitignore index 3f4625a..7da0504 100644 --- a/examples/.gitignore +++ b/examples/.gitignore @@ -1,4 +1,3 @@ audio video-player video-sink -test-colorspace diff --git a/examples/Makefile.am b/examples/Makefile.am index 7e172cc..6baa80a 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,4 +1,4 @@ -noinst_PROGRAMS = video-player video-sink audio test-colorspace +noinst_PROGRAMS = video-player video-sink audio INCLUDES = -I$(top_srcdir)/ @@ -16,13 +16,6 @@ video_sink_LDFLAGS = \ $(GST_LIBS) \ $(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la -test_colorspace_SOURCES = test-colorspace.c -test_colorspace_CFLAGS = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS) -test_colorspace_LDFLAGS = \ - $(CLUTTER_GST_LIBS) \ - $(GST_LIBS) \ - $(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la - audio_SOURCES = audio.c audio_CFLAGS = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS) audio_LDFLAGS = \ diff --git a/tests/.gitignore b/tests/.gitignore new file mode 100644 index 0000000..2d9cafd --- /dev/null +++ b/tests/.gitignore @@ -0,0 +1 @@ +test-yuv-upload diff --git a/tests/Makefile.am b/tests/Makefile.am new file mode 100644 index 0000000..723b4dc --- /dev/null +++ b/tests/Makefile.am @@ -0,0 +1,11 @@ +noinst_PROGRAMS = test-yuv-upload + +INCLUDES = -I$(top_srcdir)/ + +test_yuv_upload_SOURCES = test-yuv-upload.c +test_yuv_upload_CFLAGS = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS) +test_yuv_upload_LDFLAGS = \ + $(CLUTTER_GST_LIBS) \ + $(GST_LIBS) \ + $(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la + diff --git a/examples/test-colorspace.c b/tests/test-yuv-upload.c index 2948c9b..2948c9b 100644 --- a/examples/test-colorspace.c +++ b/tests/test-yuv-upload.c |