← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/libav/oneiric

« back to all changes in this revision

Viewing changes to libavdevice/Makefile

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2011-04-30 14:27:42 UTC
  • mfrom: (1.1.2 experimental)
  • Revision ID: james.westby@ubuntu.com-20110430142742-quvblxk1tj6adlh5
Tags: 4:0.7~b1-1ubuntu1
http://bugs.debian.org/623682
* Merge from debian. Remaining changes:
  - don't build against libfaad, libdirac, librtmp and libopenjpeg
    (all in universe)
  - explicitly --enable-pic on powerpc, cf. LP #654666
  - different arm configure bits that should probably better be
    merged into debian
* Cherry-picked from git: 
  - install doc/APIChanges and refer to them in NEWS.Debian (Closes: #623682)
  - don't try to install non-existing documentation, fixes FTBFS on powerpc

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavdevice/Makefile
14
14
                                            alsa-audio-enc.o
15
15
OBJS-$(CONFIG_BKTR_INDEV)                += bktr.o
16
16
OBJS-$(CONFIG_DV1394_INDEV)              += dv1394.o
 
17
OBJS-$(CONFIG_FBDEV_INDEV)               += fbdev.o
17
18
OBJS-$(CONFIG_JACK_INDEV)                += jack_audio.o
18
19
OBJS-$(CONFIG_OSS_INDEV)                 += oss_audio.o
19
20
OBJS-$(CONFIG_OSS_OUTDEV)                += oss_audio.o
 
21
OBJS-$(CONFIG_SNDIO_INDEV)               += sndio_common.o sndio_dec.o
 
22
OBJS-$(CONFIG_SNDIO_OUTDEV)              += sndio_common.o sndio_enc.o
20
23
OBJS-$(CONFIG_V4L2_INDEV)                += v4l2.o
21
24
OBJS-$(CONFIG_V4L_INDEV)                 += v4l.o
22
25
OBJS-$(CONFIG_VFWCAP_INDEV)              += vfwcap.o
25
28
# external libraries
26
29
OBJS-$(CONFIG_LIBDC1394_INDEV)           += libdc1394.o
27
30
 
28
 
OBJS-$(CONFIG_AUDIO_BEOS_INDEV)          += beosaudio.o
29
 
OBJS-$(CONFIG_AUDIO_BEOS_OUTDEV)         += beosaudio.o
30
 
 
31
31
SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H)     += alsa-audio.h
 
32
SKIPHEADERS-$(HAVE_SNDIO_H)              += sndio_common.h
32
33
 
33
34
include $(SUBDIR)../subdir.mak