summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2012-10-15 15:53:12 +0200
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2012-10-15 16:28:36 +0200
commit4cbb7b8a993f6cccd58c92764feefb3ee2ada1b2 (patch)
tree6fd766caf4a06e33eb8e0b24d4e4a2152009e5a8 /sys
parent932c7175d3f0986516df9faba2e25581ae6eccf1 (diff)
downloadgstreamer-plugins-bad-4cbb7b8a993f6cccd58c92764feefb3ee2ada1b2.tar.gz
androidmedia: Add androidmedia plugin
Diffstat (limited to 'sys')
-rw-r--r--sys/Makefile.am10
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/Makefile.am b/sys/Makefile.am
index d79d22325..8fc1a713a 100644
--- a/sys/Makefile.am
+++ b/sys/Makefile.am
@@ -4,6 +4,12 @@ else
ACM_DIR=
endif
+if USE_ANDROID_MEDIA
+ANDROID_MEDIA_DIR=androidmedia
+else
+ANDROID_MEDIA_DIR=
+endif
+
if USE_APPLE_MEDIA
APPLE_MEDIA_DIR=applemedia
else
@@ -136,9 +142,9 @@ else
UVCH264_DIR=
endif
-SUBDIRS = $(ACM_DIR) $(APPLE_MEDIA_DIR) $(AVC_DIR) $(D3DVIDEOSINK_DIR) $(DECKLINK_DIR) $(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(DIRECTSHOW_DIR) $(DVB_DIR) $(FBDEV_DIR) $(LINSYS_DIR) $(OSX_VIDEO_DIR) $(PVR_DIR) $(QT_DIR) $(SHM_DIR) $(UVCH264_DIR) $(VCD_DIR) $(VDPAU_DIR) $(WININET_DIR) $(WINSCREENCAP_DIR)
+SUBDIRS = $(ACM_DIR) $(ANDROID_MEDIA) $(APPLE_MEDIA_DIR) $(AVC_DIR) $(D3DVIDEOSINK_DIR) $(DECKLINK_DIR) $(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(DIRECTSHOW_DIR) $(DVB_DIR) $(FBDEV_DIR) $(LINSYS_DIR) $(OSX_VIDEO_DIR) $(PVR_DIR) $(QT_DIR) $(SHM_DIR) $(UVCH264_DIR) $(VCD_DIR) $(VDPAU_DIR) $(WININET_DIR) $(WINSCREENCAP_DIR)
-DIST_SUBDIRS = acmenc acmmp3dec applemedia avc d3dvideosink decklink directdraw directsound dvb linsys fbdev dshowdecwrapper dshowsrcwrapper dshowvideosink \
+DIST_SUBDIRS = acmenc acmmp3dec androidmedia applemedia avc d3dvideosink decklink directdraw directsound dvb linsys fbdev dshowdecwrapper dshowsrcwrapper dshowvideosink \
osxvideo pvr2d qtwrapper shm uvch264 vcd vdpau wasapi wininet winks winscreencap
include $(top_srcdir)/common/parallel-subdirs.mak