← Back to branch summary

~ubuntu-branches/ubuntu/utopic/lebiniou/utopic

« back to all changes in this revision

Viewing changes to src/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Logan Rosen
  • Date: 2013-11-13 21:19:20 UTC
  • mfrom: (6.1.9 sid)
  • Revision ID: package-import@ubuntu.com-20131113211920-af65h37psw9fz6oy
Tags: 3.19.1-1ubuntu1
* Merge from Debian unstable. Remaining changes:
  - debian/patches/fix_ftbfs_with_binutils_gold: Add -lz to fix FTBFS with
    binutils-gold.
* debian/patches/fix_ftbfs_with_binutils_gold: Remove -lavutil, as it is
  already linked.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Makefile.am
70
70
lebiniou_SOURCES += pnglite.c pnglite.h
71
71
endif
72
72
 
73
 
dist_lebiniou_SOURCES = events.c.in gen.awk man.awk
74
 
lebiniou_LDADD = @GETOPT_LONG_LIBS@ @SWSCALE_LIBS@
 
73
dist_lebiniou_SOURCES = events.c.in gen.awk man.awk defaults.h.in
 
74
lebiniou_LDADD = @GETOPT_LONG_LIBS@ @SWSCALE_LIBS@ @AVUTIL_LIBS@
75
75
if EXTRA_OPENGL
76
76
lebiniou_LDADD += @GLU_LIBS@
77
77
endif