← Back to branch summary

~ubuntu-branches/ubuntu/vivid/scim-bridge/vivid

« back to all changes in this revision

Viewing changes to agent/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2009-06-25 22:02:52 UTC
  • mfrom: (1.1.9 upstream) (6.2.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090625220252-2qn0jwi9re34zcth
Tags: 0.4.16-2ubuntu1
* Resynchronise with Debian. Remaining changes:
  - 50_check_scim_binary.dpatch: Fix 10-20s delay in launching apps when
    scim is not running.
  - 50_fix_qt4_focus.dpatch: Fix focus loss under KDE 4.
  - 51_quiet.dpatch: Turn some error messages into debug lines.
  - Just have scim-bridge-agent depend on scim, not scim | skim.

Show diffs side-by-side

added added

removed removed

Lines of Context:
agent/Makefile.am
15
15
## but WITHOUT ANY WARRANTY; without even the implied warranty of
16
16
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
17
17
 
18
 
MAINTAINERCLEANFILES    = Makefile.in
 
18
if SCIM_BRIDGE_BUILD_AGENT
19
19
 
20
20
INCLUDES                = -I$(top_srcdir) \
21
21
                  -I$(top_srcdir)/common \
55
55
scim_bridge_CXXFLAGS    = @SCIM_CFLAGS@
56
56
scim_bridge_LDFLAGS     = @SCIM_LIBS@
57
57
scim_bridge_LDADD     = $(top_builddir)/common/libscimbridgecommon.la
 
58
 
 
59
endif
 
60
 
 
61
MAINTAINERCLEANFILES    = Makefile.in