v4l2object: Cleanup uneeded return statement

[platform/upstream/gst-plugins-good.git] / sys / Makefile.am

diff --git a/sys/Makefile.am b/sys/Makefile.am
index aee23c6..7ccd9e7 100644 (file)
--- a/sys/Makefile.am
+++ b/sys/Makefile.am
@@ -10,6 +10,25 @@ else
 OSS_DIR=
 endif
 
+if USE_OSS4
+OSS4_DIR=oss4
+else
+OSS4_DIR=
+endif
+
+
+if USE_DIRECTSOUND
+DIRECTSOUND_DIR=directsound
+else
+DIRECTSOUND_DIR=
+endif
+
+if USE_WAVEFORM
+WAVEFORM_DIR=waveform
+else
+WAVEFORM_DIR=
+endif
+
 if USE_SUNAUDIO
 SUNAUDIO_DIR=sunaudio
 else
@@ -22,11 +41,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
@@ -64,6 +83,8 @@ else
 XIMAGE_DIR=
 endif
 
-SUBDIRS=$(OSS_DIR) $(OSX_AUDIO_DIR) $(SUNAUDIO_DIR) $(V4L2_DIR) $(XIMAGE_DIR)
+SUBDIRS=$(DIRECTSOUND_DIR) $(WAVEFORM_DIR) $(OSS_DIR) $(OSS4_DIR) $(OSX_AUDIO_DIR) $(OSX_VIDEO_DIR) $(SUNAUDIO_DIR) $(V4L2_DIR) $(XIMAGE_DIR)
+
+DIST_SUBDIRS=directsound oss oss4 osxaudio osxvideo sunaudio v4l2 waveform ximage
 
-DIST_SUBDIRS=oss sunaudio v4l2 ximage
+include $(top_srcdir)/common/parallel-subdirs.mak