← Back to branch summary

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

« back to all changes in this revision

Viewing changes to tests/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:
tests/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
19
 
EXTRA_DIST = test-exec.sh.in gtk.immodules.in
 
18
if SCIM_BRIDGE_BUILD_TESTS
20
19
 
21
20
do_subst = sed -e 's,[@]top_builddir[@],@top_builddir@,g'
22
21
 
29
28
gtk.immodules: gtk.immodules.in
30
29
        $(do_subst) < $^ > $@; chmod a+x $@
31
30
endif
 
31
 
 
32
endif
 
33
 
 
34
MAINTAINERCLEANFILES = Makefile.in
 
35
 
 
36
EXTRA_DIST = test-exec.sh.in gtk.immodules.in