← Back to branch summary

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

« back to all changes in this revision

Viewing changes to client-qt/qt3/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:
client-qt/qt3/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_QT3_IMMODULE
19
19
 
20
20
INCLUDES                = -I$(top_builddir) \
21
21
                          -I$(top_srcdir) \
22
22
                          -I$(top_srcdir)/common \
23
23
                          -I$(top_srcdir)/client-common
24
24
 
25
 
noinst_HEADERS = scim-bridge-client-qt.h scim-bridge-client-imcontext-qt.h  scim-bridge-client-key-event-utility-qt.h scim-bridge-client-common-qt.h
 
25
noinst_HEADERS = ../scim-bridge-client-qt.h ../scim-bridge-client-imcontext-qt.h  ../scim-bridge-client-key-event-utility-qt.h ../scim-bridge-client-common-qt.h
26
26
 
27
27
moduledir = @QT3_PREFIX@/plugins/inputmethods
28
28
module_LTLIBRARIES = im-scim-bridge.la
29
29
 
30
 
im_scim_bridge_la_SOURCES = im-scim-bridge-qt.cpp \
31
 
                                                        scim-bridge-client-qt.cpp \
32
 
                                                        scim-bridge-client-imcontext-qt.cpp \
33
 
                                                        scim-bridge-client-key-event-utility-qt.cpp \
 
30
im_scim_bridge_la_SOURCES = ../im-scim-bridge-qt.cpp \
 
31
                                                        ../scim-bridge-client-qt.cpp \
 
32
                                                        ../scim-bridge-client-imcontext-qt.cpp \
 
33
                                                        ../scim-bridge-client-key-event-utility-qt.cpp \
34
34
                                                        moc_scim-bridge-client-qt.cpp
35
35
 
36
36
im_scim_bridge_la_CXXFLAGS=@QT3_CFLAGS@ -DQT_IMMODULE
46
46
 
47
47
MOC = @QT3_PREFIX@/bin/moc
48
48
 
49
 
CLEANFILES = moc_scim-bridge-client-qt.cpp
50
 
 
51
 
im-scim-bridge-qt.cpp: scim-bridge-client-qt.h
52
 
 
53
 
scim-bridge-client-qt.h:
54
 
        ln -sf $(top_srcdir)/client-qt/*.{h,cpp} .
55
 
 
56
 
scim-bridge-client-qt.cpp: moc_scim-bridge-client-qt.cpp
57
 
 
58
 
moc_scim-bridge-client-qt.cpp: scim-bridge-client-qt.h
59
 
        $(MOC) $< -o $*.cpp
 
49
moc_scim-bridge-client-qt.cpp: ../scim-bridge-client-qt.h
 
50
        $(MOC) $< -o $@
 
51
 
 
52
else
 
53
 
 
54
moc_scim-bridge-client-qt.cpp:
 
55
        touch $@
 
56
 
 
57
endif
60
58
 
61
59
dist-hook:
62
60
        -rm -f $(distdir)/moc_scim-bridge-client-qt.cpp
 
61
 
 
62
MAINTAINERCLEANFILES    = Makefile.in
 
63
CLEANFILES = moc_scim-bridge-client-qt.cpp
 
64