diff options
| author | Dave Robillard <dave@drobilla.net> | 2009-06-22 17:04:00 -0400 |
|---|---|---|
| committer | Dave Robillard <dave@drobilla.net> | 2009-06-22 17:04:00 -0400 |
| commit | 218878de5ea48b5acdf36070a73a50fd71f41741 (patch) | |
| tree | 12384ce50f1af7eb61c2c18a0d6141595797bc53 /sys/Makefile.am | |
| parent | 925e83ee60c5406b2e5f0f39b0da0f90370efc27 (diff) | |
| parent | a2a0322df9a7005a01aafb5efc32fcc1179d205c (diff) | |
| download | gst-plugins-bad-218878de5ea48b5acdf36070a73a50fd71f41741.tar.gz gst-plugins-bad-218878de5ea48b5acdf36070a73a50fd71f41741.tar.bz2 gst-plugins-bad-218878de5ea48b5acdf36070a73a50fd71f41741.zip | |
Merge branch 'master' of git://anongit.freedesktop.org/gstreamer/gst-plugins-bad into fdo
Conflicts:
ext/ladspa/Makefile.am
ext/ladspa/gstladspa.h
ext/lv2/Makefile.am
ext/lv2/gstlv2.h
Diffstat (limited to 'sys/Makefile.am')
| -rw-r--r-- | sys/Makefile.am | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/Makefile.am b/sys/Makefile.am index 161f3339..15c89e17 100644 --- a/sys/Makefile.am +++ b/sys/Makefile.am @@ -70,8 +70,14 @@ else ACM_DIR= endif -SUBDIRS = $(ACM_DIR) $(DIRECTDRAW_DIR) $(DVB_DIR) $(FBDEV_DIR) $(OSS4_DIR) $(OSX_VIDEO_DIR) $(QT_DIR) $(VCD_DIR) $(WININET_DIR) +if USE_VDPAU +VDPAU_DIR=vdpau +else +VDPAU_DIR= +endif + +SUBDIRS = $(ACM_DIR) $(DIRECTDRAW_DIR) $(DVB_DIR) $(FBDEV_DIR) $(OSS4_DIR) $(OSX_VIDEO_DIR) $(QT_DIR) $(VCD_DIR) $(VDPAU_DIR) $(WININET_DIR) DIST_SUBDIRS = acmenc acmmp3dec directdraw dvb fbdev dshowdecwrapper dshowsrcwrapper dshowvideosink \ - oss4 osxvideo qtwrapper vcd wasapi wininet winks winscreencap + oss4 osxvideo qtwrapper vcd vdpau wasapi wininet winks winscreencap |