~ubuntu-branches/ubuntu/precise/uim/precise

« back to all changes in this revision

Viewing changes to qt/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Ilya Barygin
  • Date: 2011-12-18 16:35:38 UTC
  • mfrom: (1.1.13) (15.1.7 sid)
  • Revision ID: package-import@ubuntu.com-20111218163538-8ktir39z2mjpii8z
Tags: 1:1.7.1-3ubuntu1
* Merge from Debian testing (LP: #818199).
* Remaining changes:
  - debian/uim-qt.install: Fix plugin path for multiarch location.
* Dropped changes:
  - uim-applet-gnome removal (GNOME 3 applet is available)
  - 19_as-needed_compile_fix.dpatch (accepted into Debian package)
* translations.patch: add several files to POTFILE.in to prevent
  intltool-update failure.

Show diffs side-by-side

added added

removed removed

Lines of Context:
165
165
uim_im_switcher_qt_CXXFLAGS = $(QT_CXXFLAGS)
166
166
uim_im_switcher_qt_LDFLAGS  = $(QT_LDFLAGS)
167
167
uim_im_switcher_qt_LDADD    = $(top_builddir)/uim/libuim-scm.la \
168
 
                              $(top_builddir)/uim/libuim.la
 
168
                              $(top_builddir)/uim/libuim.la \
 
169
                              $(top_builddir)/uim/libuim-custom.la
169
170
switcher-qt.cpp: switcher-qt.moc
170
171
 
171
172