← Back to branch summary

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

« back to all changes in this revision

Viewing changes to m4/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:
m4/Makefile.in
58
58
subdir = m4
59
59
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
60
60
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
61
 
am__aclocal_m4_deps = $(top_srcdir)/m4/as-version.m4 \
62
 
        $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
 
61
am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
 
62
        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
63
63
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
64
64
        $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
65
65
        $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
100
100
CXXFLAGS = @CXXFLAGS@
101
101
CYGPATH_W = @CYGPATH_W@
102
102
DATADIRNAME = @DATADIRNAME@
103
 
DATE_DISPLAY = @DATE_DISPLAY@
104
103
DBUS_CFLAGS = @DBUS_CFLAGS@
105
104
DBUS_LIBS = @DBUS_LIBS@
106
105
DBUS_PYTHON_CFLAGS = @DBUS_PYTHON_CFLAGS@
152
151
GTKDOC_MKPDF = @GTKDOC_MKPDF@
153
152
GTKDOC_REBASE = @GTKDOC_REBASE@
154
153
HTML_DIR = @HTML_DIR@
 
154
IBUS_API_VERSION = @IBUS_API_VERSION@
155
155
IBUS_GIR_SCANNERFLAGS = @IBUS_GIR_SCANNERFLAGS@
 
156
IBUS_ICON_KEYBOARD = @IBUS_ICON_KEYBOARD@
 
157
IBUS_MAJOR_VERSION = @IBUS_MAJOR_VERSION@
 
158
IBUS_MICRO_VERSION = @IBUS_MICRO_VERSION@
 
159
IBUS_MINOR_VERSION = @IBUS_MINOR_VERSION@
156
160
INSTALL = @INSTALL@
157
161
INSTALL_DATA = @INSTALL_DATA@
158
162
INSTALL_PROGRAM = @INSTALL_PROGRAM@
204
208
PACKAGE_TARNAME = @PACKAGE_TARNAME@
205
209
PACKAGE_URL = @PACKAGE_URL@
206
210
PACKAGE_VERSION = @PACKAGE_VERSION@
207
 
PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@
208
 
PACKAGE_VERSION_MICRO = @PACKAGE_VERSION_MICRO@
209
 
PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@
210
 
PACKAGE_VERSION_NANO = @PACKAGE_VERSION_NANO@
211
 
PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@
212
211
PATH_SEPARATOR = @PATH_SEPARATOR@
213
212
PKG_CONFIG = @PKG_CONFIG@
214
213
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
482
481
        mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
483
482
 
484
483
 
 
484
-include $(top_srcdir)/git.mk
 
485
 
485
486
# Tell versions [3.59,3.63) of GNU make to not export all variables.
486
487
# Otherwise a system limit (for SysV at least) may be exceeded.
487
488
.NOEXPORT: