diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-05-11 16:08:21 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-05-11 19:02:55 +0100 |
| commit | 1732ce033a71ed3d976f038b0e6f680968862711 (patch) | |
| tree | dc24fcc7717ee38e801a3e5b8e17127a7d33b837 /sys/Makefile.am | |
| parent | 02a226f74604bee8d0ec0d582f9f330af55cd19a (diff) | |
| download | gstreamer-plugins-good-1732ce033a71ed3d976f038b0e6f680968862711.tar.gz | |
Move oss4 plugin from -bad to -good
Hook up build infrastructure, docs and tests.
Fixes #614305.
Diffstat (limited to 'sys/Makefile.am')
| -rw-r--r-- | sys/Makefile.am | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sys/Makefile.am b/sys/Makefile.am index 535f581b0..ab08d046d 100644 --- a/sys/Makefile.am +++ b/sys/Makefile.am @@ -10,6 +10,13 @@ else OSS_DIR= endif +if USE_OSS4 +OSS4_DIR=oss4 +else +OSS4_DIR= +endif + + if USE_DIRECTSOUND DIRECTSOUND_DIR=directsound else @@ -70,8 +77,8 @@ else XIMAGE_DIR= endif -SUBDIRS=$(DIRECTSOUND_DIR) $(OSS_DIR) $(OSX_AUDIO_DIR) $(OSX_VIDEO_DIR) $(SUNAUDIO_DIR) $(V4L2_DIR) $(XIMAGE_DIR) +SUBDIRS=$(DIRECTSOUND_DIR) $(OSS_DIR) $(OSS4_DIR) $(OSX_AUDIO_DIR) $(OSX_VIDEO_DIR) $(SUNAUDIO_DIR) $(V4L2_DIR) $(XIMAGE_DIR) -DIST_SUBDIRS=directsound oss osxaudio osxvideo sunaudio v4l2 waveform ximage +DIST_SUBDIRS=directsound oss oss4 osxaudio osxvideo sunaudio v4l2 waveform ximage include $(top_srcdir)/common/parallel-subdirs.mak |