~walkerlee/totem/pre-interview

« back to all changes in this revision

Viewing changes to src/gst/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-05-26 00:07:51 UTC
  • mfrom: (1.6.1) (24.1.4 experimental)
  • Revision ID: package-import@ubuntu.com-20130526000751-kv8ap3x1di4qq8j2
Tags: 3.8.2-0ubuntu1
* Sync with Debian. Remaining changes: 
* debian/control.in:
  - Drop build-depends on libepc-ui-dev and libgrilo-0.2-dev (in universe)
  - Drop libxtst-dev build-depends so that the (redundant) fake key presses
    for inhibiting the screensaver are disabled (LP: #1007438)
  - Build-depend on libzeitgeist-dev
  - Suggest rather than recommend gstreamer components in universe
  - Add totem-plugins-extra
  - Add XB-Npp-Description and XB-Npp-Filename header to the 
    totem-mozilla package to improve ubufox/ubuntu plugin db integration 
  - Refer to Firefox in totem-mozilla description instead of Iceweasel
  - Don't have totem-mozilla recommend any particular browser
  - Drop obsolete python library dependencies since iplayer is no longer
    included
* debian/totem-common.install, debian/source_totem.py:
  - Install Ubuntu apport debugging hook
* debian/totem-plugins-extra.install:
  - Universe plugins split out of totem-plugins (currently only gromit)
* debian/totem-plugins.install:    
  - Skip the plugins split to -extra and add the zeitgeist plugin
* debian/rules:
  - Build with --fail-missing, to ensure we install everything. 
    + Ignore libtotem.{,l}a since we delibrately don't install these.
  - Re-enable hardening, make sure both PIE and BINDNOW are used
    by setting hardening=+all. (LP: #1039604)
* debian/patches/91_quicklist_entries.patch:
  - Add static quicklist
* debian/patches/92_gst-plugins-good.patch:
  - Build without unnecessary gstreamer1.0-bad dependency
* debian/patches/93_grilo_optional.patch:
  - Allow building without grilo while grilo MIR is still pending
* debian/patches/correct_desktop_mimetypes.patch:
  - Don't list the mimetypes after the unity lists
* debian/patches/revert_shell_menu.patch: 
  - revert the use of a shell menu until indicator-appmenu can handle
    the mixed shell/traditional menus itself
* New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
noinst_LTLIBRARIES = libtotemgsthelpers.la
 
1
noinst_LTLIBRARIES =                    \
 
2
        libtotemgsthelpers.la           \
 
3
        libtotemgstpixbufhelpers.la     \
 
4
        libtotemtimehelpers.la
2
5
 
3
 
libtotemgsthelpers_la_SOURCES =                         \
4
 
        totem-gst-helpers.c                             \
 
6
libtotemgsthelpers_la_SOURCES = \
 
7
        totem-gst-helpers.c     \
5
8
        totem-gst-helpers.h
6
9
 
7
 
libtotemgsthelpers_la_CPPFLAGS = \
8
 
        -D_REENTRANT                            \
9
 
        $(DISABLE_DEPRECATED)                   \
10
 
        $(AM_CPPFLAGS)
11
 
 
12
 
libtotemgsthelpers_la_CFLAGS = \
13
 
        $(DEPENDENCY_CFLAGS)            \
14
 
        $(MM_CFLAGS)                    \
15
 
        $(MISSING_PLUGINS_CFLAGS)       \
16
 
        $(AM_CFLAGS)
17
 
 
18
 
libtotemgsthelpers_la_LIBADD = \
19
 
        $(MM_LIBS)              \
20
 
        $(GST_LIBS)             \
21
 
        $(EXTRA_BACKEND_LIBS)   \
22
 
        $(X_LIBS)               \
23
 
        $(MISSING_PLUGINS_LIBS) \
24
 
        -lm
25
 
 
26
 
libtotemgsthelpers_la_LDFLAGS= \
27
 
        -no-undefined
 
10
libtotemgsthelpers_la_CPPFLAGS =        \
 
11
        -D_REENTRANT                    \
 
12
        $(DISABLE_DEPRECATED)           \
 
13
        $(AM_CPPFLAGS)
 
14
 
 
15
libtotemgsthelpers_la_CFLAGS =  \
 
16
        $(HELPER_CFLAGS)        \
 
17
        $(AM_CFLAGS)
 
18
 
 
19
libtotemgsthelpers_la_LIBADD = $(HELPER_LIBS)
 
20
libtotemgsthelpers_la_LDFLAGS= -no-undefined
 
21
 
 
22
libtotemgstpixbufhelpers_la_SOURCES =   \
 
23
        totem-gst-pixbuf-helpers.c      \
 
24
        totem-gst-pixbuf-helpers.h
 
25
 
 
26
libtotemgstpixbufhelpers_la_CPPFLAGS =  \
 
27
        -D_REENTRANT                    \
 
28
        $(DISABLE_DEPRECATED)           \
 
29
        $(AM_CPPFLAGS)
 
30
 
 
31
libtotemgstpixbufhelpers_la_CFLAGS =    \
 
32
        $(PIXBUF_HELPER_CFLAGS)         \
 
33
        $(AM_CFLAGS)
 
34
 
 
35
libtotemgstpixbufhelpers_la_LIBADD = $(PIXBUF_HELPER_LIBS)
 
36
libtotemgstpixbufhelpers_la_LDFLAGS= -no-undefined
 
37
 
 
38
libtotemtimehelpers_la_SOURCES =        \
 
39
        totem-time-helpers.c            \
 
40
        totem-time-helpers.h
 
41
 
 
42
libtotemtimehelpers_la_CPPFLAGS =       \
 
43
        -D_REENTRANT                    \
 
44
        $(DISABLE_DEPRECATED)           \
 
45
        $(AM_CPPFLAGS)
 
46
 
 
47
libtotemtimehelpers_la_CFLAGS = \
 
48
        $(TIME_HELPER_CFLAGS)   \
 
49
        $(AM_CFLAGS)
 
50
 
 
51
libtotemtimehelpers_la_LIBADD = $(TIME_HELPER_LIBS)
 
52
libtotemtimehelpers_la_LDFLAGS= -no-undefined
 
53
 
 
54
EXTRA_DIST = totem-time-helpers.h
28
55
 
29
56
-include $(top_srcdir)/git.mk