← Back to branch summary

~walkerlee/totem/pre-interview

« back to all changes in this revision

Viewing changes to src/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
https://launchpad.net/bugs/1007438
https://launchpad.net/bugs/1039604
* 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:
src/Makefile.am
16
16
        $(DISABLE_DEPRECATED)                           \
17
17
        -I$(top_srcdir)/                                \
18
18
        -I$(top_srcdir)/src/backend                     \
 
19
        -I$(top_builddir)/src/backend                   \
19
20
        -I$(srcdir)/plugins
20
21
 
21
22
AM_CFLAGS = $(WARN_CFLAGS)
23
24
# Header files installed for use by plugins (and consequently introspected using gobject-introspection; see the bottom of the Makefile)
24
25
INST_H_FILES = \
25
26
        totem.h                         \
26
 
        totem-video-list.h              \
27
 
        totem-cell-renderer-video.h     \
28
27
        totem-interface.h               \
29
28
        plugins/totem-plugin.h          \
30
29
        plugins/totem-dirs.h
40
39
        totem-interface.c       \
41
40
        totem-fullscreen.c      \
42
41
        totem-fullscreen.h      \
43
 
        gsd-media-keys-window.c \
44
 
        gsd-media-keys-window.h \
45
 
        gsd-osd-window.c        \
46
 
        gsd-osd-window.h        \
 
42
        gd-fullscreen-filter.c  \
 
43
        gd-fullscreen-filter.h  \
47
44
        totem-time-label.c      \
48
45
        totem-time-label.h
49
46
 
50
 
libtotem_player_la_CPPFLAGS = \
 
47
libtotem_player_la_CPPFLAGS =           \
51
48
        -DG_LOG_DOMAIN=\""Totem"\"      \
52
49
        $(AM_CPPFLAGS)
53
50
 
54
 
libtotem_player_la_LIBADD = $(DEPENDENCY_LIBS)
55
 
libtotem_player_la_CFLAGS = \
56
 
        $(DEPENDENCY_CFLAGS)    \
 
51
libtotem_player_la_LIBADD =     \
 
52
        $(PLAYER_LIBS)          \
 
53
        gst/libtotemtimehelpers.la
 
54
libtotem_player_la_CFLAGS =     \
 
55
        $(LIBPLAYER_CFLAGS)     \
 
56
        -I$(srcdir)/gst/        \
57
57
        $(AM_CFLAGS)
58
58
 
59
59
# Totem main library (used for main player; separate to allow gtk-doc to be used)
62
62
        $(INST_H_FILES)                 \
63
63
        totem-object.c                  \
64
64
        totem-private.h                 \
65
 
        totem-cell-renderer-video.c     \
66
 
        totem-video-list.c              \
67
65
        totem-preferences.c             \
68
66
        totem-preferences.h             \
69
67
        totem-dnd-menu.c                \
98
96
        $(AM_CPPFLAGS)
99
97
 
100
98
libtotem_la_CFLAGS = \
101
 
        $(DEPENDENCY_CFLAGS)            \
102
 
        $(PEAS_CFLAGS)                  \
103
 
        $(PEASGTK_CFLAGS)               \
 
99
        $(PLAYER_CFLAGS)                \
104
100
        $(AM_CFLAGS)
105
101
 
106
102
libtotem_la_LDFLAGS = \
111
107
libtotem_la_LIBADD = \
112
108
        libtotem_player.la              \
113
109
        backend/libbaconvideowidget.la  \
114
 
        $(PEAS_LIBS)                    \
115
 
        $(PEASGTK_LIBS)                 \
116
 
        $(DEPENDENCY_LIBS)
 
110
        $(PLAYER_LIBS)
117
111
 
118
112
if WITH_SMCLIENT
119
113
libtotem_la_SOURCES += \
139
133
endif
140
134
endif
141
135
 
142
 
# Marshal files
143
 
TOTEM_MARSHAL_FILES = \
144
 
        totemobject-marshal.c totemobject-marshal.h             \
145
 
        totemplaylist-marshal.c totemplaylist-marshal.h         \
146
 
        totemvideolist-marshal.c totemvideolist-marshal.h
147
 
 
148
 
totemobject-marshal.h: totemobject-marshal.list
149
 
        $(AM_V_GEN) ($(GLIB_GENMARSHAL) --prefix=totemobject_marshal $(srcdir)/totemobject-marshal.list --header > $@)
150
 
totemobject-marshal.c: totemobject-marshal.h totemobject-marshal.list
151
 
        $(AM_V_GEN) ($(GLIB_GENMARSHAL) --prefix=totemobject_marshal $(srcdir)/totemobject-marshal.list --header --body > $@)
152
 
totemplaylist-marshal.h: totemplaylist-marshal.list
153
 
        $(AM_V_GEN) ($(GLIB_GENMARSHAL) --prefix=totemplaylist_marshal $(srcdir)/totemplaylist-marshal.list --header > $@)
154
 
totemplaylist-marshal.c: totemplaylist-marshal.h totemobject-marshal.list
155
 
        $(AM_V_GEN) ($(GLIB_GENMARSHAL) --prefix=totemplaylist_marshal $(srcdir)/totemplaylist-marshal.list --header --body > $@)
156
 
totemvideolist-marshal.h: totemvideolist-marshal.list
157
 
        $(AM_V_GEN) ($(GLIB_GENMARSHAL) --prefix=totemvideolist_marshal $(srcdir)/totemvideolist-marshal.list --header > $@)
158
 
totemvideolist-marshal.c: totemvideolist-marshal.h totemobject-marshal.list
159
 
        $(AM_V_GEN) ($(GLIB_GENMARSHAL) --prefix=totemvideolist_marshal $(srcdir)/totemvideolist-marshal.list --header --body > $@)
160
 
 
161
 
EXTRA_DIST = \
162
 
        totemobject-marshal.list        \
163
 
        totemvideolist-marshal.list     \
164
 
        totemplaylist-marshal.list
165
 
CLEANFILES = $(TOTEM_MARSHAL_FILES)
166
 
 
167
136
# Totem
168
137
totem_SOURCES = totem.c
169
138
 
171
140
        -DG_LOG_DOMAIN=\""Totem"\"      \
172
141
        $(AM_CPPFLAGS)
173
142
 
174
 
totem_CFLAGS = \
175
 
        $(PEAS_CFLAGS)          \
176
 
        $(DEPENDENCY_CFLAGS)    \
 
143
totem_CFLAGS =                  \
 
144
        $(PLAYER_CFLAGS)        \
177
145
        $(AM_CFLAGS)
178
146
 
179
 
totem_LDADD = \
180
 
        libtotem.la             \
181
 
        $(DEPENDENCY_LIBS)      \
182
 
        $(X_LIBS)       \
183
 
        $(PEAS_LIBS)
 
147
totem_LDADD =           \
 
148
        libtotem.la     \
 
149
        $(PLAYER_LIBS)
184
150
 
185
151
# Totem video thumbnailer
186
152
totem_video_thumbnailer_SOURCES = \
192
158
        -DG_LOG_DOMAIN=\""TotemVideoThumbnailer"\"      \
193
159
        $(AM_CPPFLAGS)
194
160
 
195
 
totem_video_thumbnailer_CFLAGS = \
196
 
        $(DEPENDENCY_CFLAGS)    \
 
161
totem_video_thumbnailer_CFLAGS =        \
 
162
        $(THUMBNAILER_CFLAGS)           \
197
163
        $(AM_CFLAGS)
198
164
 
199
 
totem_video_thumbnailer_LDADD = \
200
 
        backend/libbaconvideowidget.la          \
201
 
        $(DEPENDENCY_LIBS)
 
165
totem_video_thumbnailer_LDADD =         \
 
166
        $(THUMBNAILER_LIBS)             \
 
167
        gst/libtotemgstpixbufhelpers.la \
 
168
        gst/libtotemgsthelpers.la       \
 
169
        gst/libtotemtimehelpers.la      \
 
170
        -lm
202
171
 
203
172
# Nautilus Property Page
204
173
if HAVE_NAUTILUS
216
185
        -DG_LOG_DOMAIN=\""TotemPropertiesPage"\"\
217
186
        $(AM_CPPFLAGS)
218
187
 
219
 
libtotem_properties_page_la_CFLAGS = \
220
 
        $(DEPENDENCY_CFLAGS)    \
221
 
        $(NAUTILUS_CFLAGS)      \
 
188
libtotem_properties_page_la_CFLAGS =    \
 
189
        $(NAUTILUS_CFLAGS)              \
222
190
        $(AM_CFLAGS)
223
191
 
224
192
libtotem_properties_page_la_LDFLAGS = \
225
193
        -export_dynamic -avoid-version -module -no-undefined    \
226
194
        $(AM_LDFLAGS)
227
195
 
228
 
libtotem_properties_page_la_LIBADD = \
229
 
        backend/libbaconvideowidget.la                          \
 
196
libtotem_properties_page_la_LIBADD =                            \
230
197
        properties/libbaconvideowidgetproperties.la             \
231
 
        libtotem_player.la                                      \
232
 
        $(DEPENDENCY_LIBS)                                      \
233
198
        $(NAUTILUS_LIBS)
234
199
 
235
200
noinst_PROGRAMS = test-properties-page
245
210
        -I$(top_srcdir)/src/properties          \
246
211
        $(AM_CPPFLAGS)
247
212
 
248
 
test_properties_page_CFLAGS = \
249
 
        $(DEPENDENCY_CFLAGS)    \
 
213
test_properties_page_CFLAGS =   \
250
214
        $(NAUTILUS_CFLAGS)      \
251
215
        $(AM_CFLAGS)
252
216
 
254
218
        backend/libbaconvideowidget.la                          \
255
219
        properties/libbaconvideowidgetproperties.la             \
256
220
        libtotem_player.la                                      \
257
 
        $(DEPENDENCY_LIBS)                                      \
258
221
        $(NAUTILUS_LIBS)
259
222
endif # HAVE_NAUTILUS
260
223
 
270
233
        -DG_LOG_DOMAIN=\""TotemAudioPreview"\"  \
271
234
        $(AM_CPPFLAGS)
272
235
 
273
 
totem_audio_preview_CFLAGS = \
274
 
        $(DEPENDENCY_CFLAGS)    \
 
236
totem_audio_preview_CFLAGS =    \
 
237
        $(PREVIEW_CFLAGS)       \
275
238
        $(AM_CFLAGS)
276
239
 
277
240
totem_audio_preview_LDADD =                     \
278
241
        gst/libtotemgsthelpers.la               \
279
 
        backend/libbaconvideowidget.la          \
280
 
        $(DEPENDENCY_LIBS)
 
242
        $(PREVIEW_LIBS)
281
243
 
282
244
# Introspection
283
245
-include $(INTROSPECTION_MAKEFILE)
294
256
Totem-1.0.gir: libtotem.la
295
257
Totem_1_0_gir_INCLUDES = GLib-2.0 GObject-2.0 Gtk-3.0 TotemPlParser-1.0
296
258
Totem_1_0_gir_SCANNERFLAGS = --c-include=totem.h --pkg-export=totem
297
 
Totem_1_0_gir_CFLAGS = \
298
 
        $(DEPENDENCY_CFLAGS)    \
299
 
        $(PEAS_CFLAGS)          \
 
259
Totem_1_0_gir_CFLAGS =          \
 
260
        $(PLAYER_CFLAGS)        \
300
261
        $(libtotem_la_CPPFLAGS)
301
262
Totem_1_0_gir_LIBS = libtotem.la
302
263
Totem_1_0_gir_FILES = $(introspection_sources)
309
270
typelibdir = $(libdir)/girepository-1.0
310
271
typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
311
272
 
312
 
CLEANFILES += $(gir_DATA) $(typelib_DATA)
 
273
CLEANFILES = $(gir_DATA) $(typelib_DATA)
313
274
 
314
275
endif
315
276