~walkerlee/totem/pre-interview

« back to all changes in this revision

Viewing changes to src/backend/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:
7
7
bvw_test_CPPFLAGS = \
8
8
        -DDATADIR=\"$(pkgdatadir)\"     \
9
9
        -DLOGO_PATH=DATADIR\"\"G_DIR_SEPARATOR_S\"totem\"G_DIR_SEPARATOR_S\"totem_logo.png\"    \
 
10
        -DG_LOG_DOMAIN="\"bvw-test\"" \
10
11
        $(DISABLE_DEPRECATED)           \
11
12
        $(AM_CPPFLAGS)
12
13
 
13
 
bvw_test_CFLAGS = \
14
 
        $(DEPENDENCY_CFLAGS)    \
15
 
        $(MM_CFLAGS)            \
 
14
bvw_test_CFLAGS =               \
 
15
        $(BACKEND_CFLAGS)       \
16
16
        $(AM_CFLAGS)
17
17
 
18
 
bvw_test_LDADD = \
 
18
bvw_test_LDADD =                \
19
19
        libbaconvideowidget.la  \
20
 
        $(DEPENDENCY_LIBS)      \
21
 
        $(XTEST_LIBS)
22
 
 
23
 
# Marshallers
24
 
BVW_MARSHAL_FILES = baconvideowidget-marshal.c baconvideowidget-marshal.h
25
 
 
26
 
baconvideowidget-marshal.h: baconvideowidget-marshal.list
27
 
        $(AM_V_GEN)($(GLIB_GENMARSHAL) --prefix=baconvideowidget_marshal $(srcdir)/baconvideowidget-marshal.list --header > $@)
28
 
baconvideowidget-marshal.c: baconvideowidget-marshal.h baconvideowidget-marshal.list
29
 
        $(AM_V_GEN)($(GLIB_GENMARSHAL) --prefix=baconvideowidget_marshal $(srcdir)/baconvideowidget-marshal.list --body --header > $@)
 
20
        $(BACKEND_LIBS)
30
21
 
31
22
# Enums
32
23
BVW_ENUM_FILES = bacon-video-widget-enums.c bacon-video-widget-enums.h
52
43
        $(BVW_ENUM_FILES)                               \
53
44
        bacon-video-widget.h                            \
54
45
        video-utils.c video-utils.h                     \
55
 
        bacon-video-widget-gst-0.10.c                   \
 
46
        bacon-video-widget.c                            \
56
47
        bacon-video-widget-gst-missing-plugins.c        \
57
48
        bacon-video-widget-gst-missing-plugins.h        \
58
49
        totem-aspect-frame.h                            \
59
 
        totem-aspect-frame.c
 
50
        totem-aspect-frame.c                            \
 
51
        gsd-osd-window.c                                \
 
52
        gsd-osd-window.h                                \
 
53
        gsd-osd-window-private.h                        \
 
54
        bacon-video-osd-actor.c                         \
 
55
        bacon-video-osd-actor.h
60
56
 
61
57
libbaconvideowidget_la_CPPFLAGS = \
62
58
        -D_REENTRANT                            \
63
59
        -I$(top_srcdir)/src/gst/                \
 
60
        -I$(top_builddir)/src/backend           \
64
61
        $(DISABLE_DEPRECATED)                   \
65
62
        $(AM_CPPFLAGS)
66
63
 
67
 
libbaconvideowidget_la_CFLAGS = \
68
 
        $(DEPENDENCY_CFLAGS)            \
69
 
        $(MM_CFLAGS)                    \
70
 
        $(MISSING_PLUGINS_CFLAGS)       \
 
64
libbaconvideowidget_la_CFLAGS = \
 
65
        $(BACKEND_CFLAGS)       \
71
66
        $(AM_CFLAGS)
72
67
 
73
 
libbaconvideowidget_la_LIBADD =                         \
74
 
        $(top_builddir)/src/gst/libtotemgsthelpers.la   \
75
 
        $(MM_LIBS)                                      \
76
 
        $(GST_LIBS)                                     \
77
 
        $(EXTRA_BACKEND_LIBS)                           \
78
 
        $(X_LIBS)                                       \
79
 
        $(MISSING_PLUGINS_LIBS)                         \
 
68
libbaconvideowidget_la_LIBADD =                                 \
 
69
        $(top_builddir)/src/gst/libtotemgsthelpers.la           \
 
70
        $(top_builddir)/src/gst/libtotemgstpixbufhelpers.la     \
 
71
        $(BACKEND_LIBS)                                         \
80
72
        -lm
81
73
 
82
74
libbaconvideowidget_la_LDFLAGS= \
86
78
        $(BVW_MARSHAL_FILES)    \
87
79
        $(BVW_ENUM_FILES)
88
80
 
89
 
EXTRA_DIST = \
90
 
        baconvideowidget-marshal.list
91
 
 
92
81
-include $(top_srcdir)/git.mk