← Back to branch summary

~ubuntu-branches/ubuntu/quantal/ibus/quantal

« back to all changes in this revision

Viewing changes to gconf/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Barry Warsaw
  • Date: 2011-08-11 17:00:57 UTC
  • mfrom: (6.2.14 sid)
  • Revision ID: james.westby@ubuntu.com-20110811170057-6dmbfs4s3cchzl7x
Tags: 1.3.99.20110419-1ubuntu1
https://launchpad.net/bugs/457632
* Merge with Debian unstable.  Remaining Ubuntu changes:
  - Indicator support:
    + Add 05_appindicator.patch: Use an indicator rather than a notification
      icon.
    + debian/control: Recommend python-appindicator.
  - debian/control: Install im-switch instead of im-config by default.
  - debian/README.source: Removed, it was outdated and no longer correct
  - debian/patches/01_ubuntu_desktop: Fix "Desktop entry needs the
    X-Ubuntu-Gettext-Domain key"  (LP: #457632)
  - debian/patches/02_title_update.patch: Rename "IBus Preferences" to
    "Keyboard Input Methods"
  - debian/patches/06_locale_parser.patch: Cherry-picked from upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gconf/Makefile.am
20
20
# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
21
21
# Boston, MA  02111-1307  USA
22
22
 
23
 
libibus = $(top_builddir)/src/libibus.la
 
23
libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
24
24
 
25
25
libexec_PROGRAMS = \
26
26
        ibus-gconf \
33
33
        $(NULL)
34
34
ibus_gconf_CFLAGS = \
35
35
        @GLIB2_CFLAGS@ \
 
36
        @GIO2_CFLAGS@ \
36
37
        @GCONF_CFLAGS@ \
37
 
        @DBUS_CFLAGS@ \
38
38
        -DG_LOG_DOMAIN=\"IBUS\" \
39
39
        -I$(top_srcdir)/src \
40
40
        -I$(top_builddir)/src \
42
42
ibus_gconf_LDADD = \
43
43
        @GOBJECT2_LIBS@ \
44
44
        @GLIB2_LIBS@ \
 
45
        @GIO2_LIBS@ \
45
46
        @GCONF_LIBS@ \
46
 
        @DBUS_LIBS@ \
47
47
        $(libibus) \
48
48
        $(NULL)
49
49
ibus_gconf_DEPENDENCIES = \
50
50
        $(libibus) \
51
51
        $(NULL)
52
52
 
53
 
if ENABLE_GCONF
54
53
component_DATA = \
55
54
        gconf.xml \
56
55
        $(NULL)
57
 
endif
58
56
 
59
57
componentdir = $(pkgdatadir)/component
60
58
 
77
75
 
78
76
$(libibus):
79
77
        $(MAKE) -C $(top_builddir)/src
 
78
 
 
79
-include $(top_srcdir)/git.mk