← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/avidemux/jaunty

« back to all changes in this revision

Viewing changes to avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialogFactory/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Alessio Treglia
  • Date: 2009-02-17 23:41:46 UTC
  • mfrom: (1.1.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20090217234146-eakx254awuch4wgw
Tags: 1:2.4.4-0.0ubuntu1
* Merge from debian multimedia, Ubuntu remaining changes:
  - debian/control:
    + Build-Depends on newer libx264-dev.
    + Don't Build-Depends on ccache and libamrnb-dev.
    + Build-Depends on libpulse-dev.
    + Fixed small typo in avidemux description.
  - Don't use ccache.
  - Drop patch to fix build with newer x264, it has been merged by upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialogFactory/Makefile.am
7
7
AT_filesel.cpp AT_bitrate.cpp AT_threadCount.cpp \
8
8
AT_button.cpp \
9
9
AT_slider.cpp \
10
 
FAC_bar.cpp FAC_readOnlyText.cpp FAC_notch.cpp FAC_frame.cpp FAC_hex.cpp FAC_matrix.cpp
 
10
FAC_bar.cpp FAC_readOnlyText.cpp AT_notch.cpp FAC_frame.cpp FAC_hex.cpp FAC_matrix.cpp FAC_aspectRatio.cpp
11
11
 
12
12
 
13
13
INCLUDES = $(all_includes)  $(XML_CFLAGS)  $(FREETYPE_CFLAGS) -DADM_SUBVERSION=@ADM_SUBVERSION@ \