diff options
| author | Jan Schmidt <thaytan@mad.scientist.com> | 2007-06-12 20:15:29 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@mad.scientist.com> | 2007-06-12 20:15:29 +0000 |
| commit | bbcc24410daed9b6cbbe0efac8d28c4ff4f7da0f (patch) | |
| tree | 9fe7951f6f0cf989cfad6d5e0eb660d2042d60c2 /sys/Makefile.am | |
| parent | 98ef159bd144b4c50e5c5bad59abc4c180ff1e79 (diff) | |
Move videocrop and osxvideo from -bad.
Original commit message from CVS:
* configure.ac:
* docs/plugins/Makefile.am:
* docs/plugins/gst-plugins-good-plugins-docs.sgml:
* docs/plugins/gst-plugins-good-plugins-sections.txt:
* docs/plugins/inspect/plugin-videocrop.xml:
* gst-plugins-good.spec.in:
* sys/Makefile.am:
* tests/check/Makefile.am:
* tests/icles/Makefile.am:
* tests/icles/videocrop-test.c:
Move videocrop and osxvideo from -bad.
Diffstat (limited to 'sys/Makefile.am')
| -rw-r--r-- | sys/Makefile.am | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/Makefile.am b/sys/Makefile.am index 0076cd57..b4d52f12 100644 --- a/sys/Makefile.am +++ b/sys/Makefile.am @@ -34,11 +34,11 @@ else OSX_AUDIO_DIR= endif -# if USE_OSX_VIDEO -# OSX_VIDEO_DIR=osxvideo -# else -# OSX_VIDEO_DIR= -# endif +if USE_OSX_VIDEO +OSX_VIDEO_DIR=osxvideo +else +OSX_VIDEO_DIR= +endif # if USE_QCAM # QCAM_DIR=qcam @@ -76,6 +76,6 @@ else XIMAGE_DIR= endif -SUBDIRS=$(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(OSS_DIR) $(OSX_AUDIO_DIR) $(SUNAUDIO_DIR) $(V4L2_DIR) $(XIMAGE_DIR) +SUBDIRS=$(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(OSS_DIR) $(OSX_AUDIO_DIR) $(OSX_VIDEO_DIR) $(SUNAUDIO_DIR) $(V4L2_DIR) $(XIMAGE_DIR) -DIST_SUBDIRS=directdraw directsound oss osxaudio sunaudio v4l2 ximage +DIST_SUBDIRS=directdraw directsound oss osxaudio osxvideo sunaudio v4l2 ximage |