diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-10 13:15:12 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-10 13:15:12 +0100 |
| commit | dc8984d76ca6a84625f22b728e12396698f257a4 (patch) | |
| tree | 430af44583a0f4a8ebdf4c8b12083800747a3e8d /gst/videotestsrc/Makefile.am | |
| parent | ed53219e49eb6f5b2d92abb3136c41b9653c0190 (diff) | |
| parent | e8fd3056233d28d4301fc2b92882fed31ae0e68a (diff) | |
Merge branch 'master' into 0.11
Conflicts:
gst-libs/gst/app/gstappsrc.c
gst-libs/gst/audio/multichannel.h
gst-libs/gst/video/videooverlay.c
gst/playback/gstplaysink.c
gst/playback/gststreamsynchronizer.c
tests/check/Makefile.am
win32/common/libgstvideo.def
Diffstat (limited to 'gst/videotestsrc/Makefile.am')
| -rw-r--r-- | gst/videotestsrc/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gst/videotestsrc/Makefile.am b/gst/videotestsrc/Makefile.am index 8f52be3ab..129ad76ed 100644 --- a/gst/videotestsrc/Makefile.am +++ b/gst/videotestsrc/Makefile.am @@ -17,7 +17,7 @@ libgstvideotestsrc_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = gstvideotestsrc.h videotestsrc.h -noinst_PROGRAMS = generate_sine_table +EXTRA_PROGRAMS = generate_sine_table generate_sine_table_SOURCES = generate_sine_table.c generate_sine_table_CFLAGS = $(GST_CFLAGS) |