diff options
| author | Dave Robillard <dave@drobilla.net> | 2009-06-22 17:04:00 -0400 |
|---|---|---|
| committer | Dave Robillard <dave@drobilla.net> | 2009-06-22 17:04:00 -0400 |
| commit | 218878de5ea48b5acdf36070a73a50fd71f41741 (patch) | |
| tree | 12384ce50f1af7eb61c2c18a0d6141595797bc53 /tests/examples/Makefile.am | |
| parent | 925e83ee60c5406b2e5f0f39b0da0f90370efc27 (diff) | |
| parent | a2a0322df9a7005a01aafb5efc32fcc1179d205c (diff) | |
| download | gst-plugins-bad-218878de5ea48b5acdf36070a73a50fd71f41741.tar.gz gst-plugins-bad-218878de5ea48b5acdf36070a73a50fd71f41741.tar.bz2 gst-plugins-bad-218878de5ea48b5acdf36070a73a50fd71f41741.zip | |
Merge branch 'master' of git://anongit.freedesktop.org/gstreamer/gst-plugins-bad into fdo
Conflicts:
ext/ladspa/Makefile.am
ext/ladspa/gstladspa.h
ext/lv2/Makefile.am
ext/lv2/gstlv2.h
Diffstat (limited to 'tests/examples/Makefile.am')
| -rw-r--r-- | tests/examples/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/examples/Makefile.am b/tests/examples/Makefile.am index e68204e3..45d94378 100644 --- a/tests/examples/Makefile.am +++ b/tests/examples/Makefile.am @@ -1,5 +1,5 @@ if HAVE_GTK -GTK_EXAMPLES=scaletempo mxf +GTK_EXAMPLES=camerabin mxf scaletempo else GTK_EXAMPLES= endif @@ -10,5 +10,5 @@ else DIRECTFB_DIR= endif -SUBDIRS= $(DIRECTFB_DIR) $(GTK_EXAMPLES) switch shapewipe -DIST_SUBDIRS= directfb switch scaletempo shapewipe mxf +SUBDIRS= $(DIRECTFB_DIR) $(GTK_EXAMPLES) shapewipe switch +DIST_SUBDIRS= directfb mxf scaletempo shapewipe switch |