diff options
| author | Edward Hervey <edward.hervey@collabora.co.uk> | 2011-11-25 12:48:58 +0100 |
|---|---|---|
| committer | Edward Hervey <edward.hervey@collabora.co.uk> | 2011-11-25 12:48:58 +0100 |
| commit | b78b980d7236d03378450ac89452dc4ec537824c (patch) | |
| tree | 1a4bbff76ac8020b99f3321afa73eebbb4e9006d /sys/Makefile.am | |
| parent | c41b5d016cbbe8dc6fa99a377b169e96d24238a9 (diff) | |
| parent | cdcc39455cc92ba5e6988056b03ac9c350a9bb6a (diff) | |
| download | gstreamer-plugins-bad-b78b980d7236d03378450ac89452dc4ec537824c.tar.gz | |
Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
ext/faac/gstfaac.c
ext/opus/gstopusdec.c
ext/opus/gstopusenc.c
gst/audiovisualizers/gstspacescope.c
gst/colorspace/colorspace.c
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 b7a99126d..d15f8282c 100644 --- a/sys/Makefile.am +++ b/sys/Makefile.am @@ -101,6 +101,7 @@ endif #VDPAU_DIR= #endif + if USE_SHM SHM_DIR=shm else @@ -113,9 +114,15 @@ else AVC_DIR= endif -SUBDIRS = $(ACM_DIR) $(APPLE_MEDIA_DIR) $(AVC_DIR) $(D3DVIDEOSINK_DIR) $(DECKLINK_DIR) $(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(DVB_DIR) $(FBDEV_DIR) $(LINSYS_DIR) $(OSX_VIDEO_DIR) $(QT_DIR) $(SHM_DIR) $(VCD_DIR) $(VDPAU_DIR) $(WININET_DIR) +if USE_PVR +PVR_DIR=pvr2d +else +PVR_DIR= +endif + +SUBDIRS = $(ACM_DIR) $(APPLE_MEDIA_DIR) $(AVC_DIR) $(D3DVIDEOSINK_DIR) $(DECKLINK_DIR) $(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(DVB_DIR) $(FBDEV_DIR) $(LINSYS_DIR) $(OSX_VIDEO_DIR) $(QT_DIR) $(SHM_DIR) $(VCD_DIR) $(VDPAU_DIR) $(WININET_DIR) $(PVR_DIR) DIST_SUBDIRS = acmenc acmmp3dec applemedia avc d3dvideosink decklink directdraw directsound dvb linsys fbdev dshowdecwrapper dshowsrcwrapper dshowvideosink \ - osxvideo qtwrapper shm vcd vdpau wasapi wininet winks winscreencap + osxvideo qtwrapper shm vcd vdpau wasapi wininet winks winscreencap pvr2d include $(top_srcdir)/common/parallel-subdirs.mak |