← Back to branch summary

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

« back to all changes in this revision

Viewing changes to Makefile.am

  • 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:
Makefile.am
20
20
# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
21
21
# Boston, MA  02111-1307  USA
22
22
 
 
23
NULL =
 
24
 
23
25
if ENABLE_PYTHON
24
 
PYTHON_DIRS = \
25
 
        ibus \
26
 
        setup \
 
26
PYTHON_DIRS =       \
 
27
        ibus            \
 
28
        ui              \
 
29
        setup           \
27
30
        $(NULL)
28
31
endif
29
32
 
30
33
if ENABLE_GCONF
31
 
GCONF_DIRS = \
32
 
        gconf \
 
34
GCONF_DIRS =        \
 
35
        gconf           \
 
36
        $(NULL)
 
37
endif
 
38
 
 
39
if ENABLE_DAEMON
 
40
DAEMON_DIRS =       \
 
41
        bus             \
33
42
        $(NULL)
34
43
endif
35
44
 
39
48
        $(NULL)
40
49
endif
41
50
 
42
 
SUBDIRS = \
43
 
        src \
44
 
        bus \
45
 
        util \
46
 
        client \
47
 
        data \
48
 
        m4 \
49
 
        po \
50
 
        docs \
51
 
        ui \
52
 
        bindings \
53
 
        $(PYTHON_DIRS) \
54
 
        $(GCONF_DIRS) \
 
51
SUBDIRS =           \
 
52
        src             \
 
53
        util            \
 
54
        client          \
 
55
        data            \
 
56
        m4              \
 
57
        po              \
 
58
        docs            \
 
59
        bindings        \
 
60
        $(DAEMON_DIRS)  \
 
61
        $(PYTHON_DIRS)  \
 
62
        $(GCONF_DIRS)   \
55
63
        $(MEMCONF_DIRS) \
56
64
        $(NULL)
57
65
 
58
66
ACLOCAL_AMFLAGS = -I m4
59
67
 
60
68
pkgconfigdir = $(libdir)/pkgconfig
61
 
pkgconfig_DATA = ibus-1.0.pc
 
69
pkgconfig_DATA = ibus-@IBUS_API_VERSION@.pc
62
70
 
 
71
ibus_pc_in = ibus-@IBUS_API_VERSION@.pc.in
63
72
EXTRA_DIST = \
64
73
        autogen.sh \
65
 
        ibus-1.0.pc.in \
 
74
        $(ibus_pc_in) \
66
75
        ibus.spec.in \
67
76
        python-config.py \
68
77
        $(NULL)
80
89
DISTCHECK_CONFIGURE_FLAGS = \
81
90
        --enable-gtk-doc \
82
91
        --disable-schemas-install \
 
92
        --disable-introspection \
83
93
        $(NULL)
84
94
 
85
95
dist-hook:
143
153
                cd $(distdir); \
144
154
                cp -a ../../debian . ; \
145
155
                cd debian; \
146
 
                debuild -b ; \
 
156
                debuild -b -us -uc; \
147
157
        )
148
158
 
149
 
 
150
159
clean-rpm:
151
160
        $(RM) -r "`uname -i`"
152
161
 
156
165
        git tag -s @PACKAGE_VERSION@
157
166
 
158
167
git-clean-tree:
159
 
        git clean -d -f -x      
 
168
        git clean -d -f -x
 
169
 
 
170
-include $(top_srcdir)/git.mk