← Back to branch summary

~ubuntu-branches/ubuntu/vivid/transcode/vivid

« back to all changes in this revision

Viewing changes to import/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Alessio Treglia
  • Date: 2009-11-09 23:23:58 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20091109232358-hnasdjc0lxxas0dx
Tags: 3:1.1.5-0ubuntu1
* New upstream release.
* debian/rules:
  - Build with --enable-libmpeg2, --enable-libmpeg2convert,
    --enable-libv4l2 and --enable-libv4lconvert flags.
  - A bit of cleanup.
* debian/control:
  - Build-depend on libv4l-dev.
* Refresh patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
import/Makefile.am
171
171
import_mp3_la_LDFLAGS = -module -avoid-version
172
172
 
173
173
import_mpeg2_la_SOURCES = import_mpeg2.c
174
 
import_mpeg2_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMPEG2_CFLAGS)
 
174
import_mpeg2_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMPEG2_CFLAGS) $(LIBMPEG2CONVERT_CFLAGS)
175
175
import_mpeg2_la_LDFLAGS = -module -avoid-version
176
176
 
177
177
import_mplayer_la_SOURCES = import_mplayer.c
328
328
        $(LZO_LIBS) \
329
329
        $(LIBQUICKTIME_LIBS) \
330
330
        $(LIBMPEG2_LIBS) \
 
331
        $(LIBMPEG2CONVERT_LIBS) \
331
332
        $(OGG_LIBS) \
332
333
        $(THEORA_LIBS) \
333
334
        $(VORBIS_LIBS) \
345
346
        $(LZO_CFLAGS) \
346
347
        $(LIBQUICKTIME_CFLAGS) \
347
348
        $(LIBMPEG2_CFLAGS) \
 
349
        $(LIBMPEG2CONVERT_CFLAGS) \
348
350
        $(OGG_CFLAGS) \
349
351
        $(THEORA_CFLAGS) \
350
352
        $(VORBIS_CFLAGS)
579
581
tcxpm2rgb_LDADD = $(LIBTC_LIBS)
580
582
 
581
583
tcxpm2rgb_CFLAGS = $(AM_CFLAGS)
 
584