diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-06-15 16:06:36 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-06-15 16:06:36 +0200 |
| commit | a2b7a672b8826d9fb75f0889741c05ca76ce085f (patch) | |
| tree | ef634796155235ab30dced5bc687f90bb6e272d3 /sys/Makefile.am | |
| parent | 6acbe1894374a51954b6cebd31d74c515d23ea17 (diff) | |
| parent | a6c4f3ed4ef8a2ebc4f184a796e8230838bd99a4 (diff) | |
| download | gstreamer-plugins-bad-a2b7a672b8826d9fb75f0889741c05ca76ce085f.tar.gz | |
Merge branch 'master' into 0.11
Conflicts:
android/aacparse.mk
android/amrparse.mk
android/h264parse.mk
android/metadata.mk
android/qtmux.mk
android/sdpelem.mk
configure.ac
gst/qtmux/gstqtmux.c
win32/common/config.h
Diffstat (limited to 'sys/Makefile.am')
| -rw-r--r-- | sys/Makefile.am | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/sys/Makefile.am b/sys/Makefile.am index ca9d2688a..4c7486e44 100644 --- a/sys/Makefile.am +++ b/sys/Makefile.am @@ -22,6 +22,18 @@ endif # CDROM_DIR= # endif +if USE_DIRECT3D +D3DVIDEOSINK_DIR=d3dvideosink +else +D3DVIDEOSINK_DIR= +endif + +if USE_DECKLINK +DECKLINK_DIR=decklink +else +DECKLINK_DIR= +endif + if USE_DIRECTDRAW DIRECTDRAW_DIR=directdraw else @@ -46,6 +58,13 @@ else DVB_DIR= endif +if USE_LINSYS +LINSYS_DIR=linsys +else +LINSYS_DIR= +endif + + if USE_APPLE_MEDIA APPLE_MEDIA_DIR=applemedia else @@ -88,9 +107,15 @@ else SHM_DIR= endif -SUBDIRS = $(ACM_DIR) $(APPLE_MEDIA_DIR) $(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(DVB_DIR) $(FBDEV_DIR) $(OSX_VIDEO_DIR) $(QT_DIR) $(SHM_DIR) $(VCD_DIR) $(VDPAU_DIR) $(WININET_DIR) +if USE_AVC +AVC_DIR=avc +else +AVC_DIR= +endif + +SUBDIRS = $(ACM_DIR) $(APPLE_MEDIA_DIR) $(AVC_DIR) $(D3DVIDEOSINK) $(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) -DIST_SUBDIRS = acmenc acmmp3dec applemedia directdraw directsound dvb fbdev dshowdecwrapper dshowsrcwrapper dshowvideosink \ +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 include $(top_srcdir)/common/parallel-subdirs.mak |