← Back to branch summary

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

« back to all changes in this revision

Viewing changes to client/gtk3/Makefile.in

  • 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:
client/gtk3/Makefile.in
59
59
subdir = client/gtk3
60
60
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
61
61
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
62
 
am__aclocal_m4_deps = $(top_srcdir)/m4/as-version.m4 \
63
 
        $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
 
62
am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
 
63
        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
64
64
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
65
65
        $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
66
66
        $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
155
155
CXXFLAGS = @CXXFLAGS@
156
156
CYGPATH_W = @CYGPATH_W@
157
157
DATADIRNAME = @DATADIRNAME@
158
 
DATE_DISPLAY = @DATE_DISPLAY@
159
158
DBUS_CFLAGS = @DBUS_CFLAGS@
160
159
DBUS_LIBS = @DBUS_LIBS@
161
160
DBUS_PYTHON_CFLAGS = @DBUS_PYTHON_CFLAGS@
207
206
GTKDOC_MKPDF = @GTKDOC_MKPDF@
208
207
GTKDOC_REBASE = @GTKDOC_REBASE@
209
208
HTML_DIR = @HTML_DIR@
 
209
IBUS_API_VERSION = @IBUS_API_VERSION@
210
210
IBUS_GIR_SCANNERFLAGS = @IBUS_GIR_SCANNERFLAGS@
 
211
IBUS_ICON_KEYBOARD = @IBUS_ICON_KEYBOARD@
 
212
IBUS_MAJOR_VERSION = @IBUS_MAJOR_VERSION@
 
213
IBUS_MICRO_VERSION = @IBUS_MICRO_VERSION@
 
214
IBUS_MINOR_VERSION = @IBUS_MINOR_VERSION@
211
215
INSTALL = @INSTALL@
212
216
INSTALL_DATA = @INSTALL_DATA@
213
217
INSTALL_PROGRAM = @INSTALL_PROGRAM@
259
263
PACKAGE_TARNAME = @PACKAGE_TARNAME@
260
264
PACKAGE_URL = @PACKAGE_URL@
261
265
PACKAGE_VERSION = @PACKAGE_VERSION@
262
 
PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@
263
 
PACKAGE_VERSION_MICRO = @PACKAGE_VERSION_MICRO@
264
 
PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@
265
 
PACKAGE_VERSION_NANO = @PACKAGE_VERSION_NANO@
266
 
PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@
267
266
PATH_SEPARATOR = @PATH_SEPARATOR@
268
267
PKG_CONFIG = @PKG_CONFIG@
269
268
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
348
347
top_build_prefix = @top_build_prefix@
349
348
top_builddir = @top_builddir@
350
349
top_srcdir = @top_srcdir@
351
 
libibus = $(top_builddir)/src/libibus.la
 
350
libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
352
351
INCLUDES = \
353
352
        -I$(top_srcdir)/src \
354
353
        -I$(top_builddir)/src \
714
713
test: all
715
714
        GTK_IM_MODULE=ibus gedit
716
715
 
 
716
-include $(top_srcdir)/git.mk
 
717
 
717
718
# Tell versions [3.59,3.63) of GNU make to not export all variables.
718
719
# Otherwise a system limit (for SysV at least) may be exceeded.
719
720
.NOEXPORT: