← Back to branch summary

~mniess/ubuntu/trusty/totem/fix-lp1292262

« back to all changes in this revision

Viewing changes to browser-plugin/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Maarten Lankhorst
  • Date: 2013-12-23 18:34:50 UTC
  • mfrom: (1.6.2) (24.1.6 experimental)
  • Revision ID: package-import@ubuntu.com-20131223183450-ikgyve9s6csxrwz9
Tags: 3.10.1-1ubuntu1
* Merge 3.10.1-1 from experimental.
  - Remaining changes mostly annotated in 3.8.2-0ubuntu1 entry.
* Drop git_no_assert_on_start.patch, upstreamed.
* Add vimeo plugin to totem-plugins.
* Bump libzeitgeist dep to libzeitgeist-2.0-dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
browser-plugin/Makefile.am
13
13
        -I$(top_builddir)/src                           \
14
14
        -I$(top_builddir)/src/backend                   \
15
15
        -DSYSCONFDIR="\"$(sysconfdir)\""                \
16
 
        -DLIBEXECDIR="\"$(libexecdir)\""                \
17
 
        $(DISABLE_DEPRECATED)
 
16
        -DLIBEXECDIR="\"$(libexecdir)\""
18
17
 
19
18
plugin_sources = \
20
19
        npapi.h                         \
82
81
totem_plugin_viewer_CPPFLAGS = \
83
82
        -DGNOMELOCALEDIR="\"$(datadir)/locale\""        \
84
83
        -DG_LOG_DOMAIN=\""TotemEmbedded\""              \
 
84
        -I$(top_srcdir)/src/gst                         \
85
85
        $(AM_CPPFLAGS)
86
86
 
87
87
totem_plugin_viewer_CFLAGS = \