← Back to branch summary

~ubuntu-branches/ubuntu/feisty/gst-plugins-good0.10/feisty-security

« back to all changes in this revision

Viewing changes to sys/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2006-12-21 21:12:15 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20061221211215-3uukkusokhe0nk4f
Tags: 0.10.5-0ubuntu1
* Sync with pkg-gstreamer SVN:
  + debian/rules:
    - Use Ubuntu as distribution name and point to the proper Launchpad URL
  + debian/patches/01_esdsink-priority.patch:
    - Mark the esdsink with rank primary-2 to get
      pulse > alsadmix > esd > alsa > oss

Show diffs side-by-side

added added

removed removed

Lines of Context:
sys/Makefile.am
34
34
# QCAM_DIR=
35
35
# endif
36
36
 
37
 
# if USE_GST_V4L2
38
 
# V4L2_DIR=v4l2
39
 
# else
40
 
# V4L2_DIR=
41
 
# endif
 
37
if USE_GST_V4L2
 
38
V4L2_DIR=v4l2
 
39
else
 
40
V4L2_DIR=
 
41
endif
42
42
 
43
43
# if USE_VCD
44
44
# VCD_DIR=vcd
64
64
XIMAGE_DIR=
65
65
endif
66
66
 
67
 
SUBDIRS=$(OSS_DIR) $(SUNAUDIO_DIR) $(XIMAGE_DIR)
 
67
SUBDIRS=$(OSS_DIR) $(SUNAUDIO_DIR) $(V4L2_DIR) $(XIMAGE_DIR)
68
68
 
69
 
DIST_SUBDIRS=oss sunaudio ximage
 
69
DIST_SUBDIRS=oss sunaudio v4l2 ximage