← Back to branch summary

~ubuntu-branches/ubuntu/maverick/brasero/maverick

« back to all changes in this revision

Viewing changes to libbrasero-burn/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2010-09-14 10:23:22 UTC
  • mfrom: (1.1.44 upstream)
  • Revision ID: james.westby@ubuntu.com-20100914102322-7eigq8pge5wqfol1
Tags: 2.31.92-0ubuntu1
* New upstream release:
  - Revert to libunique from GApplication (Luis Medinas)
  - Remove dbus-glib requires from pkgconfig file (Luis Medinas)
  - Some more debugging to find out about problems with encrypted DVDs
    (Philippe Rouquier)
  - Fix minor issues in gdbus conversion. (Luis Medinas)
  - Remove dbus-glib check from configure (Luis Medinas)
  - Replace last part of dbus-glib by GDBus (Luis Medinas)
  - Fix Inhibit() d-bus parameters (Robert Ancell)
  - Remove dbus libraries from the Makefile. (Luis Medinas)
  - Use --with-gtk switch for gtk 2/3 selection (Christian Persch)
  - Fix image checksuming that did not occur when GConf or GSetting returned 0
    as a value for the checksum type key (Philippe Rouquier)
  - Don't hardcode gconf gsettings backend (Robert Ancell)
  - Fix brasero plugin directory (Robert Ancell)
* debian/control:
  - build-dep on libunique
* debian/patches/010_lpi.patch,31_link_libice.patch:
  - adapt to latest code
* debian/patches/013_gsettings_backend.patch,014_plugin_directory.patch,
  015_inhibit_params.patch:
  - removed, now upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
libbrasero-burn/Makefile.am
18
18
        $(BRASERO_GIO_CFLAGS)                                           \
19
19
        $(BRASERO_GTK_CFLAGS)                                           \
20
20
        $(BRASERO_GSTREAMER_CFLAGS)                                     \
21
 
        $(BRASERO_DBUS_CFLAGS)                                          \
22
21
        $(BRASERO_CANBERRA_CFLAGS)
23
22
 
24
23
GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
66
65
        $(BRASERO_GIO_LIBS)                                     \
67
66
        $(BRASERO_GTK_LIBS)                                     \
68
67
        $(BRASERO_GSTREAMER_LIBS)                               \
69
 
        $(BRASERO_DBUS_LIBS)                                    \
70
68
        $(BRASERO_CANBERRA_LIBS)
71
69
 
72
70
libbrasero_burn@BRASERO_LIBRARY_SUFFIX@_la_LDFLAGS =                                    \
222
220
            -I$(top_builddir)/libbrasero-media  \
223
221
            -I$(top_srcdir)/libbrasero-burn             \
224
222
            -I$(top_builddir)/libbrasero-burn   \
225
 
            --include=Gtk-@GTK_API_VERSION@.0 \
 
223
            --include=Gtk-@GTK_API_VERSION@ \
226
224
            --add-include-path=$(top_builddir)/libbrasero-media \
227
225
            --include=BraseroMedia-@BRASERO_VERSION@ \
228
226
            --library=brasero-burn@BRASERO_LIBRARY_SUFFIX@ \
229
227
            --libtool="$(LIBTOOL)" \
230
228
            --output $@ \
231
 
            --pkg=gtk+-@GTK_API_VERSION@.0  \
 
229
            --pkg=gtk+-@GTK_API_VERSION@  \
232
230
            --strip-prefix=Brasero      \
233
231
            $(top_srcdir)/libbrasero-burn/brasero-tags.h                                                \
234
232
            $(top_srcdir)/libbrasero-burn/brasero-enums.h                                               \