Merge lp:~indicator-applet-developers/ubuntu/precise/indicator-session/upstream into lp:~ubuntu-desktop/indicator-session/ubuntu
- Precise (12.04)
- upstream
- Merge into ubuntu
Proposed by
Charles Kerr
Status: | Merged |
---|---|
Merged at revision: | 196 |
Proposed branch: | lp:~indicator-applet-developers/ubuntu/precise/indicator-session/upstream |
Merge into: | lp:~ubuntu-desktop/indicator-session/ubuntu |
Diff against target: |
2140 lines (+775/-189) 37 files modified
AUTHORS (+1/-0) ChangeLog (+36/-0) Makefile.am (+2/-0) Makefile.am.coverage (+48/-0) Makefile.in (+59/-11) configure (+312/-11) configure.ac (+19/-6) data/Makefile.am (+0/-27) data/Makefile.in (+28/-64) data/extra-sessions/Makefile.in (+8/-1) data/icons/16x16/Makefile.in (+8/-1) data/icons/16x16/actions/Makefile.in (+8/-1) data/icons/16x16/status/Makefile.in (+8/-1) data/icons/22x22/Makefile.in (+8/-1) data/icons/22x22/actions/Makefile.in (+8/-1) data/icons/22x22/status/Makefile.in (+8/-1) data/icons/24x24/Makefile.in (+8/-1) data/icons/24x24/actions/Makefile.in (+8/-1) data/icons/24x24/status/Makefile.in (+8/-1) data/icons/32x32/Makefile.in (+8/-1) data/icons/32x32/actions/Makefile.in (+8/-1) data/icons/32x32/status/Makefile.in (+8/-1) data/icons/Makefile.in (+8/-1) data/icons/scalable/Makefile.in (+8/-1) data/icons/scalable/actions/Makefile.in (+8/-1) data/icons/scalable/status/Makefile.in (+8/-1) data/indicator-session-lock-screen.desktop.in.in (+0/-10) data/indicator-session-logout.desktop.in.in (+0/-10) data/indicator-session-restart.desktop.in.in (+0/-10) data/indicator-session-shutdown.desktop.in.in (+0/-10) debian/changelog (+8/-0) m4/gcov.m4 (+86/-0) po/POTFILES.in (+0/-4) src/Makefile.am (+12/-2) src/Makefile.in (+26/-7) src/gtk-logout-helper.c (+1/-0) src/session-service.c (+1/-0) |
To merge this branch: | bzr merge lp:~indicator-applet-developers/ubuntu/precise/indicator-session/upstream |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ken VanDine | Pending | ||
Review via email: mp+101014@code.launchpad.net |
Commit message
Description of the change
indicator-session 0.3.96
* Remove desktop files so they don't appear in the dash. (LP: #973181)
* Add gcov to the build for coverage statistics
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'AUTHORS' |
2 | --- AUTHORS 2012-03-14 18:34:16 +0000 |
3 | +++ AUTHORS 2012-04-05 17:54:28 +0000 |
4 | @@ -2,6 +2,7 @@ |
5 | |
6 | Alberto Mardegan |
7 | Alexander Sack |
8 | + Allan LeSage |
9 | Charles Kerr |
10 | Christoph Korn |
11 | Cody Russell |
12 | |
13 | === modified file 'ChangeLog' |
14 | --- ChangeLog 2012-03-21 17:24:44 +0000 |
15 | +++ ChangeLog 2012-04-05 17:54:28 +0000 |
16 | @@ -1,5 +1,41 @@ |
17 | # Generated by Makefile. Do not edit. |
18 | |
19 | +2012-04-05 Charles Kerr <charles.kerr@canonical.com> |
20 | + |
21 | + 0.3.96 |
22 | + |
23 | +2012-04-04 Charles Kerr <charles.kerr@canonical.com> |
24 | + |
25 | + merge lp:~ted/indicator-session/no-system-desktop-files to remove the desktop files so they don't appear in the dash. |
26 | + |
27 | +2012-04-04 Ted Gould <ted@gould.cx> |
28 | + |
29 | + Attaching bug |
30 | + |
31 | +2012-04-04 Ted Gould <ted@gould.cx> |
32 | + |
33 | + Dropping the desktop files from translations |
34 | + |
35 | +2012-04-04 Ted Gould <ted@gould.cx> |
36 | + |
37 | + Dropping the desktop files from the build |
38 | + |
39 | +2012-03-29 Charles Kerr <charles.kerr@canonical.com> |
40 | + |
41 | + merge lp:~allanlesage/indicator-session/TDD to add gcov to the build for coverage statitistics |
42 | + |
43 | +2012-03-29 Allan LeSage <allanlesage@gmail.com> |
44 | + |
45 | + Advised changes to fix implicit declarations. |
46 | + |
47 | +2012-03-28 Allan LeSage <allanlesage@gmail.com> |
48 | + |
49 | + Merged from trunk. |
50 | + |
51 | +2012-03-27 Allan LeSage <allanlesage@gmail.com> |
52 | + |
53 | + Added gcov coverage tooling. |
54 | + |
55 | 2012-03-21 Charles Kerr <charles.kerr@canonical.com> |
56 | |
57 | 0.3.95 |
58 | |
59 | === modified file 'Makefile.am' |
60 | --- Makefile.am 2011-08-31 18:38:17 +0000 |
61 | +++ Makefile.am 2012-04-05 17:54:28 +0000 |
62 | @@ -72,3 +72,5 @@ |
63 | @chmod +x $@ |
64 | |
65 | CLEANFILES = $(TESTS) |
66 | + |
67 | +include $(top_srcdir)/Makefile.am.coverage |
68 | |
69 | === added file 'Makefile.am.coverage' |
70 | --- Makefile.am.coverage 1970-01-01 00:00:00 +0000 |
71 | +++ Makefile.am.coverage 2012-04-05 17:54:28 +0000 |
72 | @@ -0,0 +1,48 @@ |
73 | + |
74 | +# Coverage targets |
75 | + |
76 | +.PHONY: clean-gcno clean-gcda \ |
77 | + coverage-html generate-coverage-html clean-coverage-html \ |
78 | + coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr |
79 | + |
80 | +clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr |
81 | + |
82 | +if HAVE_GCOV |
83 | + |
84 | +clean-gcno: |
85 | + @echo Removing old coverage instrumentation |
86 | + -find -name '*.gcno' -print | xargs -r rm |
87 | + |
88 | +clean-gcda: |
89 | + @echo Removing old coverage results |
90 | + -find -name '*.gcda' -print | xargs -r rm |
91 | + |
92 | +coverage-html: clean-gcda |
93 | + -$(MAKE) $(AM_MAKEFLAGS) -k check |
94 | + $(MAKE) $(AM_MAKEFLAGS) generate-coverage-html |
95 | + |
96 | +generate-coverage-html: |
97 | + @echo Collecting coverage data |
98 | + $(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool |
99 | + LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info |
100 | + |
101 | +clean-coverage-html: clean-gcda |
102 | + -$(LCOV) --directory $(top_builddir) -z |
103 | + -rm -rf coverage.info coveragereport |
104 | + |
105 | +if HAVE_GCOVR |
106 | + |
107 | +coverage-gcovr: clean-gcda |
108 | + -$(MAKE) $(AM_MAKEFLAGS) -k check |
109 | + $(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr |
110 | + |
111 | +generate-coverage-gcovr: |
112 | + @echo Generating coverage GCOVR report |
113 | + $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml |
114 | + |
115 | +clean-coverage-gcovr: clean-gcda |
116 | + -rm -rf $(top_builddir)/coverage.xml |
117 | + |
118 | +endif # HAVE_GCOVR |
119 | + |
120 | +endif # HAVE_GCOV |
121 | |
122 | === modified file 'Makefile.in' |
123 | --- Makefile.in 2012-03-14 18:34:16 +0000 |
124 | +++ Makefile.in 2012-04-05 17:54:28 +0000 |
125 | @@ -14,6 +14,8 @@ |
126 | # PARTICULAR PURPOSE. |
127 | |
128 | @SET_MAKE@ |
129 | + |
130 | +# Coverage targets |
131 | VPATH = @srcdir@ |
132 | pkgdatadir = $(datadir)/@PACKAGE@ |
133 | pkgincludedir = $(includedir)/@PACKAGE@ |
134 | @@ -33,17 +35,18 @@ |
135 | POST_UNINSTALL = : |
136 | build_triplet = @build@ |
137 | host_triplet = @host@ |
138 | -subdir = . |
139 | DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ |
140 | $(srcdir)/Makefile.in $(srcdir)/config.h.in \ |
141 | - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ |
142 | - compile config.guess config.sub depcomp install-sh ltmain.sh \ |
143 | - missing mkinstalldirs |
144 | + $(top_srcdir)/Makefile.am.coverage $(top_srcdir)/configure \ |
145 | + AUTHORS COPYING ChangeLog INSTALL NEWS compile config.guess \ |
146 | + config.sub depcomp install-sh ltmain.sh missing mkinstalldirs |
147 | +subdir = . |
148 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
149 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
150 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
151 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
152 | - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac |
153 | + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
154 | + $(top_srcdir)/configure.ac |
155 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
156 | $(ACLOCAL_M4) |
157 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
158 | @@ -133,6 +136,8 @@ |
159 | CC = @CC@ |
160 | CCDEPMODE = @CCDEPMODE@ |
161 | CFLAGS = @CFLAGS@ |
162 | +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
163 | +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
164 | CPP = @CPP@ |
165 | CPPFLAGS = @CPPFLAGS@ |
166 | CYGPATH_W = @CYGPATH_W@ |
167 | @@ -149,6 +154,8 @@ |
168 | EGREP = @EGREP@ |
169 | EXEEXT = @EXEEXT@ |
170 | FGREP = @FGREP@ |
171 | +GCOVR = @GCOVR@ |
172 | +GENHTML = @GENHTML@ |
173 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
174 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
175 | GMOFILES = @GMOFILES@ |
176 | @@ -177,6 +184,7 @@ |
177 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
178 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
179 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
180 | +LCOV = @LCOV@ |
181 | LD = @LD@ |
182 | LDFLAGS = @LDFLAGS@ |
183 | LIBOBJS = @LIBOBJS@ |
184 | @@ -222,6 +230,7 @@ |
185 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
186 | SET_MAKE = @SET_MAKE@ |
187 | SHELL = @SHELL@ |
188 | +SHTOOL = @SHTOOL@ |
189 | STRIP = @STRIP@ |
190 | USE_NLS = @USE_NLS@ |
191 | VERSION = @VERSION@ |
192 | @@ -300,7 +309,7 @@ |
193 | .SUFFIXES: |
194 | am--refresh: Makefile |
195 | @: |
196 | -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
197 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.coverage $(am__configure_deps) |
198 | @for dep in $?; do \ |
199 | case '$(am__configure_deps)' in \ |
200 | *$$dep*) \ |
201 | @@ -323,6 +332,7 @@ |
202 | echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ |
203 | cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ |
204 | esac; |
205 | +$(top_srcdir)/Makefile.am.coverage: |
206 | |
207 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
208 | $(SHELL) ./config.status --recheck |
209 | @@ -817,7 +827,7 @@ |
210 | @echo "it deletes files that may require special tools to rebuild." |
211 | clean: clean-recursive |
212 | |
213 | -clean-am: clean-generic clean-libtool mostlyclean-am |
214 | +clean-am: clean-generic clean-libtool clean-local mostlyclean-am |
215 | |
216 | distclean: distclean-recursive |
217 | -rm -f $(am__CONFIG_DISTCLEAN_FILES) |
218 | @@ -890,10 +900,10 @@ |
219 | |
220 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
221 | all all-am am--refresh check check-TESTS check-am clean \ |
222 | - clean-generic clean-libtool ctags ctags-recursive dist \ |
223 | - dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-lzma \ |
224 | - dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ |
225 | - distclean-generic distclean-hdr distclean-libtool \ |
226 | + clean-generic clean-libtool clean-local ctags ctags-recursive \ |
227 | + dist dist-all dist-bzip2 dist-gzip dist-hook dist-lzip \ |
228 | + dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \ |
229 | + distclean distclean-generic distclean-hdr distclean-libtool \ |
230 | distclean-tags distcleancheck distdir distuninstallcheck dvi \ |
231 | dvi-am html html-am info info-am install install-am \ |
232 | install-data install-data-am install-dvi install-dvi-am \ |
233 | @@ -964,6 +974,44 @@ |
234 | @echo "exit 0" >> $@ |
235 | @chmod +x $@ |
236 | |
237 | +.PHONY: clean-gcno clean-gcda \ |
238 | + coverage-html generate-coverage-html clean-coverage-html \ |
239 | + coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr |
240 | + |
241 | +clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr |
242 | + |
243 | +@HAVE_GCOV_TRUE@clean-gcno: |
244 | +@HAVE_GCOV_TRUE@ @echo Removing old coverage instrumentation |
245 | +@HAVE_GCOV_TRUE@ -find -name '*.gcno' -print | xargs -r rm |
246 | + |
247 | +@HAVE_GCOV_TRUE@clean-gcda: |
248 | +@HAVE_GCOV_TRUE@ @echo Removing old coverage results |
249 | +@HAVE_GCOV_TRUE@ -find -name '*.gcda' -print | xargs -r rm |
250 | + |
251 | +@HAVE_GCOV_TRUE@coverage-html: clean-gcda |
252 | +@HAVE_GCOV_TRUE@ -$(MAKE) $(AM_MAKEFLAGS) -k check |
253 | +@HAVE_GCOV_TRUE@ $(MAKE) $(AM_MAKEFLAGS) generate-coverage-html |
254 | + |
255 | +@HAVE_GCOV_TRUE@generate-coverage-html: |
256 | +@HAVE_GCOV_TRUE@ @echo Collecting coverage data |
257 | +@HAVE_GCOV_TRUE@ $(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool |
258 | +@HAVE_GCOV_TRUE@ LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info |
259 | + |
260 | +@HAVE_GCOV_TRUE@clean-coverage-html: clean-gcda |
261 | +@HAVE_GCOV_TRUE@ -$(LCOV) --directory $(top_builddir) -z |
262 | +@HAVE_GCOV_TRUE@ -rm -rf coverage.info coveragereport |
263 | + |
264 | +@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@coverage-gcovr: clean-gcda |
265 | +@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ -$(MAKE) $(AM_MAKEFLAGS) -k check |
266 | +@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ $(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr |
267 | + |
268 | +@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@generate-coverage-gcovr: |
269 | +@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ @echo Generating coverage GCOVR report |
270 | +@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml |
271 | + |
272 | +@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@clean-coverage-gcovr: clean-gcda |
273 | +@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ -rm -rf $(top_builddir)/coverage.xml |
274 | + |
275 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
276 | # Otherwise a system limit (for SysV at least) may be exceeded. |
277 | .NOEXPORT: |
278 | |
279 | === modified file 'configure' |
280 | --- configure 2012-03-21 17:24:44 +0000 |
281 | +++ configure 2012-04-05 17:54:28 +0000 |
282 | @@ -615,6 +615,18 @@ |
283 | LIBOBJS |
284 | HAS_GUDEV_FALSE |
285 | HAS_GUDEV_TRUE |
286 | +COVERAGE_LDFLAGS |
287 | +COVERAGE_CFLAGS |
288 | +HAVE_GCOVR_FALSE |
289 | +HAVE_GCOVR_TRUE |
290 | +HAVE_LCOV_FALSE |
291 | +HAVE_LCOV_TRUE |
292 | +HAVE_GCOV_FALSE |
293 | +HAVE_GCOV_TRUE |
294 | +GCOVR |
295 | +GENHTML |
296 | +LCOV |
297 | +SHTOOL |
298 | MKINSTALLDIRS |
299 | POSUB |
300 | POFILES |
301 | @@ -824,6 +836,7 @@ |
302 | enable_gtklogouthelper |
303 | enable_apt |
304 | enable_localinstall |
305 | +enable_gcov |
306 | ' |
307 | ac_precious_vars='build_alias |
308 | host_alias |
309 | @@ -1482,6 +1495,7 @@ |
310 | --disable-apt disable APT support |
311 | --enable-localinstall install all of the files localy instead of system |
312 | directories (for distcheck) |
313 | + --enable-gcov enable coverage testing with gcov |
314 | |
315 | Optional Packages: |
316 | --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] |
317 | @@ -2774,7 +2788,7 @@ |
318 | |
319 | # Define the identity of the package. |
320 | PACKAGE=indicator-session |
321 | - VERSION=0.3.95 |
322 | + VERSION=0.3.96 |
323 | |
324 | |
325 | cat >>confdefs.h <<_ACEOF |
326 | @@ -14758,6 +14772,279 @@ |
327 | |
328 | |
329 | ########################### |
330 | +# gcov coverage reporting |
331 | +########################### |
332 | + |
333 | +# Checks for existence of coverage tools: |
334 | +# * gcov |
335 | +# * lcov |
336 | +# * genhtml |
337 | +# * gcovr |
338 | +# |
339 | +# Sets ac_cv_check_gcov to yes if tooling is present |
340 | +# and reports the executables to the variables LCOV, GCOVR and GENHTML. |
341 | + # AC_TDD_GCOV |
342 | + |
343 | + |
344 | + # Check whether --enable-gcov was given. |
345 | +if test "${enable_gcov+set}" = set; then : |
346 | + enableval=$enable_gcov; use_gcov=$enableval |
347 | +else |
348 | + use_gcov=no |
349 | +fi |
350 | + |
351 | + |
352 | + if test "x$use_gcov" = "xyes"; then |
353 | + # we need gcc: |
354 | + if test "$GCC" != "yes"; then |
355 | + as_fn_error $? "GCC is required for --enable-gcov" "$LINENO" 5 |
356 | + fi |
357 | + |
358 | + # Check if ccache is being used |
359 | + # Extract the first word of "shtool", so it can be a program name with args. |
360 | +set dummy shtool; ac_word=$2 |
361 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
362 | +$as_echo_n "checking for $ac_word... " >&6; } |
363 | +if ${ac_cv_prog_SHTOOL+:} false; then : |
364 | + $as_echo_n "(cached) " >&6 |
365 | +else |
366 | + if test -n "$SHTOOL"; then |
367 | + ac_cv_prog_SHTOOL="$SHTOOL" # Let the user override the test. |
368 | +else |
369 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
370 | +for as_dir in $PATH |
371 | +do |
372 | + IFS=$as_save_IFS |
373 | + test -z "$as_dir" && as_dir=. |
374 | + for ac_exec_ext in '' $ac_executable_extensions; do |
375 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
376 | + ac_cv_prog_SHTOOL="shtool" |
377 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
378 | + break 2 |
379 | + fi |
380 | +done |
381 | + done |
382 | +IFS=$as_save_IFS |
383 | + |
384 | +fi |
385 | +fi |
386 | +SHTOOL=$ac_cv_prog_SHTOOL |
387 | +if test -n "$SHTOOL"; then |
388 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHTOOL" >&5 |
389 | +$as_echo "$SHTOOL" >&6; } |
390 | +else |
391 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
392 | +$as_echo "no" >&6; } |
393 | +fi |
394 | + |
395 | + |
396 | + case `$SHTOOL path $CC` in |
397 | + *ccache*) gcc_ccache=yes;; |
398 | + *) gcc_ccache=no;; |
399 | + esac |
400 | + |
401 | + if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then |
402 | + as_fn_error $? "ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1." "$LINENO" 5 |
403 | + fi |
404 | + |
405 | + lcov_version_list="1.6 1.7 1.8 1.9" |
406 | + # Extract the first word of "lcov", so it can be a program name with args. |
407 | +set dummy lcov; ac_word=$2 |
408 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
409 | +$as_echo_n "checking for $ac_word... " >&6; } |
410 | +if ${ac_cv_prog_LCOV+:} false; then : |
411 | + $as_echo_n "(cached) " >&6 |
412 | +else |
413 | + if test -n "$LCOV"; then |
414 | + ac_cv_prog_LCOV="$LCOV" # Let the user override the test. |
415 | +else |
416 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
417 | +for as_dir in $PATH |
418 | +do |
419 | + IFS=$as_save_IFS |
420 | + test -z "$as_dir" && as_dir=. |
421 | + for ac_exec_ext in '' $ac_executable_extensions; do |
422 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
423 | + ac_cv_prog_LCOV="lcov" |
424 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
425 | + break 2 |
426 | + fi |
427 | +done |
428 | + done |
429 | +IFS=$as_save_IFS |
430 | + |
431 | +fi |
432 | +fi |
433 | +LCOV=$ac_cv_prog_LCOV |
434 | +if test -n "$LCOV"; then |
435 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCOV" >&5 |
436 | +$as_echo "$LCOV" >&6; } |
437 | +else |
438 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
439 | +$as_echo "no" >&6; } |
440 | +fi |
441 | + |
442 | + |
443 | + # Extract the first word of "genhtml", so it can be a program name with args. |
444 | +set dummy genhtml; ac_word=$2 |
445 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
446 | +$as_echo_n "checking for $ac_word... " >&6; } |
447 | +if ${ac_cv_prog_GENHTML+:} false; then : |
448 | + $as_echo_n "(cached) " >&6 |
449 | +else |
450 | + if test -n "$GENHTML"; then |
451 | + ac_cv_prog_GENHTML="$GENHTML" # Let the user override the test. |
452 | +else |
453 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
454 | +for as_dir in $PATH |
455 | +do |
456 | + IFS=$as_save_IFS |
457 | + test -z "$as_dir" && as_dir=. |
458 | + for ac_exec_ext in '' $ac_executable_extensions; do |
459 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
460 | + ac_cv_prog_GENHTML="genhtml" |
461 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
462 | + break 2 |
463 | + fi |
464 | +done |
465 | + done |
466 | +IFS=$as_save_IFS |
467 | + |
468 | +fi |
469 | +fi |
470 | +GENHTML=$ac_cv_prog_GENHTML |
471 | +if test -n "$GENHTML"; then |
472 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GENHTML" >&5 |
473 | +$as_echo "$GENHTML" >&6; } |
474 | +else |
475 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
476 | +$as_echo "no" >&6; } |
477 | +fi |
478 | + |
479 | + |
480 | + |
481 | + if test "$LCOV"; then |
482 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lcov version" >&5 |
483 | +$as_echo_n "checking for lcov version... " >&6; } |
484 | +if ${glib_cv_lcov_version+:} false; then : |
485 | + $as_echo_n "(cached) " >&6 |
486 | +else |
487 | + |
488 | + glib_cv_lcov_version=invalid |
489 | + lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'` |
490 | + for lcov_check_version in $lcov_version_list; do |
491 | + if test "$lcov_version" = "$lcov_check_version"; then |
492 | + glib_cv_lcov_version="$lcov_check_version (ok)" |
493 | + fi |
494 | + done |
495 | + |
496 | +fi |
497 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $glib_cv_lcov_version" >&5 |
498 | +$as_echo "$glib_cv_lcov_version" >&6; } |
499 | + else |
500 | + lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list" |
501 | + as_fn_error $? "$lcov_msg" "$LINENO" 5 |
502 | + fi |
503 | + |
504 | + case $glib_cv_lcov_version in |
505 | + ""|invalid) |
506 | + lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)." |
507 | + as_fn_error $? "$lcov_msg" "$LINENO" 5 |
508 | + LCOV="exit 0;" |
509 | + ;; |
510 | + esac |
511 | + |
512 | + if test -z "$GENHTML"; then |
513 | + as_fn_error $? "Could not find genhtml from the lcov package" "$LINENO" 5 |
514 | + fi |
515 | + |
516 | + ac_cv_check_gcov=yes |
517 | + ac_cv_check_lcov=yes |
518 | + |
519 | + # Remove all optimization flags from CFLAGS |
520 | + |
521 | + CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'` |
522 | + |
523 | + |
524 | + # Add the special gcc flags |
525 | + COVERAGE_CFLAGS="-O0 -fprofile-arcs -ftest-coverage" |
526 | + COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage" |
527 | + COVERAGE_LDFLAGS="-lgcov" |
528 | + |
529 | + # Check availability of gcovr |
530 | + # Extract the first word of "gcovr", so it can be a program name with args. |
531 | +set dummy gcovr; ac_word=$2 |
532 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
533 | +$as_echo_n "checking for $ac_word... " >&6; } |
534 | +if ${ac_cv_prog_GCOVR+:} false; then : |
535 | + $as_echo_n "(cached) " >&6 |
536 | +else |
537 | + if test -n "$GCOVR"; then |
538 | + ac_cv_prog_GCOVR="$GCOVR" # Let the user override the test. |
539 | +else |
540 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
541 | +for as_dir in $PATH |
542 | +do |
543 | + IFS=$as_save_IFS |
544 | + test -z "$as_dir" && as_dir=. |
545 | + for ac_exec_ext in '' $ac_executable_extensions; do |
546 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
547 | + ac_cv_prog_GCOVR="gcovr" |
548 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
549 | + break 2 |
550 | + fi |
551 | +done |
552 | + done |
553 | +IFS=$as_save_IFS |
554 | + |
555 | +fi |
556 | +fi |
557 | +GCOVR=$ac_cv_prog_GCOVR |
558 | +if test -n "$GCOVR"; then |
559 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCOVR" >&5 |
560 | +$as_echo "$GCOVR" >&6; } |
561 | +else |
562 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
563 | +$as_echo "no" >&6; } |
564 | +fi |
565 | + |
566 | + |
567 | + if test -z "$GCOVR"; then |
568 | + ac_cv_check_gcovr=no |
569 | + else |
570 | + ac_cv_check_gcovr=yes |
571 | + fi |
572 | + |
573 | +fi |
574 | + |
575 | + if test "x$ac_cv_check_gcov" = xyes; then |
576 | + HAVE_GCOV_TRUE= |
577 | + HAVE_GCOV_FALSE='#' |
578 | +else |
579 | + HAVE_GCOV_TRUE='#' |
580 | + HAVE_GCOV_FALSE= |
581 | +fi |
582 | + |
583 | + if test "x$ac_cv_check_lcov" = xyes; then |
584 | + HAVE_LCOV_TRUE= |
585 | + HAVE_LCOV_FALSE='#' |
586 | +else |
587 | + HAVE_LCOV_TRUE='#' |
588 | + HAVE_LCOV_FALSE= |
589 | +fi |
590 | + |
591 | + if test "x$ac_cv_check_gcovr" = xyes; then |
592 | + HAVE_GCOVR_TRUE= |
593 | + HAVE_GCOVR_FALSE='#' |
594 | +else |
595 | + HAVE_GCOVR_TRUE='#' |
596 | + HAVE_GCOVR_FALSE= |
597 | +fi |
598 | + |
599 | + |
600 | + |
601 | + |
602 | +########################### |
603 | # Files |
604 | ########################### |
605 | |
606 | @@ -14922,6 +15209,18 @@ |
607 | as_fn_error $? "conditional \"BUILD_APT\" was never defined. |
608 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
609 | fi |
610 | +if test -z "${HAVE_GCOV_TRUE}" && test -z "${HAVE_GCOV_FALSE}"; then |
611 | + as_fn_error $? "conditional \"HAVE_GCOV\" was never defined. |
612 | +Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
613 | +fi |
614 | +if test -z "${HAVE_LCOV_TRUE}" && test -z "${HAVE_LCOV_FALSE}"; then |
615 | + as_fn_error $? "conditional \"HAVE_LCOV\" was never defined. |
616 | +Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
617 | +fi |
618 | +if test -z "${HAVE_GCOVR_TRUE}" && test -z "${HAVE_GCOVR_FALSE}"; then |
619 | + as_fn_error $? "conditional \"HAVE_GCOVR\" was never defined. |
620 | +Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
621 | +fi |
622 | if test -z "${HAS_GUDEV_TRUE}" && test -z "${HAS_GUDEV_FALSE}"; then |
623 | as_fn_error $? "conditional \"HAS_GUDEV\" was never defined. |
624 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
625 | @@ -17224,19 +17523,21 @@ |
626 | |
627 | SUS Indicator Configuration: |
628 | |
629 | - Prefix: $prefix |
630 | - Indicator Dir: $INDICATORDIR |
631 | - Indicator GTK: $with_gtk |
632 | - Logout Helper: $have_gtklogouthelper |
633 | - APT support: $enable_apt |
634 | + Prefix: $prefix |
635 | + Indicator Dir: $INDICATORDIR |
636 | + Indicator GTK: $with_gtk |
637 | + Logout Helper: $have_gtklogouthelper |
638 | + APT support: $enable_apt |
639 | + Coverage reporting: $use_gcov |
640 | " >&5 |
641 | $as_echo "$as_me: |
642 | |
643 | SUS Indicator Configuration: |
644 | |
645 | - Prefix: $prefix |
646 | - Indicator Dir: $INDICATORDIR |
647 | - Indicator GTK: $with_gtk |
648 | - Logout Helper: $have_gtklogouthelper |
649 | - APT support: $enable_apt |
650 | + Prefix: $prefix |
651 | + Indicator Dir: $INDICATORDIR |
652 | + Indicator GTK: $with_gtk |
653 | + Logout Helper: $have_gtklogouthelper |
654 | + APT support: $enable_apt |
655 | + Coverage reporting: $use_gcov |
656 | " >&6;} |
657 | |
658 | === modified file 'configure.ac' |
659 | --- configure.ac 2012-03-21 17:26:42 +0000 |
660 | +++ configure.ac 2012-04-05 17:54:28 +0000 |
661 | @@ -4,7 +4,7 @@ |
662 | AC_PREREQ(2.53) |
663 | |
664 | AM_CONFIG_HEADER(config.h) |
665 | -AM_INIT_AUTOMAKE(indicator-session, 0.3.95) |
666 | +AM_INIT_AUTOMAKE(indicator-session, 0.3.96) |
667 | |
668 | AM_MAINTAINER_MODE |
669 | |
670 | @@ -198,6 +198,18 @@ |
671 | AM_GLIB_GNU_GETTEXT |
672 | |
673 | ########################### |
674 | +# gcov coverage reporting |
675 | +########################### |
676 | + |
677 | +m4_include([m4/gcov.m4]) |
678 | +AC_TDD_GCOV |
679 | +AM_CONDITIONAL([HAVE_GCOV], [test "x$ac_cv_check_gcov" = xyes]) |
680 | +AM_CONDITIONAL([HAVE_LCOV], [test "x$ac_cv_check_lcov" = xyes]) |
681 | +AM_CONDITIONAL([HAVE_GCOVR], [test "x$ac_cv_check_gcovr" = xyes]) |
682 | +AC_SUBST(COVERAGE_CFLAGS) |
683 | +AC_SUBST(COVERAGE_LDFLAGS) |
684 | + |
685 | +########################### |
686 | # Files |
687 | ########################### |
688 | |
689 | @@ -237,9 +249,10 @@ |
690 | |
691 | SUS Indicator Configuration: |
692 | |
693 | - Prefix: $prefix |
694 | - Indicator Dir: $INDICATORDIR |
695 | - Indicator GTK: $with_gtk |
696 | - Logout Helper: $have_gtklogouthelper |
697 | - APT support: $enable_apt |
698 | + Prefix: $prefix |
699 | + Indicator Dir: $INDICATORDIR |
700 | + Indicator GTK: $with_gtk |
701 | + Logout Helper: $have_gtklogouthelper |
702 | + APT support: $enable_apt |
703 | + Coverage reporting: $use_gcov |
704 | ]) |
705 | |
706 | === modified file 'data/Makefile.am' |
707 | --- data/Makefile.am 2011-11-23 21:58:41 +0000 |
708 | +++ data/Makefile.am 2012-04-05 17:54:28 +0000 |
709 | @@ -25,30 +25,3 @@ |
710 | CLEANFILES = \ |
711 | $(dbus_services_DATA) \ |
712 | $(gsettings_SCHEMAS) |
713 | - |
714 | -if BUILD_GTKLOGOUTHELPER |
715 | -@INTLTOOL_DESKTOP_RULE@ |
716 | - |
717 | -%.desktop.in: %.desktop.in.in |
718 | - sed \ |
719 | - -e "s|\@libexecdir\@|$(libexecdir)|" \ |
720 | - -e "s|\@bindir\@|$(bindir)|" \ |
721 | - $< > $@ |
722 | - |
723 | -logout_helper_desktop_in_in_files = \ |
724 | - indicator-session-lock-screen.desktop.in.in \ |
725 | - indicator-session-logout.desktop.in.in \ |
726 | - indicator-session-restart.desktop.in.in \ |
727 | - indicator-session-shutdown.desktop.in.in |
728 | - |
729 | -logout_helperdir = $(datadir)/applications |
730 | -logout_helper_desktop_files = \ |
731 | - $(logout_helper_desktop_in_in_files:.desktop.in.in=.desktop) |
732 | -logout_helper_DATA = $(logout_helper_desktop_files) |
733 | - |
734 | -EXTRA_DIST += \ |
735 | - $(logout_helper_desktop_in_in_files) |
736 | - |
737 | -CLEANFILES += \ |
738 | - $(logout_helper_desktop_files) |
739 | -endif |
740 | |
741 | === modified file 'data/Makefile.in' |
742 | --- data/Makefile.in 2012-03-14 18:34:16 +0000 |
743 | +++ data/Makefile.in 2012-04-05 17:54:28 +0000 |
744 | @@ -34,12 +34,6 @@ |
745 | POST_UNINSTALL = : |
746 | build_triplet = @build@ |
747 | host_triplet = @host@ |
748 | -@BUILD_GTKLOGOUTHELPER_TRUE@am__append_1 = \ |
749 | -@BUILD_GTKLOGOUTHELPER_TRUE@ $(logout_helper_desktop_in_in_files) |
750 | - |
751 | -@BUILD_GTKLOGOUTHELPER_TRUE@am__append_2 = \ |
752 | -@BUILD_GTKLOGOUTHELPER_TRUE@ $(logout_helper_desktop_files) |
753 | - |
754 | subdir = data |
755 | DIST_COMMON = $(dist_convert_DATA) $(srcdir)/Makefile.am \ |
756 | $(srcdir)/Makefile.in |
757 | @@ -47,7 +41,8 @@ |
758 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
759 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
760 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
761 | - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac |
762 | + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
763 | + $(top_srcdir)/configure.ac |
764 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
765 | $(ACLOCAL_M4) |
766 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
767 | @@ -97,9 +92,8 @@ |
768 | $(am__cd) "$$dir" && rm -f $$files; }; \ |
769 | } |
770 | am__installdirs = "$(DESTDIR)$(dbus_servicesdir)" \ |
771 | - "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(logout_helperdir)" |
772 | -DATA = $(dbus_services_DATA) $(dist_convert_DATA) \ |
773 | - $(logout_helper_DATA) |
774 | + "$(DESTDIR)$(convertdir)" |
775 | +DATA = $(dbus_services_DATA) $(dist_convert_DATA) |
776 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
777 | distclean-recursive maintainer-clean-recursive |
778 | AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
779 | @@ -150,6 +144,8 @@ |
780 | CC = @CC@ |
781 | CCDEPMODE = @CCDEPMODE@ |
782 | CFLAGS = @CFLAGS@ |
783 | +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
784 | +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
785 | CPP = @CPP@ |
786 | CPPFLAGS = @CPPFLAGS@ |
787 | CYGPATH_W = @CYGPATH_W@ |
788 | @@ -166,6 +162,8 @@ |
789 | EGREP = @EGREP@ |
790 | EXEEXT = @EXEEXT@ |
791 | FGREP = @FGREP@ |
792 | +GCOVR = @GCOVR@ |
793 | +GENHTML = @GENHTML@ |
794 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
795 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
796 | GMOFILES = @GMOFILES@ |
797 | @@ -194,6 +192,7 @@ |
798 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
799 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
800 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
801 | +LCOV = @LCOV@ |
802 | LD = @LD@ |
803 | LDFLAGS = @LDFLAGS@ |
804 | LIBOBJS = @LIBOBJS@ |
805 | @@ -239,6 +238,7 @@ |
806 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
807 | SET_MAKE = @SET_MAKE@ |
808 | SHELL = @SHELL@ |
809 | +SHTOOL = @SHTOOL@ |
810 | STRIP = @STRIP@ |
811 | USE_NLS = @USE_NLS@ |
812 | VERSION = @VERSION@ |
813 | @@ -308,21 +308,14 @@ |
814 | gsettings_SCHEMAS = com.canonical.indicator.session.gschema.xml |
815 | convertdir = $(datadir)/GConf/gsettings |
816 | dist_convert_DATA = indicator-session.convert |
817 | -EXTRA_DIST = $(service_in_files) $(gsettings_SCHEMAS:.xml=.xml.in) \ |
818 | - $(am__append_1) |
819 | -CLEANFILES = $(dbus_services_DATA) $(gsettings_SCHEMAS) \ |
820 | - $(am__append_2) |
821 | -@BUILD_GTKLOGOUTHELPER_TRUE@logout_helper_desktop_in_in_files = \ |
822 | -@BUILD_GTKLOGOUTHELPER_TRUE@ indicator-session-lock-screen.desktop.in.in \ |
823 | -@BUILD_GTKLOGOUTHELPER_TRUE@ indicator-session-logout.desktop.in.in \ |
824 | -@BUILD_GTKLOGOUTHELPER_TRUE@ indicator-session-restart.desktop.in.in \ |
825 | -@BUILD_GTKLOGOUTHELPER_TRUE@ indicator-session-shutdown.desktop.in.in |
826 | - |
827 | -@BUILD_GTKLOGOUTHELPER_TRUE@logout_helperdir = $(datadir)/applications |
828 | -@BUILD_GTKLOGOUTHELPER_TRUE@logout_helper_desktop_files = \ |
829 | -@BUILD_GTKLOGOUTHELPER_TRUE@ $(logout_helper_desktop_in_in_files:.desktop.in.in=.desktop) |
830 | - |
831 | -@BUILD_GTKLOGOUTHELPER_TRUE@logout_helper_DATA = $(logout_helper_desktop_files) |
832 | +EXTRA_DIST = \ |
833 | + $(service_in_files) \ |
834 | + $(gsettings_SCHEMAS:.xml=.xml.in) |
835 | + |
836 | +CLEANFILES = \ |
837 | + $(dbus_services_DATA) \ |
838 | + $(gsettings_SCHEMAS) |
839 | + |
840 | all: all-recursive |
841 | |
842 | .SUFFIXES: |
843 | @@ -398,24 +391,6 @@ |
844 | @list='$(dist_convert_DATA)'; test -n "$(convertdir)" || list=; \ |
845 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
846 | dir='$(DESTDIR)$(convertdir)'; $(am__uninstall_files_from_dir) |
847 | -install-logout_helperDATA: $(logout_helper_DATA) |
848 | - @$(NORMAL_INSTALL) |
849 | - test -z "$(logout_helperdir)" || $(MKDIR_P) "$(DESTDIR)$(logout_helperdir)" |
850 | - @list='$(logout_helper_DATA)'; test -n "$(logout_helperdir)" || list=; \ |
851 | - for p in $$list; do \ |
852 | - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
853 | - echo "$$d$$p"; \ |
854 | - done | $(am__base_list) | \ |
855 | - while read files; do \ |
856 | - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(logout_helperdir)'"; \ |
857 | - $(INSTALL_DATA) $$files "$(DESTDIR)$(logout_helperdir)" || exit $$?; \ |
858 | - done |
859 | - |
860 | -uninstall-logout_helperDATA: |
861 | - @$(NORMAL_UNINSTALL) |
862 | - @list='$(logout_helper_DATA)'; test -n "$(logout_helperdir)" || list=; \ |
863 | - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
864 | - dir='$(DESTDIR)$(logout_helperdir)'; $(am__uninstall_files_from_dir) |
865 | |
866 | # This directory's subdirectories are mostly independent; you can cd |
867 | # into them and run `make' without going through this Makefile. |
868 | @@ -615,7 +590,7 @@ |
869 | all-am: Makefile $(DATA) |
870 | installdirs: installdirs-recursive |
871 | installdirs-am: |
872 | - for dir in "$(DESTDIR)$(dbus_servicesdir)" "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(logout_helperdir)"; do \ |
873 | + for dir in "$(DESTDIR)$(dbus_servicesdir)" "$(DESTDIR)$(convertdir)"; do \ |
874 | test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
875 | done |
876 | install: install-recursive |
877 | @@ -669,8 +644,7 @@ |
878 | |
879 | info-am: |
880 | |
881 | -install-data-am: install-dbus_servicesDATA install-dist_convertDATA \ |
882 | - install-logout_helperDATA |
883 | +install-data-am: install-dbus_servicesDATA install-dist_convertDATA |
884 | |
885 | install-dvi: install-dvi-recursive |
886 | |
887 | @@ -714,8 +688,7 @@ |
888 | |
889 | ps-am: |
890 | |
891 | -uninstall-am: uninstall-dbus_servicesDATA uninstall-dist_convertDATA \ |
892 | - uninstall-logout_helperDATA |
893 | +uninstall-am: uninstall-dbus_servicesDATA uninstall-dist_convertDATA |
894 | |
895 | .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ |
896 | install-am install-strip tags-recursive |
897 | @@ -728,14 +701,13 @@ |
898 | install-data-am install-dbus_servicesDATA \ |
899 | install-dist_convertDATA install-dvi install-dvi-am \ |
900 | install-exec install-exec-am install-html install-html-am \ |
901 | - install-info install-info-am install-logout_helperDATA \ |
902 | - install-man install-pdf install-pdf-am install-ps \ |
903 | - install-ps-am install-strip installcheck installcheck-am \ |
904 | - installdirs installdirs-am maintainer-clean \ |
905 | - maintainer-clean-generic mostlyclean mostlyclean-generic \ |
906 | - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ |
907 | - uninstall uninstall-am uninstall-dbus_servicesDATA \ |
908 | - uninstall-dist_convertDATA uninstall-logout_helperDATA |
909 | + install-info install-info-am install-man install-pdf \ |
910 | + install-pdf-am install-ps install-ps-am install-strip \ |
911 | + installcheck installcheck-am installdirs installdirs-am \ |
912 | + maintainer-clean maintainer-clean-generic mostlyclean \ |
913 | + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
914 | + tags tags-recursive uninstall uninstall-am \ |
915 | + uninstall-dbus_servicesDATA uninstall-dist_convertDATA |
916 | |
917 | |
918 | %.service: %.service.in |
919 | @@ -746,14 +718,6 @@ |
920 | |
921 | @GSETTINGS_RULES@ |
922 | |
923 | -@BUILD_GTKLOGOUTHELPER_TRUE@@INTLTOOL_DESKTOP_RULE@ |
924 | - |
925 | -@BUILD_GTKLOGOUTHELPER_TRUE@%.desktop.in: %.desktop.in.in |
926 | -@BUILD_GTKLOGOUTHELPER_TRUE@ sed \ |
927 | -@BUILD_GTKLOGOUTHELPER_TRUE@ -e "s|\@libexecdir\@|$(libexecdir)|" \ |
928 | -@BUILD_GTKLOGOUTHELPER_TRUE@ -e "s|\@bindir\@|$(bindir)|" \ |
929 | -@BUILD_GTKLOGOUTHELPER_TRUE@ $< > $@ |
930 | - |
931 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
932 | # Otherwise a system limit (for SysV at least) may be exceeded. |
933 | .NOEXPORT: |
934 | |
935 | === modified file 'data/extra-sessions/Makefile.in' |
936 | --- data/extra-sessions/Makefile.in 2012-03-14 18:34:16 +0000 |
937 | +++ data/extra-sessions/Makefile.in 2012-04-05 17:54:28 +0000 |
938 | @@ -44,7 +44,8 @@ |
939 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
940 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
941 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
942 | - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac |
943 | + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
944 | + $(top_srcdir)/configure.ac |
945 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
946 | $(ACLOCAL_M4) |
947 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
948 | @@ -105,6 +106,8 @@ |
949 | CC = @CC@ |
950 | CCDEPMODE = @CCDEPMODE@ |
951 | CFLAGS = @CFLAGS@ |
952 | +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
953 | +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
954 | CPP = @CPP@ |
955 | CPPFLAGS = @CPPFLAGS@ |
956 | CYGPATH_W = @CYGPATH_W@ |
957 | @@ -121,6 +124,8 @@ |
958 | EGREP = @EGREP@ |
959 | EXEEXT = @EXEEXT@ |
960 | FGREP = @FGREP@ |
961 | +GCOVR = @GCOVR@ |
962 | +GENHTML = @GENHTML@ |
963 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
964 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
965 | GMOFILES = @GMOFILES@ |
966 | @@ -149,6 +154,7 @@ |
967 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
968 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
969 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
970 | +LCOV = @LCOV@ |
971 | LD = @LD@ |
972 | LDFLAGS = @LDFLAGS@ |
973 | LIBOBJS = @LIBOBJS@ |
974 | @@ -194,6 +200,7 @@ |
975 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
976 | SET_MAKE = @SET_MAKE@ |
977 | SHELL = @SHELL@ |
978 | +SHTOOL = @SHTOOL@ |
979 | STRIP = @STRIP@ |
980 | USE_NLS = @USE_NLS@ |
981 | VERSION = @VERSION@ |
982 | |
983 | === modified file 'data/icons/16x16/Makefile.in' |
984 | --- data/icons/16x16/Makefile.in 2012-03-14 18:34:16 +0000 |
985 | +++ data/icons/16x16/Makefile.in 2012-04-05 17:54:28 +0000 |
986 | @@ -39,7 +39,8 @@ |
987 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
988 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
989 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
990 | - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac |
991 | + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
992 | + $(top_srcdir)/configure.ac |
993 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
994 | $(ACLOCAL_M4) |
995 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
996 | @@ -111,6 +112,8 @@ |
997 | CC = @CC@ |
998 | CCDEPMODE = @CCDEPMODE@ |
999 | CFLAGS = @CFLAGS@ |
1000 | +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
1001 | +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
1002 | CPP = @CPP@ |
1003 | CPPFLAGS = @CPPFLAGS@ |
1004 | CYGPATH_W = @CYGPATH_W@ |
1005 | @@ -127,6 +130,8 @@ |
1006 | EGREP = @EGREP@ |
1007 | EXEEXT = @EXEEXT@ |
1008 | FGREP = @FGREP@ |
1009 | +GCOVR = @GCOVR@ |
1010 | +GENHTML = @GENHTML@ |
1011 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1012 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1013 | GMOFILES = @GMOFILES@ |
1014 | @@ -155,6 +160,7 @@ |
1015 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1016 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1017 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1018 | +LCOV = @LCOV@ |
1019 | LD = @LD@ |
1020 | LDFLAGS = @LDFLAGS@ |
1021 | LIBOBJS = @LIBOBJS@ |
1022 | @@ -200,6 +206,7 @@ |
1023 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1024 | SET_MAKE = @SET_MAKE@ |
1025 | SHELL = @SHELL@ |
1026 | +SHTOOL = @SHTOOL@ |
1027 | STRIP = @STRIP@ |
1028 | USE_NLS = @USE_NLS@ |
1029 | VERSION = @VERSION@ |
1030 | |
1031 | === modified file 'data/icons/16x16/actions/Makefile.in' |
1032 | --- data/icons/16x16/actions/Makefile.in 2012-03-14 18:34:16 +0000 |
1033 | +++ data/icons/16x16/actions/Makefile.in 2012-04-05 17:54:28 +0000 |
1034 | @@ -40,7 +40,8 @@ |
1035 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1036 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1037 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1038 | - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac |
1039 | + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1040 | + $(top_srcdir)/configure.ac |
1041 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1042 | $(ACLOCAL_M4) |
1043 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1044 | @@ -101,6 +102,8 @@ |
1045 | CC = @CC@ |
1046 | CCDEPMODE = @CCDEPMODE@ |
1047 | CFLAGS = @CFLAGS@ |
1048 | +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
1049 | +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
1050 | CPP = @CPP@ |
1051 | CPPFLAGS = @CPPFLAGS@ |
1052 | CYGPATH_W = @CYGPATH_W@ |
1053 | @@ -117,6 +120,8 @@ |
1054 | EGREP = @EGREP@ |
1055 | EXEEXT = @EXEEXT@ |
1056 | FGREP = @FGREP@ |
1057 | +GCOVR = @GCOVR@ |
1058 | +GENHTML = @GENHTML@ |
1059 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1060 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1061 | GMOFILES = @GMOFILES@ |
1062 | @@ -145,6 +150,7 @@ |
1063 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1064 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1065 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1066 | +LCOV = @LCOV@ |
1067 | LD = @LD@ |
1068 | LDFLAGS = @LDFLAGS@ |
1069 | LIBOBJS = @LIBOBJS@ |
1070 | @@ -190,6 +196,7 @@ |
1071 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1072 | SET_MAKE = @SET_MAKE@ |
1073 | SHELL = @SHELL@ |
1074 | +SHTOOL = @SHTOOL@ |
1075 | STRIP = @STRIP@ |
1076 | USE_NLS = @USE_NLS@ |
1077 | VERSION = @VERSION@ |
1078 | |
1079 | === modified file 'data/icons/16x16/status/Makefile.in' |
1080 | --- data/icons/16x16/status/Makefile.in 2012-03-14 18:34:16 +0000 |
1081 | +++ data/icons/16x16/status/Makefile.in 2012-04-05 17:54:28 +0000 |
1082 | @@ -40,7 +40,8 @@ |
1083 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1084 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1085 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1086 | - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac |
1087 | + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1088 | + $(top_srcdir)/configure.ac |
1089 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1090 | $(ACLOCAL_M4) |
1091 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1092 | @@ -101,6 +102,8 @@ |
1093 | CC = @CC@ |
1094 | CCDEPMODE = @CCDEPMODE@ |
1095 | CFLAGS = @CFLAGS@ |
1096 | +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
1097 | +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
1098 | CPP = @CPP@ |
1099 | CPPFLAGS = @CPPFLAGS@ |
1100 | CYGPATH_W = @CYGPATH_W@ |
1101 | @@ -117,6 +120,8 @@ |
1102 | EGREP = @EGREP@ |
1103 | EXEEXT = @EXEEXT@ |
1104 | FGREP = @FGREP@ |
1105 | +GCOVR = @GCOVR@ |
1106 | +GENHTML = @GENHTML@ |
1107 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1108 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1109 | GMOFILES = @GMOFILES@ |
1110 | @@ -145,6 +150,7 @@ |
1111 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1112 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1113 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1114 | +LCOV = @LCOV@ |
1115 | LD = @LD@ |
1116 | LDFLAGS = @LDFLAGS@ |
1117 | LIBOBJS = @LIBOBJS@ |
1118 | @@ -190,6 +196,7 @@ |
1119 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1120 | SET_MAKE = @SET_MAKE@ |
1121 | SHELL = @SHELL@ |
1122 | +SHTOOL = @SHTOOL@ |
1123 | STRIP = @STRIP@ |
1124 | USE_NLS = @USE_NLS@ |
1125 | VERSION = @VERSION@ |
1126 | |
1127 | === modified file 'data/icons/22x22/Makefile.in' |
1128 | --- data/icons/22x22/Makefile.in 2012-03-14 18:34:16 +0000 |
1129 | +++ data/icons/22x22/Makefile.in 2012-04-05 17:54:28 +0000 |
1130 | @@ -39,7 +39,8 @@ |
1131 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1132 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1133 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1134 | - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac |
1135 | + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1136 | + $(top_srcdir)/configure.ac |
1137 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1138 | $(ACLOCAL_M4) |
1139 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1140 | @@ -111,6 +112,8 @@ |
1141 | CC = @CC@ |
1142 | CCDEPMODE = @CCDEPMODE@ |
1143 | CFLAGS = @CFLAGS@ |
1144 | +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
1145 | +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
1146 | CPP = @CPP@ |
1147 | CPPFLAGS = @CPPFLAGS@ |
1148 | CYGPATH_W = @CYGPATH_W@ |
1149 | @@ -127,6 +130,8 @@ |
1150 | EGREP = @EGREP@ |
1151 | EXEEXT = @EXEEXT@ |
1152 | FGREP = @FGREP@ |
1153 | +GCOVR = @GCOVR@ |
1154 | +GENHTML = @GENHTML@ |
1155 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1156 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1157 | GMOFILES = @GMOFILES@ |
1158 | @@ -155,6 +160,7 @@ |
1159 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1160 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1161 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1162 | +LCOV = @LCOV@ |
1163 | LD = @LD@ |
1164 | LDFLAGS = @LDFLAGS@ |
1165 | LIBOBJS = @LIBOBJS@ |
1166 | @@ -200,6 +206,7 @@ |
1167 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1168 | SET_MAKE = @SET_MAKE@ |
1169 | SHELL = @SHELL@ |
1170 | +SHTOOL = @SHTOOL@ |
1171 | STRIP = @STRIP@ |
1172 | USE_NLS = @USE_NLS@ |
1173 | VERSION = @VERSION@ |
1174 | |
1175 | === modified file 'data/icons/22x22/actions/Makefile.in' |
1176 | --- data/icons/22x22/actions/Makefile.in 2012-03-14 18:34:16 +0000 |
1177 | +++ data/icons/22x22/actions/Makefile.in 2012-04-05 17:54:28 +0000 |
1178 | @@ -40,7 +40,8 @@ |
1179 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1180 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1181 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1182 | - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac |
1183 | + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1184 | + $(top_srcdir)/configure.ac |
1185 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1186 | $(ACLOCAL_M4) |
1187 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1188 | @@ -101,6 +102,8 @@ |
1189 | CC = @CC@ |
1190 | CCDEPMODE = @CCDEPMODE@ |
1191 | CFLAGS = @CFLAGS@ |
1192 | +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
1193 | +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
1194 | CPP = @CPP@ |
1195 | CPPFLAGS = @CPPFLAGS@ |
1196 | CYGPATH_W = @CYGPATH_W@ |
1197 | @@ -117,6 +120,8 @@ |
1198 | EGREP = @EGREP@ |
1199 | EXEEXT = @EXEEXT@ |
1200 | FGREP = @FGREP@ |
1201 | +GCOVR = @GCOVR@ |
1202 | +GENHTML = @GENHTML@ |
1203 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1204 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1205 | GMOFILES = @GMOFILES@ |
1206 | @@ -145,6 +150,7 @@ |
1207 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1208 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1209 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1210 | +LCOV = @LCOV@ |
1211 | LD = @LD@ |
1212 | LDFLAGS = @LDFLAGS@ |
1213 | LIBOBJS = @LIBOBJS@ |
1214 | @@ -190,6 +196,7 @@ |
1215 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1216 | SET_MAKE = @SET_MAKE@ |
1217 | SHELL = @SHELL@ |
1218 | +SHTOOL = @SHTOOL@ |
1219 | STRIP = @STRIP@ |
1220 | USE_NLS = @USE_NLS@ |
1221 | VERSION = @VERSION@ |
1222 | |
1223 | === modified file 'data/icons/22x22/status/Makefile.in' |
1224 | --- data/icons/22x22/status/Makefile.in 2012-03-14 18:34:16 +0000 |
1225 | +++ data/icons/22x22/status/Makefile.in 2012-04-05 17:54:28 +0000 |
1226 | @@ -40,7 +40,8 @@ |
1227 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1228 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1229 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1230 | - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac |
1231 | + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1232 | + $(top_srcdir)/configure.ac |
1233 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1234 | $(ACLOCAL_M4) |
1235 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1236 | @@ -101,6 +102,8 @@ |
1237 | CC = @CC@ |
1238 | CCDEPMODE = @CCDEPMODE@ |
1239 | CFLAGS = @CFLAGS@ |
1240 | +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
1241 | +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
1242 | CPP = @CPP@ |
1243 | CPPFLAGS = @CPPFLAGS@ |
1244 | CYGPATH_W = @CYGPATH_W@ |
1245 | @@ -117,6 +120,8 @@ |
1246 | EGREP = @EGREP@ |
1247 | EXEEXT = @EXEEXT@ |
1248 | FGREP = @FGREP@ |
1249 | +GCOVR = @GCOVR@ |
1250 | +GENHTML = @GENHTML@ |
1251 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1252 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1253 | GMOFILES = @GMOFILES@ |
1254 | @@ -145,6 +150,7 @@ |
1255 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1256 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1257 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1258 | +LCOV = @LCOV@ |
1259 | LD = @LD@ |
1260 | LDFLAGS = @LDFLAGS@ |
1261 | LIBOBJS = @LIBOBJS@ |
1262 | @@ -190,6 +196,7 @@ |
1263 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1264 | SET_MAKE = @SET_MAKE@ |
1265 | SHELL = @SHELL@ |
1266 | +SHTOOL = @SHTOOL@ |
1267 | STRIP = @STRIP@ |
1268 | USE_NLS = @USE_NLS@ |
1269 | VERSION = @VERSION@ |
1270 | |
1271 | === modified file 'data/icons/24x24/Makefile.in' |
1272 | --- data/icons/24x24/Makefile.in 2012-03-14 18:34:16 +0000 |
1273 | +++ data/icons/24x24/Makefile.in 2012-04-05 17:54:28 +0000 |
1274 | @@ -39,7 +39,8 @@ |
1275 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1276 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1277 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1278 | - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac |
1279 | + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1280 | + $(top_srcdir)/configure.ac |
1281 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1282 | $(ACLOCAL_M4) |
1283 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1284 | @@ -111,6 +112,8 @@ |
1285 | CC = @CC@ |
1286 | CCDEPMODE = @CCDEPMODE@ |
1287 | CFLAGS = @CFLAGS@ |
1288 | +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
1289 | +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
1290 | CPP = @CPP@ |
1291 | CPPFLAGS = @CPPFLAGS@ |
1292 | CYGPATH_W = @CYGPATH_W@ |
1293 | @@ -127,6 +130,8 @@ |
1294 | EGREP = @EGREP@ |
1295 | EXEEXT = @EXEEXT@ |
1296 | FGREP = @FGREP@ |
1297 | +GCOVR = @GCOVR@ |
1298 | +GENHTML = @GENHTML@ |
1299 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1300 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1301 | GMOFILES = @GMOFILES@ |
1302 | @@ -155,6 +160,7 @@ |
1303 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1304 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1305 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1306 | +LCOV = @LCOV@ |
1307 | LD = @LD@ |
1308 | LDFLAGS = @LDFLAGS@ |
1309 | LIBOBJS = @LIBOBJS@ |
1310 | @@ -200,6 +206,7 @@ |
1311 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1312 | SET_MAKE = @SET_MAKE@ |
1313 | SHELL = @SHELL@ |
1314 | +SHTOOL = @SHTOOL@ |
1315 | STRIP = @STRIP@ |
1316 | USE_NLS = @USE_NLS@ |
1317 | VERSION = @VERSION@ |
1318 | |
1319 | === modified file 'data/icons/24x24/actions/Makefile.in' |
1320 | --- data/icons/24x24/actions/Makefile.in 2012-03-14 18:34:16 +0000 |
1321 | +++ data/icons/24x24/actions/Makefile.in 2012-04-05 17:54:28 +0000 |
1322 | @@ -40,7 +40,8 @@ |
1323 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1324 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1325 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1326 | - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac |
1327 | + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1328 | + $(top_srcdir)/configure.ac |
1329 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1330 | $(ACLOCAL_M4) |
1331 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1332 | @@ -101,6 +102,8 @@ |
1333 | CC = @CC@ |
1334 | CCDEPMODE = @CCDEPMODE@ |
1335 | CFLAGS = @CFLAGS@ |
1336 | +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
1337 | +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
1338 | CPP = @CPP@ |
1339 | CPPFLAGS = @CPPFLAGS@ |
1340 | CYGPATH_W = @CYGPATH_W@ |
1341 | @@ -117,6 +120,8 @@ |
1342 | EGREP = @EGREP@ |
1343 | EXEEXT = @EXEEXT@ |
1344 | FGREP = @FGREP@ |
1345 | +GCOVR = @GCOVR@ |
1346 | +GENHTML = @GENHTML@ |
1347 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1348 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1349 | GMOFILES = @GMOFILES@ |
1350 | @@ -145,6 +150,7 @@ |
1351 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1352 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1353 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1354 | +LCOV = @LCOV@ |
1355 | LD = @LD@ |
1356 | LDFLAGS = @LDFLAGS@ |
1357 | LIBOBJS = @LIBOBJS@ |
1358 | @@ -190,6 +196,7 @@ |
1359 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1360 | SET_MAKE = @SET_MAKE@ |
1361 | SHELL = @SHELL@ |
1362 | +SHTOOL = @SHTOOL@ |
1363 | STRIP = @STRIP@ |
1364 | USE_NLS = @USE_NLS@ |
1365 | VERSION = @VERSION@ |
1366 | |
1367 | === modified file 'data/icons/24x24/status/Makefile.in' |
1368 | --- data/icons/24x24/status/Makefile.in 2012-03-14 18:34:16 +0000 |
1369 | +++ data/icons/24x24/status/Makefile.in 2012-04-05 17:54:28 +0000 |
1370 | @@ -40,7 +40,8 @@ |
1371 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1372 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1373 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1374 | - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac |
1375 | + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1376 | + $(top_srcdir)/configure.ac |
1377 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1378 | $(ACLOCAL_M4) |
1379 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1380 | @@ -101,6 +102,8 @@ |
1381 | CC = @CC@ |
1382 | CCDEPMODE = @CCDEPMODE@ |
1383 | CFLAGS = @CFLAGS@ |
1384 | +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
1385 | +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
1386 | CPP = @CPP@ |
1387 | CPPFLAGS = @CPPFLAGS@ |
1388 | CYGPATH_W = @CYGPATH_W@ |
1389 | @@ -117,6 +120,8 @@ |
1390 | EGREP = @EGREP@ |
1391 | EXEEXT = @EXEEXT@ |
1392 | FGREP = @FGREP@ |
1393 | +GCOVR = @GCOVR@ |
1394 | +GENHTML = @GENHTML@ |
1395 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1396 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1397 | GMOFILES = @GMOFILES@ |
1398 | @@ -145,6 +150,7 @@ |
1399 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1400 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1401 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1402 | +LCOV = @LCOV@ |
1403 | LD = @LD@ |
1404 | LDFLAGS = @LDFLAGS@ |
1405 | LIBOBJS = @LIBOBJS@ |
1406 | @@ -190,6 +196,7 @@ |
1407 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1408 | SET_MAKE = @SET_MAKE@ |
1409 | SHELL = @SHELL@ |
1410 | +SHTOOL = @SHTOOL@ |
1411 | STRIP = @STRIP@ |
1412 | USE_NLS = @USE_NLS@ |
1413 | VERSION = @VERSION@ |
1414 | |
1415 | === modified file 'data/icons/32x32/Makefile.in' |
1416 | --- data/icons/32x32/Makefile.in 2012-03-14 18:34:16 +0000 |
1417 | +++ data/icons/32x32/Makefile.in 2012-04-05 17:54:28 +0000 |
1418 | @@ -39,7 +39,8 @@ |
1419 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1420 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1421 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1422 | - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac |
1423 | + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1424 | + $(top_srcdir)/configure.ac |
1425 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1426 | $(ACLOCAL_M4) |
1427 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1428 | @@ -111,6 +112,8 @@ |
1429 | CC = @CC@ |
1430 | CCDEPMODE = @CCDEPMODE@ |
1431 | CFLAGS = @CFLAGS@ |
1432 | +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
1433 | +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
1434 | CPP = @CPP@ |
1435 | CPPFLAGS = @CPPFLAGS@ |
1436 | CYGPATH_W = @CYGPATH_W@ |
1437 | @@ -127,6 +130,8 @@ |
1438 | EGREP = @EGREP@ |
1439 | EXEEXT = @EXEEXT@ |
1440 | FGREP = @FGREP@ |
1441 | +GCOVR = @GCOVR@ |
1442 | +GENHTML = @GENHTML@ |
1443 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1444 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1445 | GMOFILES = @GMOFILES@ |
1446 | @@ -155,6 +160,7 @@ |
1447 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1448 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1449 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1450 | +LCOV = @LCOV@ |
1451 | LD = @LD@ |
1452 | LDFLAGS = @LDFLAGS@ |
1453 | LIBOBJS = @LIBOBJS@ |
1454 | @@ -200,6 +206,7 @@ |
1455 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1456 | SET_MAKE = @SET_MAKE@ |
1457 | SHELL = @SHELL@ |
1458 | +SHTOOL = @SHTOOL@ |
1459 | STRIP = @STRIP@ |
1460 | USE_NLS = @USE_NLS@ |
1461 | VERSION = @VERSION@ |
1462 | |
1463 | === modified file 'data/icons/32x32/actions/Makefile.in' |
1464 | --- data/icons/32x32/actions/Makefile.in 2012-03-14 18:34:16 +0000 |
1465 | +++ data/icons/32x32/actions/Makefile.in 2012-04-05 17:54:28 +0000 |
1466 | @@ -40,7 +40,8 @@ |
1467 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1468 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1469 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1470 | - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac |
1471 | + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1472 | + $(top_srcdir)/configure.ac |
1473 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1474 | $(ACLOCAL_M4) |
1475 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1476 | @@ -101,6 +102,8 @@ |
1477 | CC = @CC@ |
1478 | CCDEPMODE = @CCDEPMODE@ |
1479 | CFLAGS = @CFLAGS@ |
1480 | +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
1481 | +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
1482 | CPP = @CPP@ |
1483 | CPPFLAGS = @CPPFLAGS@ |
1484 | CYGPATH_W = @CYGPATH_W@ |
1485 | @@ -117,6 +120,8 @@ |
1486 | EGREP = @EGREP@ |
1487 | EXEEXT = @EXEEXT@ |
1488 | FGREP = @FGREP@ |
1489 | +GCOVR = @GCOVR@ |
1490 | +GENHTML = @GENHTML@ |
1491 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1492 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1493 | GMOFILES = @GMOFILES@ |
1494 | @@ -145,6 +150,7 @@ |
1495 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1496 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1497 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1498 | +LCOV = @LCOV@ |
1499 | LD = @LD@ |
1500 | LDFLAGS = @LDFLAGS@ |
1501 | LIBOBJS = @LIBOBJS@ |
1502 | @@ -190,6 +196,7 @@ |
1503 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1504 | SET_MAKE = @SET_MAKE@ |
1505 | SHELL = @SHELL@ |
1506 | +SHTOOL = @SHTOOL@ |
1507 | STRIP = @STRIP@ |
1508 | USE_NLS = @USE_NLS@ |
1509 | VERSION = @VERSION@ |
1510 | |
1511 | === modified file 'data/icons/32x32/status/Makefile.in' |
1512 | --- data/icons/32x32/status/Makefile.in 2012-03-14 18:34:16 +0000 |
1513 | +++ data/icons/32x32/status/Makefile.in 2012-04-05 17:54:28 +0000 |
1514 | @@ -40,7 +40,8 @@ |
1515 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1516 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1517 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1518 | - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac |
1519 | + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1520 | + $(top_srcdir)/configure.ac |
1521 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1522 | $(ACLOCAL_M4) |
1523 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1524 | @@ -101,6 +102,8 @@ |
1525 | CC = @CC@ |
1526 | CCDEPMODE = @CCDEPMODE@ |
1527 | CFLAGS = @CFLAGS@ |
1528 | +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
1529 | +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
1530 | CPP = @CPP@ |
1531 | CPPFLAGS = @CPPFLAGS@ |
1532 | CYGPATH_W = @CYGPATH_W@ |
1533 | @@ -117,6 +120,8 @@ |
1534 | EGREP = @EGREP@ |
1535 | EXEEXT = @EXEEXT@ |
1536 | FGREP = @FGREP@ |
1537 | +GCOVR = @GCOVR@ |
1538 | +GENHTML = @GENHTML@ |
1539 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1540 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1541 | GMOFILES = @GMOFILES@ |
1542 | @@ -145,6 +150,7 @@ |
1543 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1544 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1545 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1546 | +LCOV = @LCOV@ |
1547 | LD = @LD@ |
1548 | LDFLAGS = @LDFLAGS@ |
1549 | LIBOBJS = @LIBOBJS@ |
1550 | @@ -190,6 +196,7 @@ |
1551 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1552 | SET_MAKE = @SET_MAKE@ |
1553 | SHELL = @SHELL@ |
1554 | +SHTOOL = @SHTOOL@ |
1555 | STRIP = @STRIP@ |
1556 | USE_NLS = @USE_NLS@ |
1557 | VERSION = @VERSION@ |
1558 | |
1559 | === modified file 'data/icons/Makefile.in' |
1560 | --- data/icons/Makefile.in 2012-03-14 18:34:16 +0000 |
1561 | +++ data/icons/Makefile.in 2012-04-05 17:54:28 +0000 |
1562 | @@ -39,7 +39,8 @@ |
1563 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1564 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1565 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1566 | - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac |
1567 | + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1568 | + $(top_srcdir)/configure.ac |
1569 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1570 | $(ACLOCAL_M4) |
1571 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1572 | @@ -111,6 +112,8 @@ |
1573 | CC = @CC@ |
1574 | CCDEPMODE = @CCDEPMODE@ |
1575 | CFLAGS = @CFLAGS@ |
1576 | +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
1577 | +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
1578 | CPP = @CPP@ |
1579 | CPPFLAGS = @CPPFLAGS@ |
1580 | CYGPATH_W = @CYGPATH_W@ |
1581 | @@ -127,6 +130,8 @@ |
1582 | EGREP = @EGREP@ |
1583 | EXEEXT = @EXEEXT@ |
1584 | FGREP = @FGREP@ |
1585 | +GCOVR = @GCOVR@ |
1586 | +GENHTML = @GENHTML@ |
1587 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1588 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1589 | GMOFILES = @GMOFILES@ |
1590 | @@ -155,6 +160,7 @@ |
1591 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1592 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1593 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1594 | +LCOV = @LCOV@ |
1595 | LD = @LD@ |
1596 | LDFLAGS = @LDFLAGS@ |
1597 | LIBOBJS = @LIBOBJS@ |
1598 | @@ -200,6 +206,7 @@ |
1599 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1600 | SET_MAKE = @SET_MAKE@ |
1601 | SHELL = @SHELL@ |
1602 | +SHTOOL = @SHTOOL@ |
1603 | STRIP = @STRIP@ |
1604 | USE_NLS = @USE_NLS@ |
1605 | VERSION = @VERSION@ |
1606 | |
1607 | === modified file 'data/icons/scalable/Makefile.in' |
1608 | --- data/icons/scalable/Makefile.in 2012-03-14 18:34:16 +0000 |
1609 | +++ data/icons/scalable/Makefile.in 2012-04-05 17:54:28 +0000 |
1610 | @@ -39,7 +39,8 @@ |
1611 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1612 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1613 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1614 | - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac |
1615 | + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1616 | + $(top_srcdir)/configure.ac |
1617 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1618 | $(ACLOCAL_M4) |
1619 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1620 | @@ -111,6 +112,8 @@ |
1621 | CC = @CC@ |
1622 | CCDEPMODE = @CCDEPMODE@ |
1623 | CFLAGS = @CFLAGS@ |
1624 | +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
1625 | +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
1626 | CPP = @CPP@ |
1627 | CPPFLAGS = @CPPFLAGS@ |
1628 | CYGPATH_W = @CYGPATH_W@ |
1629 | @@ -127,6 +130,8 @@ |
1630 | EGREP = @EGREP@ |
1631 | EXEEXT = @EXEEXT@ |
1632 | FGREP = @FGREP@ |
1633 | +GCOVR = @GCOVR@ |
1634 | +GENHTML = @GENHTML@ |
1635 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1636 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1637 | GMOFILES = @GMOFILES@ |
1638 | @@ -155,6 +160,7 @@ |
1639 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1640 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1641 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1642 | +LCOV = @LCOV@ |
1643 | LD = @LD@ |
1644 | LDFLAGS = @LDFLAGS@ |
1645 | LIBOBJS = @LIBOBJS@ |
1646 | @@ -200,6 +206,7 @@ |
1647 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1648 | SET_MAKE = @SET_MAKE@ |
1649 | SHELL = @SHELL@ |
1650 | +SHTOOL = @SHTOOL@ |
1651 | STRIP = @STRIP@ |
1652 | USE_NLS = @USE_NLS@ |
1653 | VERSION = @VERSION@ |
1654 | |
1655 | === modified file 'data/icons/scalable/actions/Makefile.in' |
1656 | --- data/icons/scalable/actions/Makefile.in 2012-03-14 18:34:16 +0000 |
1657 | +++ data/icons/scalable/actions/Makefile.in 2012-04-05 17:54:28 +0000 |
1658 | @@ -40,7 +40,8 @@ |
1659 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1660 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1661 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1662 | - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac |
1663 | + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1664 | + $(top_srcdir)/configure.ac |
1665 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1666 | $(ACLOCAL_M4) |
1667 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1668 | @@ -101,6 +102,8 @@ |
1669 | CC = @CC@ |
1670 | CCDEPMODE = @CCDEPMODE@ |
1671 | CFLAGS = @CFLAGS@ |
1672 | +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
1673 | +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
1674 | CPP = @CPP@ |
1675 | CPPFLAGS = @CPPFLAGS@ |
1676 | CYGPATH_W = @CYGPATH_W@ |
1677 | @@ -117,6 +120,8 @@ |
1678 | EGREP = @EGREP@ |
1679 | EXEEXT = @EXEEXT@ |
1680 | FGREP = @FGREP@ |
1681 | +GCOVR = @GCOVR@ |
1682 | +GENHTML = @GENHTML@ |
1683 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1684 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1685 | GMOFILES = @GMOFILES@ |
1686 | @@ -145,6 +150,7 @@ |
1687 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1688 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1689 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1690 | +LCOV = @LCOV@ |
1691 | LD = @LD@ |
1692 | LDFLAGS = @LDFLAGS@ |
1693 | LIBOBJS = @LIBOBJS@ |
1694 | @@ -190,6 +196,7 @@ |
1695 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1696 | SET_MAKE = @SET_MAKE@ |
1697 | SHELL = @SHELL@ |
1698 | +SHTOOL = @SHTOOL@ |
1699 | STRIP = @STRIP@ |
1700 | USE_NLS = @USE_NLS@ |
1701 | VERSION = @VERSION@ |
1702 | |
1703 | === modified file 'data/icons/scalable/status/Makefile.in' |
1704 | --- data/icons/scalable/status/Makefile.in 2012-03-14 18:34:16 +0000 |
1705 | +++ data/icons/scalable/status/Makefile.in 2012-04-05 17:54:28 +0000 |
1706 | @@ -40,7 +40,8 @@ |
1707 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1708 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1709 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1710 | - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac |
1711 | + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1712 | + $(top_srcdir)/configure.ac |
1713 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1714 | $(ACLOCAL_M4) |
1715 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1716 | @@ -101,6 +102,8 @@ |
1717 | CC = @CC@ |
1718 | CCDEPMODE = @CCDEPMODE@ |
1719 | CFLAGS = @CFLAGS@ |
1720 | +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
1721 | +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
1722 | CPP = @CPP@ |
1723 | CPPFLAGS = @CPPFLAGS@ |
1724 | CYGPATH_W = @CYGPATH_W@ |
1725 | @@ -117,6 +120,8 @@ |
1726 | EGREP = @EGREP@ |
1727 | EXEEXT = @EXEEXT@ |
1728 | FGREP = @FGREP@ |
1729 | +GCOVR = @GCOVR@ |
1730 | +GENHTML = @GENHTML@ |
1731 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1732 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1733 | GMOFILES = @GMOFILES@ |
1734 | @@ -145,6 +150,7 @@ |
1735 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1736 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1737 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1738 | +LCOV = @LCOV@ |
1739 | LD = @LD@ |
1740 | LDFLAGS = @LDFLAGS@ |
1741 | LIBOBJS = @LIBOBJS@ |
1742 | @@ -190,6 +196,7 @@ |
1743 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1744 | SET_MAKE = @SET_MAKE@ |
1745 | SHELL = @SHELL@ |
1746 | +SHTOOL = @SHTOOL@ |
1747 | STRIP = @STRIP@ |
1748 | USE_NLS = @USE_NLS@ |
1749 | VERSION = @VERSION@ |
1750 | |
1751 | === removed file 'data/indicator-session-lock-screen.desktop.in.in' |
1752 | --- data/indicator-session-lock-screen.desktop.in.in 2011-09-26 15:07:33 +0000 |
1753 | +++ data/indicator-session-lock-screen.desktop.in.in 1970-01-01 00:00:00 +0000 |
1754 | @@ -1,10 +0,0 @@ |
1755 | -[Desktop Entry] |
1756 | -_Name=Lock Screen |
1757 | -TryExec=@bindir@/xdg-screensaver |
1758 | -Exec=@bindir@/xdg-screensaver lock |
1759 | -Icon=system-lock-screen |
1760 | -Terminal=false |
1761 | -Type=Application |
1762 | -OnlyShowIn=Unity; |
1763 | -Categories=System; |
1764 | -Version=1.0 |
1765 | |
1766 | === removed file 'data/indicator-session-logout.desktop.in.in' |
1767 | --- data/indicator-session-logout.desktop.in.in 2011-09-26 15:07:33 +0000 |
1768 | +++ data/indicator-session-logout.desktop.in.in 1970-01-01 00:00:00 +0000 |
1769 | @@ -1,10 +0,0 @@ |
1770 | -[Desktop Entry] |
1771 | -_Name=Log Out |
1772 | -TryExec=@libexecdir@/gtk-logout-helper |
1773 | -Exec=@libexecdir@/gtk-logout-helper --logout |
1774 | -Icon=system-log-out |
1775 | -Terminal=false |
1776 | -Type=Application |
1777 | -OnlyShowIn=Unity; |
1778 | -Categories=System; |
1779 | -Version=1.0 |
1780 | |
1781 | === removed file 'data/indicator-session-restart.desktop.in.in' |
1782 | --- data/indicator-session-restart.desktop.in.in 2011-09-26 15:07:33 +0000 |
1783 | +++ data/indicator-session-restart.desktop.in.in 1970-01-01 00:00:00 +0000 |
1784 | @@ -1,10 +0,0 @@ |
1785 | -[Desktop Entry] |
1786 | -_Name=Restart |
1787 | -TryExec=@libexecdir@/gtk-logout-helper |
1788 | -Exec=@libexecdir@/gtk-logout-helper --restart |
1789 | -Icon=system-restart |
1790 | -Terminal=false |
1791 | -Type=Application |
1792 | -OnlyShowIn=Unity; |
1793 | -Categories=System; |
1794 | -Version=1.0 |
1795 | |
1796 | === removed file 'data/indicator-session-shutdown.desktop.in.in' |
1797 | --- data/indicator-session-shutdown.desktop.in.in 2011-09-26 15:07:33 +0000 |
1798 | +++ data/indicator-session-shutdown.desktop.in.in 1970-01-01 00:00:00 +0000 |
1799 | @@ -1,10 +0,0 @@ |
1800 | -[Desktop Entry] |
1801 | -_Name=Shut Down |
1802 | -TryExec=@libexecdir@/gtk-logout-helper |
1803 | -Exec=@libexecdir@/gtk-logout-helper --shutdown |
1804 | -Icon=system-shutdown |
1805 | -Terminal=false |
1806 | -Type=Application |
1807 | -OnlyShowIn=Unity; |
1808 | -Categories=System; |
1809 | -Version=1.0 |
1810 | |
1811 | === modified file 'debian/changelog' |
1812 | --- debian/changelog 2012-03-21 19:34:07 +0000 |
1813 | +++ debian/changelog 2012-04-05 17:54:28 +0000 |
1814 | @@ -1,3 +1,11 @@ |
1815 | +indicator-session (0.3.96-0ubuntu1) precise; urgency=low |
1816 | + |
1817 | + * New upstream release. |
1818 | + * Remove desktop files so they don't appear in the dash. (LP: #973181) |
1819 | + * Add gcov to the build for coverage statistics |
1820 | + |
1821 | + -- Charles Kerr <charles.kerr@canonical.com> Thu, 05 Apr 2012 12:50:09 -0500 |
1822 | + |
1823 | indicator-session (0.3.95-0ubuntu1) precise; urgency=low |
1824 | |
1825 | * New upstream release. |
1826 | |
1827 | === added directory 'm4' |
1828 | === removed directory 'm4' |
1829 | === added file 'm4/gcov.m4' |
1830 | --- m4/gcov.m4 1970-01-01 00:00:00 +0000 |
1831 | +++ m4/gcov.m4 2012-04-05 17:54:28 +0000 |
1832 | @@ -0,0 +1,86 @@ |
1833 | +# Checks for existence of coverage tools: |
1834 | +# * gcov |
1835 | +# * lcov |
1836 | +# * genhtml |
1837 | +# * gcovr |
1838 | +# |
1839 | +# Sets ac_cv_check_gcov to yes if tooling is present |
1840 | +# and reports the executables to the variables LCOV, GCOVR and GENHTML. |
1841 | +AC_DEFUN([AC_TDD_GCOV], |
1842 | +[ |
1843 | + AC_ARG_ENABLE(gcov, |
1844 | + AS_HELP_STRING([--enable-gcov], |
1845 | + [enable coverage testing with gcov]), |
1846 | + [use_gcov=$enableval], [use_gcov=no]) |
1847 | + |
1848 | + if test "x$use_gcov" = "xyes"; then |
1849 | + # we need gcc: |
1850 | + if test "$GCC" != "yes"; then |
1851 | + AC_MSG_ERROR([GCC is required for --enable-gcov]) |
1852 | + fi |
1853 | + |
1854 | + # Check if ccache is being used |
1855 | + AC_CHECK_PROG(SHTOOL, shtool, shtool) |
1856 | + case `$SHTOOL path $CC` in |
1857 | + *ccache*[)] gcc_ccache=yes;; |
1858 | + *[)] gcc_ccache=no;; |
1859 | + esac |
1860 | + |
1861 | + if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then |
1862 | + AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.]) |
1863 | + fi |
1864 | + |
1865 | + lcov_version_list="1.6 1.7 1.8 1.9" |
1866 | + AC_CHECK_PROG(LCOV, lcov, lcov) |
1867 | + AC_CHECK_PROG(GENHTML, genhtml, genhtml) |
1868 | + |
1869 | + if test "$LCOV"; then |
1870 | + AC_CACHE_CHECK([for lcov version], glib_cv_lcov_version, [ |
1871 | + glib_cv_lcov_version=invalid |
1872 | + lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'` |
1873 | + for lcov_check_version in $lcov_version_list; do |
1874 | + if test "$lcov_version" = "$lcov_check_version"; then |
1875 | + glib_cv_lcov_version="$lcov_check_version (ok)" |
1876 | + fi |
1877 | + done |
1878 | + ]) |
1879 | + else |
1880 | + lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list" |
1881 | + AC_MSG_ERROR([$lcov_msg]) |
1882 | + fi |
1883 | + |
1884 | + case $glib_cv_lcov_version in |
1885 | + ""|invalid[)] |
1886 | + lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)." |
1887 | + AC_MSG_ERROR([$lcov_msg]) |
1888 | + LCOV="exit 0;" |
1889 | + ;; |
1890 | + esac |
1891 | + |
1892 | + if test -z "$GENHTML"; then |
1893 | + AC_MSG_ERROR([Could not find genhtml from the lcov package]) |
1894 | + fi |
1895 | + |
1896 | + ac_cv_check_gcov=yes |
1897 | + ac_cv_check_lcov=yes |
1898 | + |
1899 | + # Remove all optimization flags from CFLAGS |
1900 | + changequote({,}) |
1901 | + CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'` |
1902 | + changequote([,]) |
1903 | + |
1904 | + # Add the special gcc flags |
1905 | + COVERAGE_CFLAGS="-O0 -fprofile-arcs -ftest-coverage" |
1906 | + COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage" |
1907 | + COVERAGE_LDFLAGS="-lgcov" |
1908 | + |
1909 | + # Check availability of gcovr |
1910 | + AC_CHECK_PROG(GCOVR, gcovr, gcovr) |
1911 | + if test -z "$GCOVR"; then |
1912 | + ac_cv_check_gcovr=no |
1913 | + else |
1914 | + ac_cv_check_gcovr=yes |
1915 | + fi |
1916 | + |
1917 | +fi |
1918 | +]) # AC_TDD_GCOV |
1919 | |
1920 | === renamed file 'm4/intltool.m4' => 'm4/intltool.m4' |
1921 | === renamed file 'm4/libtool.m4' => 'm4/libtool.m4' |
1922 | === renamed file 'm4/ltoptions.m4' => 'm4/ltoptions.m4' |
1923 | === renamed file 'm4/ltsugar.m4' => 'm4/ltsugar.m4' |
1924 | === renamed file 'm4/ltversion.m4' => 'm4/ltversion.m4' |
1925 | === renamed file 'm4/lt~obsolete.m4' => 'm4/lt~obsolete.m4' |
1926 | === modified file 'po/POTFILES.in' |
1927 | --- po/POTFILES.in 2011-08-25 10:11:50 +0000 |
1928 | +++ po/POTFILES.in 2012-04-05 17:54:28 +0000 |
1929 | @@ -1,10 +1,6 @@ |
1930 | [encoding: UTF-8] |
1931 | data/com.canonical.indicator.session.gschema.xml.in |
1932 | data/extra-sessions/classic-desktop.desktop.in.in |
1933 | -data/indicator-session-lock-screen.desktop.in.in |
1934 | -data/indicator-session-shutdown.desktop.in.in |
1935 | -data/indicator-session-logout.desktop.in.in |
1936 | -data/indicator-session-restart.desktop.in.in |
1937 | src/settings-helper.c |
1938 | src/lock-helper.c |
1939 | src/gtk-logout-helper.c |
1940 | |
1941 | === modified file 'src/Makefile.am' |
1942 | --- src/Makefile.am 2012-02-23 15:17:10 +0000 |
1943 | +++ src/Makefile.am 2012-04-05 17:54:28 +0000 |
1944 | @@ -26,10 +26,13 @@ |
1945 | accounts-service-user-client.h |
1946 | libsession_la_CFLAGS = \ |
1947 | $(APPLET_CFLAGS) \ |
1948 | + $(COVERAGE_CFLAGS) \ |
1949 | -Wall -Werror \ |
1950 | -DG_LOG_DOMAIN=\"Indicator-Session\" |
1951 | libsession_la_LIBADD = $(APPLET_LIBS) |
1952 | -libsession_la_LDFLAGS = -module -avoid-version |
1953 | +libsession_la_LDFLAGS = \ |
1954 | + $(COVERAGE_LDFLAGS) \ |
1955 | + -module -avoid-version |
1956 | |
1957 | consolekit-manager-client.h: $(srcdir)/org.freedesktop.ConsoleKit.Manager.xml |
1958 | dbus-binding-tool \ |
1959 | @@ -137,11 +140,14 @@ |
1960 | -DLIBEXECDIR=\"$(libexecdir)\" \ |
1961 | -Wall -Werror \ |
1962 | -DG_LOG_DOMAIN=\"Indicator-Session\" \ |
1963 | - $(GUDEV_CFLAGS) |
1964 | + $(GUDEV_CFLAGS) \ |
1965 | + $(COVERAGE_CFLAGS) |
1966 | indicator_session_service_LDADD = \ |
1967 | $(SESSIONSERVICE_LIBS) \ |
1968 | $(GCONF_LIBS) \ |
1969 | $(GUDEV_LIBS) |
1970 | +indicator_session_service_LDFLAGS = \ |
1971 | + $(COVERAGE_LDFLAGS) |
1972 | |
1973 | ################# |
1974 | # GTK Logout Stuff |
1975 | @@ -159,6 +165,7 @@ |
1976 | $(SESSIONSERVICE_CFLAGS) \ |
1977 | $(GTKLOGOUTHELPER_CFLAGS) \ |
1978 | $(GCONF_CFLAGS) \ |
1979 | + $(COVERAGE_CFLAGS) \ |
1980 | -Wall -Werror \ |
1981 | -DINDICATOR_ICONS_DIR="\"$(INDICATORICONSDIR)\"" |
1982 | |
1983 | @@ -166,6 +173,9 @@ |
1984 | $(SESSIONSERVICE_LIBS) \ |
1985 | $(GTKLOGOUTHELPER_LIBS) \ |
1986 | $(GCONF_LIBS) |
1987 | + |
1988 | +gtk_logout_helper_LDFLAGS = \ |
1989 | + $(COVERAGE_LDFLAGS) |
1990 | endif |
1991 | |
1992 | |
1993 | |
1994 | === modified file 'src/Makefile.in' |
1995 | --- src/Makefile.in 2012-03-14 18:34:16 +0000 |
1996 | +++ src/Makefile.in 2012-04-05 17:54:28 +0000 |
1997 | @@ -61,7 +61,8 @@ |
1998 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1999 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
2000 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
2001 | - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac |
2002 | + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
2003 | + $(top_srcdir)/configure.ac |
2004 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
2005 | $(ACLOCAL_M4) |
2006 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
2007 | @@ -122,8 +123,8 @@ |
2008 | @BUILD_GTKLOGOUTHELPER_TRUE@ $(am__DEPENDENCIES_1) |
2009 | gtk_logout_helper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ |
2010 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ |
2011 | - $(gtk_logout_helper_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ |
2012 | - -o $@ |
2013 | + $(gtk_logout_helper_CFLAGS) $(CFLAGS) \ |
2014 | + $(gtk_logout_helper_LDFLAGS) $(LDFLAGS) -o $@ |
2015 | am__indicator_session_service_SOURCES_DIST = lock-helper.c \ |
2016 | lock-helper.h session-service.c session-dbus.c session-dbus.h \ |
2017 | gen-session-dbus.xml.c dbusmenu-shared.h settings-helper.c \ |
2018 | @@ -149,8 +150,8 @@ |
2019 | $(am__DEPENDENCIES_1) |
2020 | indicator_session_service_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ |
2021 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ |
2022 | - $(indicator_session_service_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ |
2023 | - $(LDFLAGS) -o $@ |
2024 | + $(indicator_session_service_CFLAGS) $(CFLAGS) \ |
2025 | + $(indicator_session_service_LDFLAGS) $(LDFLAGS) -o $@ |
2026 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) |
2027 | depcomp = $(SHELL) $(top_srcdir)/depcomp |
2028 | am__depfiles_maybe = depfiles |
2029 | @@ -201,6 +202,8 @@ |
2030 | CC = @CC@ |
2031 | CCDEPMODE = @CCDEPMODE@ |
2032 | CFLAGS = @CFLAGS@ |
2033 | +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
2034 | +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
2035 | CPP = @CPP@ |
2036 | CPPFLAGS = @CPPFLAGS@ |
2037 | CYGPATH_W = @CYGPATH_W@ |
2038 | @@ -217,6 +220,8 @@ |
2039 | EGREP = @EGREP@ |
2040 | EXEEXT = @EXEEXT@ |
2041 | FGREP = @FGREP@ |
2042 | +GCOVR = @GCOVR@ |
2043 | +GENHTML = @GENHTML@ |
2044 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
2045 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
2046 | GMOFILES = @GMOFILES@ |
2047 | @@ -245,6 +250,7 @@ |
2048 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
2049 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
2050 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
2051 | +LCOV = @LCOV@ |
2052 | LD = @LD@ |
2053 | LDFLAGS = @LDFLAGS@ |
2054 | LIBOBJS = @LIBOBJS@ |
2055 | @@ -290,6 +296,7 @@ |
2056 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
2057 | SET_MAKE = @SET_MAKE@ |
2058 | SHELL = @SHELL@ |
2059 | +SHTOOL = @SHTOOL@ |
2060 | STRIP = @STRIP@ |
2061 | USE_NLS = @USE_NLS@ |
2062 | VERSION = @VERSION@ |
2063 | @@ -373,11 +380,15 @@ |
2064 | |
2065 | libsession_la_CFLAGS = \ |
2066 | $(APPLET_CFLAGS) \ |
2067 | + $(COVERAGE_CFLAGS) \ |
2068 | -Wall -Werror \ |
2069 | -DG_LOG_DOMAIN=\"Indicator-Session\" |
2070 | |
2071 | libsession_la_LIBADD = $(APPLET_LIBS) |
2072 | -libsession_la_LDFLAGS = -module -avoid-version |
2073 | +libsession_la_LDFLAGS = \ |
2074 | + $(COVERAGE_LDFLAGS) \ |
2075 | + -module -avoid-version |
2076 | + |
2077 | |
2078 | ################# |
2079 | # Session Stuff |
2080 | @@ -394,13 +405,17 @@ |
2081 | -DLIBEXECDIR=\"$(libexecdir)\" \ |
2082 | -Wall -Werror \ |
2083 | -DG_LOG_DOMAIN=\"Indicator-Session\" \ |
2084 | - $(GUDEV_CFLAGS) |
2085 | + $(GUDEV_CFLAGS) \ |
2086 | + $(COVERAGE_CFLAGS) |
2087 | |
2088 | indicator_session_service_LDADD = \ |
2089 | $(SESSIONSERVICE_LIBS) \ |
2090 | $(GCONF_LIBS) \ |
2091 | $(GUDEV_LIBS) |
2092 | |
2093 | +indicator_session_service_LDFLAGS = \ |
2094 | + $(COVERAGE_LDFLAGS) |
2095 | + |
2096 | |
2097 | ################# |
2098 | # GTK Logout Stuff |
2099 | @@ -416,6 +431,7 @@ |
2100 | @BUILD_GTKLOGOUTHELPER_TRUE@ $(SESSIONSERVICE_CFLAGS) \ |
2101 | @BUILD_GTKLOGOUTHELPER_TRUE@ $(GTKLOGOUTHELPER_CFLAGS) \ |
2102 | @BUILD_GTKLOGOUTHELPER_TRUE@ $(GCONF_CFLAGS) \ |
2103 | +@BUILD_GTKLOGOUTHELPER_TRUE@ $(COVERAGE_CFLAGS) \ |
2104 | @BUILD_GTKLOGOUTHELPER_TRUE@ -Wall -Werror \ |
2105 | @BUILD_GTKLOGOUTHELPER_TRUE@ -DINDICATOR_ICONS_DIR="\"$(INDICATORICONSDIR)\"" |
2106 | |
2107 | @@ -424,6 +440,9 @@ |
2108 | @BUILD_GTKLOGOUTHELPER_TRUE@ $(GTKLOGOUTHELPER_LIBS) \ |
2109 | @BUILD_GTKLOGOUTHELPER_TRUE@ $(GCONF_LIBS) |
2110 | |
2111 | +@BUILD_GTKLOGOUTHELPER_TRUE@gtk_logout_helper_LDFLAGS = \ |
2112 | +@BUILD_GTKLOGOUTHELPER_TRUE@ $(COVERAGE_LDFLAGS) |
2113 | + |
2114 | |
2115 | ############### |
2116 | # Other Stuff |
2117 | |
2118 | === modified file 'src/gtk-logout-helper.c' |
2119 | --- src/gtk-logout-helper.c 2011-09-27 14:52:56 +0000 |
2120 | +++ src/gtk-logout-helper.c 2012-04-05 17:54:28 +0000 |
2121 | @@ -22,6 +22,7 @@ |
2122 | */ |
2123 | |
2124 | #include <config.h> |
2125 | +#include <locale.h> |
2126 | #include <glib.h> |
2127 | #include <gtk/gtk.h> |
2128 | #include <dbus/dbus-glib.h> |
2129 | |
2130 | === modified file 'src/session-service.c' |
2131 | --- src/session-service.c 2012-02-08 03:14:45 +0000 |
2132 | +++ src/session-service.c 2012-04-05 17:54:28 +0000 |
2133 | @@ -26,6 +26,7 @@ |
2134 | #include <config.h> |
2135 | |
2136 | #include <unistd.h> |
2137 | +#include <locale.h> |
2138 | |
2139 | #include <glib/gi18n.h> |
2140 | #include <gio/gio.h> |