← Back to branch summary

~wongchiachen/ubuntu/precise/totem/hey_about_dialog

« back to all changes in this revision

Viewing changes to src/plugins/screensaver/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2011-05-20 16:38:02 UTC
  • mfrom: (1.11.13 upstream) (2.1.17 experimental)
  • Revision ID: james.westby@ubuntu.com-20110520163802-p3lohdmfvws2jqeo
Tags: 3.0.1-0ubuntu1
* Resynchronize on Debian, remaining diffs:
* debian/control.in:
  - use suggests rather than recommends for universe gstreamer components
  - add totem-plugins-extra for the components which have depends in universe
  - add build-depends on gnome-common, dh-autoreconf, 
    liblaunchpad-intrgration-3.0-dev, hardening-wrapper
  - drop build-depends on libepc-ui-dev, python-feedparser, xulrunner-dev,
    libtracker-sparql-0.10-dev
  - add XB-Npp-Description and XB-Npp-Filename header to the 
    totem-mozilla package to improve ubufox/ubuntu plugin db integration 
  - change refences from Iceweasel to Firefox
  - recommends gnome-icon-theme-symbolic rather than depending on it
  - list firefox as a totem-mozilla recommends before epiphany-browser
  - libtotem replaces totem (<< 3.0.1-1) for ppa upgrades
* debian/totem-common.install:
  - Install apport hook
* debian/totem-plugins-extra.install:
  - Plugins split out ouf totem-plugins
* debian/totem-plugins.install:    
  - Move some plugins to totem-plugins-extra
* debian/totem.preinst:
  - No longer required as Lucid has been released
* debian/patches/01_fake_keypresses.patch:
  - dropped it's an old workaround and should not be required
* debian/patches/02_lpi.patch:
  - Launchpad integration
* debian/patches/03_default_options.patch: 
  - enable the youtube option by default
* debian/patches/70_bbc_plugin.patch:
  - bbc content viewer, needs to be fixed for the new version
* debian/source_totem.py:
  - ubuntu apport debugging
* debian/rules:
  - run autoreconf on build
* debian/watch:
  - Watch for unstable versions

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/screensaver/Makefile.am
1
 
modules_flags = -export_dynamic -avoid-version -module
 
1
include $(top_srcdir)/src/plugins/Makefile.plugins
2
2
 
3
3
plugindir = $(PLUGINDIR)/screensaver
4
4
plugin_LTLIBRARIES = libscreensaver.la
5
5
 
6
 
plugin_in_files = screensaver.totem-plugin.in
7
 
 
8
 
%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
9
 
 
10
 
plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
11
 
 
12
 
common_defines = \
13
 
        -D_REENTRANT                                    \
14
 
        -DDBUS_API_SUBJECT_TO_CHANGE                    \
15
 
        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
16
 
        -DGCONF_PREFIX=\""/apps/totem"\"                \
17
 
        -DDATADIR=\""$(datadir)"\"                      \
18
 
        -DLIBEXECDIR=\""$(libexecdir)"\"                \
19
 
        -DBINDIR=\""$(bindir)"\"                        \
20
 
        -DTOTEM_PLUGIN_DIR=\""$(libdir)/totem/plugins"\"\
21
 
        -DG_LOG_DOMAIN=\""Totem"\"                      \
22
 
        $(DISABLE_DEPRECATED)
 
6
plugin_in_files = screensaver.plugin.in
23
7
 
24
8
libscreensaver_la_SOURCES = totem-screensaver.c
25
 
libscreensaver_la_LDFLAGS = $(modules_flags)
26
 
libscreensaver_la_LIBADD = $(top_builddir)/lib/libtotemscrsaver.la
27
 
libscreensaver_la_CPPFLAGS = $(common_defines)
28
 
 
 
9
libscreensaver_la_LDFLAGS = $(plugin_ldflags)
 
10
libscreensaver_la_LIBADD = \
 
11
        $(plugin_libadd)                        \
 
12
        $(top_builddir)/lib/libtotemscrsaver.la \
 
13
        $(SCREENSAVER_LIBS)
 
14
libscreensaver_la_CPPFLAGS = \
 
15
        $(AM_CPPFLAGS)          \
 
16
        -I$(top_srcdir)/lib
29
17
libscreensaver_la_CFLAGS = \
30
 
        $(DEPENDENCY_CFLAGS)    \
31
 
        $(WARN_CFLAGS)          \
32
 
        $(DBUS_CFLAGS)          \
33
 
        $(AM_CFLAGS)            \
34
 
        $(SCREENSAVER_CFLAGS)   \
35
 
        -I$(top_srcdir)/        \
36
 
        -I$(top_srcdir)/lib     \
37
 
        -I$(top_srcdir)/src     \
38
 
        -I$(top_srcdir)/src/plugins
39
 
 
40
 
EXTRA_DIST = $(plugin_in_files)
41
 
 
42
 
CLEANFILES = $(plugin_DATA) $(BUILT_SOURCES)
43
 
DISTCLEANFILES = $(plugin_DATA)
44
 
 
 
18
        $(plugin_cflags)        \
 
19
        $(SCREENSAVER_CFLAGS)
 
20
 
 
21
-include $(top_srcdir)/git.mk