Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(1570)

Delta Between Two Patch Sets: bindings/vala/Makefile.am

Issue 320700043: ui/gtk3: Integrate custom rendering to use HarfBuzz glyph info Base URL: git@github.com:ibus/ibus.git@master
Left Patch Set: Created 6 years, 9 months ago
Right Patch Set: Fixed some memory leaks Created 6 years, 8 months ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « bindings/vala/IBusFontSet-1.0.metadata ('k') | bindings/vala/ibus-emoji-dialog-1.0.deps » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 # vim:set noet ts=4: 1 # vim:set noet ts=4:
2 # 2 #
3 # ibus - The Input Bus 3 # ibus - The Input Bus
4 # 4 #
5 # Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com> 5 # Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
6 # Copyright (c) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com> 6 # Copyright (c) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
7 # Copyright (c) 2007-2017 Red Hat, Inc. 7 # Copyright (c) 2007-2017 Red Hat, Inc.
8 # 8 #
9 # This library is free software; you can redistribute it and/or 9 # This library is free software; you can redistribute it and/or
10 # modify it under the terms of the GNU Lesser General Public 10 # modify it under the terms of the GNU Lesser General Public
11 # License as published by the Free Software Foundation; either 11 # License as published by the Free Software Foundation; either
12 # version 2.1 of the License, or (at your option) any later version. 12 # version 2.1 of the License, or (at your option) any later version.
13 # 13 #
14 # This library is distributed in the hope that it will be useful, 14 # This library is distributed in the hope that it will be useful,
15 # but WITHOUT ANY WARRANTY; without even the implied warranty of 15 # but WITHOUT ANY WARRANTY; without even the implied warranty of
16 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 16 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17 # Lesser General Public License for more details. 17 # Lesser General Public License for more details.
18 # 18 #
19 # You should have received a copy of the GNU Lesser General Public 19 # You should have received a copy of the GNU Lesser General Public
20 # License along with this library; if not, write to the Free Software 20 # License along with this library; if not, write to the Free Software
21 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 21 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
22 # USA 22 # USA
23 23
24 -include $(VAPIGEN_MAKEFILE) 24 -include $(VAPIGEN_MAKEFILE)
25 25
26 libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la 26 libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
27
28 # Do not include temporary .c and .vala files
29 DIST_SOURCES =
30 27
31 noinst_LTLIBRARIES = 28 noinst_LTLIBRARIES =
32 noinst_DATA = 29 noinst_DATA =
33 INTROSPECTION_GIRS = 30 INTROSPECTION_GIRS =
34 girdir = $(datadir)/gir-1.0 31 girdir = $(datadir)/gir-1.0
35 32
36 AM_CPPFLAGS = \ 33 AM_CPPFLAGS = \
37 -I$(top_srcdir)/src \ 34 -I$(top_srcdir)/src \
38 -I$(top_builddir)/src \ 35 -I$(top_builddir)/src \
39 -include $(CONFIG_HEADER) \ 36 -include $(CONFIG_HEADER) \
(...skipping 13 matching lines...) Expand all
53 --pkg=gtk+-3.0 \ 50 --pkg=gtk+-3.0 \
54 --pkg=gdk-x11-3.0 \ 51 --pkg=gdk-x11-3.0 \
55 --pkg=ibus-1.0 \ 52 --pkg=ibus-1.0 \
56 --pkg=config \ 53 --pkg=config \
57 --pkg=xi \ 54 --pkg=xi \
58 --target-glib="$(VALA_TARGET_GLIB_VERSION)" \ 55 --target-glib="$(VALA_TARGET_GLIB_VERSION)" \
59 $(NULL) 56 $(NULL)
60 57
61 vapi_deps = \ 58 vapi_deps = \
62 IBus-1.0.metadata \ 59 IBus-1.0.metadata \
63 IBus-1.0-custom.vala \
64 $(top_builddir)/src/IBus-1.0.gir \ 60 $(top_builddir)/src/IBus-1.0.gir \
65 $(NULL) 61 $(NULL)
66 62
67 ibus-1.0.vapi: $(vapi_deps) 63 ibus-1.0.vapi: $(vapi_deps)
68 64
69 ibus_vapi = ibus-1.0.vapi 65 ibus_vapi = ibus-1.0.vapi
70 VAPIGEN_VAPIS = $(ibus_vapi) 66 VAPIGEN_VAPIS = $(ibus_vapi)
71 67
72 ibus_1_0_vapi_DEPS = gio-2.0 68 ibus_1_0_vapi_DEPS = gio-2.0
73 ibus_1_0_vapi_METADATADIRS = $(srcdir) 69 ibus_1_0_vapi_METADATADIRS = $(srcdir)
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 @GTK3_LIBS@ \ 120 @GTK3_LIBS@ \
125 @X11_LIBS@ \ 121 @X11_LIBS@ \
126 -lXi \ 122 -lXi \
127 $(libibus) \ 123 $(libibus) \
128 $(NULL) 124 $(NULL)
129 libibus_emoji_dialog_1_0_la_LDFLAGS = \ 125 libibus_emoji_dialog_1_0_la_LDFLAGS = \
130 -no-undefined \ 126 -no-undefined \
131 -export-symbols-regex "ibus_.*" \ 127 -export-symbols-regex "ibus_.*" \
132 $(NULL) 128 $(NULL)
133 129
134 $(libibus_emoji_dialog_1_0_la_SOURCES): $(ibus_vapi) 130 # per file setting is needed to avoid conflicting LN_S by calling
135 » for src in $(libibus_emoji_dialog_1_0_la_SOURCES) ; do \ 131 # duplicated times in parallel make
136 » $(RM) -f $$src; \ 132 %.vala: $(ibus_vapi)
137 » $(LN_S) $(top_srcdir)/ui/gtk3/$$src .; \ 133 » if test ! -f $@ ; then \
138 » done; 134 » $(LN_S) $(top_srcdir)/ui/gtk3/$@ .; \
139 $(libibus_fontset_1_0_la_SOURCES): $(ibus_vapi) 135 » fi;
140 » for src in $(libibus_fontset_1_0_la_SOURCES) ; do \ 136 ibusfontset.c: $(ibus_vapi)
141 » $(RM) -f $$src; \ 137 » if test ! -f $@ ; then \
142 » $(LN_S) $(top_srcdir)/ui/gtk3/$$src .; \ 138 » $(LN_S) $(top_srcdir)/ui/gtk3/$@ .; \
143 » done; \ 139 » fi;
144 » for src in $(IBusFontSet_1_0_gir_FILES) ; do \ 140 ibusfontset.h: $(ibus_vapi)
145 » $(RM) -f $$src; \ 141 » if test ! -f $@ ; then \
146 » $(LN_S) $(top_srcdir)/ui/gtk3/$$src .; \ 142 » $(LN_S) $(top_srcdir)/ui/gtk3/$@ .; \
147 » done; 143 » fi;
144
145
146 MAINTAINERCLEANFILES += $(libibus_emoji_dialog_1_0_la_SOURCES)
147 DISTCLEANFILES += $(libibus_emoji_dialog_1_0_la_SOURCES)
148 148
149 if HAVE_INTROSPECTION 149 if HAVE_INTROSPECTION
150 -include $(INTROSPECTION_MAKEFILE) 150 -include $(INTROSPECTION_MAKEFILE)
151 INTROSPECTION_SCANNER_ARGS = 151 INTROSPECTION_SCANNER_ARGS =
152 INTROSPECTION_COMPILER_ARGS = \ 152 INTROSPECTION_COMPILER_ARGS = \
153 --includedir=$(srcdir) \ 153 --includedir=$(srcdir) \
154 --includedir=. \ 154 --includedir=. \
155 --includedir=$(top_srcdir)/src \ 155 --includedir=$(top_srcdir)/src \
156 $(NULL) 156 $(NULL)
157 157
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 @FONTCONFIG_LIBS@ \ 217 @FONTCONFIG_LIBS@ \
218 @GLIB2_LIBS@ \ 218 @GLIB2_LIBS@ \
219 @HARFBUZZ_LIBS@ \ 219 @HARFBUZZ_LIBS@ \
220 @PANGO_LIBS@ \ 220 @PANGO_LIBS@ \
221 $(NULL) 221 $(NULL)
222 libibus_fontset_1_0_la_LDFLAGS = \ 222 libibus_fontset_1_0_la_LDFLAGS = \
223 -no-undefined \ 223 -no-undefined \
224 -export-symbols-regex "ibus_.*" \ 224 -export-symbols-regex "ibus_.*" \
225 $(NULL) 225 $(NULL)
226 226
227 MAINTAINERCLEANFILES += ibusfontset.c ibusfontset.h
228 DISTCLEANFILES += ibusfontset.c ibusfontset.h
229
227 if HAVE_INTROSPECTION 230 if HAVE_INTROSPECTION
228 IBusFontSet-1.0.gir: $(libibus_fontset) Makefile 231 IBusFontSet-1.0.gir: $(libibus_fontset) Makefile
229 IBusFontSet_1_0_gir_SCANNERFLAGS = \ 232 IBusFontSet_1_0_gir_SCANNERFLAGS = \
230 --pkg-export=ibus-1.0 \ 233 --pkg-export=ibus-1.0 \
231 --pkg=cairo \ 234 --pkg=cairo \
232 --pkg=fontconfig \ 235 --pkg=fontconfig \
233 --pkg=harfbuzz \ 236 --pkg=harfbuzz \
234 $(IBUS_GIR_SCANNERFLAGS) \ 237 $(IBUS_GIR_SCANNERFLAGS) \
235 $(NULL) 238 $(NULL)
236 IBusFontSet_1_0_gir_LIBS = $(libibus_fontset) $(libibus) 239 IBusFontSet_1_0_gir_LIBS = $(libibus_fontset) $(libibus)
(...skipping 24 matching lines...) Expand all
261 DISTCLEANFILES += $(ibus_fontset_vapi) 264 DISTCLEANFILES += $(ibus_fontset_vapi)
262 265
263 endif 266 endif
264 # end of HAVE_INTROSPECTION 267 # end of HAVE_INTROSPECTION
265 endif 268 endif
266 # end of ENABLE_HARFBUZZ_FOR_EMOJI 269 # end of ENABLE_HARFBUZZ_FOR_EMOJI
267 endif 270 endif
268 # end of ENABLE_EMOJI_DICT 271 # end of ENABLE_EMOJI_DICT
269 272
270 -include $(top_srcdir)/git.mk 273 -include $(top_srcdir)/git.mk
LEFTRIGHT

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b