Merge lp:~indicator-applet-developers/ubuntu/precise/indicator-printers/upstream into lp:~ubuntu-desktop/indicator-printers/ubuntu
- Precise (12.04)
- upstream
- Merge into ubuntu
Proposed by
Ted Gould
Status: | Merged |
---|---|
Merged at revision: | 55 |
Proposed branch: | lp:~indicator-applet-developers/ubuntu/precise/indicator-printers/upstream |
Merge into: | lp:~ubuntu-desktop/indicator-printers/ubuntu |
Diff against target: |
1140 lines (+603/-64) 11 files modified
Makefile.am (+2/-0) Makefile.am.coverage (+48/-0) Makefile.in (+70/-21) configure (+309/-10) configure.ac (+13/-1) data/Makefile.in (+8/-1) debian/changelog (+7/-0) m4/gcov.m4 (+86/-0) src/Makefile.am (+6/-1) src/Makefile.in (+46/-29) test/Makefile.in (+8/-1) |
To merge this branch: | bzr merge lp:~indicator-applet-developers/ubuntu/precise/indicator-printers/upstream |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ken VanDine | Pending | ||
Review via email: mp+100870@code.launchpad.net |
Commit message
Description of the change
0.1.6
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 'Makefile.am' |
2 | --- Makefile.am 2012-02-16 18:54:07 +0000 |
3 | +++ Makefile.am 2012-04-04 20:12:19 +0000 |
4 | @@ -2,3 +2,5 @@ |
5 | SUBDIRS = src data test po |
6 | |
7 | DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall |
8 | + |
9 | +include $(top_srcdir)/Makefile.am.coverage |
10 | |
11 | === added file 'Makefile.am.coverage' |
12 | --- Makefile.am.coverage 1970-01-01 00:00:00 +0000 |
13 | +++ Makefile.am.coverage 2012-04-04 20:12:19 +0000 |
14 | @@ -0,0 +1,48 @@ |
15 | + |
16 | +# Coverage targets |
17 | + |
18 | +.PHONY: clean-gcno clean-gcda \ |
19 | + coverage-html generate-coverage-html clean-coverage-html \ |
20 | + coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr |
21 | + |
22 | +clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr |
23 | + |
24 | +if HAVE_GCOV |
25 | + |
26 | +clean-gcno: |
27 | + @echo Removing old coverage instrumentation |
28 | + -find -name '*.gcno' -print | xargs -r rm |
29 | + |
30 | +clean-gcda: |
31 | + @echo Removing old coverage results |
32 | + -find -name '*.gcda' -print | xargs -r rm |
33 | + |
34 | +coverage-html: clean-gcda |
35 | + -$(MAKE) $(AM_MAKEFLAGS) -k check |
36 | + $(MAKE) $(AM_MAKEFLAGS) generate-coverage-html |
37 | + |
38 | +generate-coverage-html: |
39 | + @echo Collecting coverage data |
40 | + $(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool |
41 | + LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info |
42 | + |
43 | +clean-coverage-html: clean-gcda |
44 | + -$(LCOV) --directory $(top_builddir) -z |
45 | + -rm -rf coverage.info coveragereport |
46 | + |
47 | +if HAVE_GCOVR |
48 | + |
49 | +coverage-gcovr: clean-gcda |
50 | + -$(MAKE) $(AM_MAKEFLAGS) -k check |
51 | + $(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr |
52 | + |
53 | +generate-coverage-gcovr: |
54 | + @echo Generating coverage GCOVR report |
55 | + $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml |
56 | + |
57 | +clean-coverage-gcovr: clean-gcda |
58 | + -rm -rf $(top_builddir)/coverage.xml |
59 | + |
60 | +endif # HAVE_GCOVR |
61 | + |
62 | +endif # HAVE_GCOV |
63 | |
64 | === modified file 'Makefile.in' |
65 | --- Makefile.in 2012-02-17 20:16:15 +0000 |
66 | +++ Makefile.in 2012-04-04 20:12:19 +0000 |
67 | @@ -14,6 +14,8 @@ |
68 | # PARTICULAR PURPOSE. |
69 | |
70 | @SET_MAKE@ |
71 | + |
72 | +# Coverage targets |
73 | VPATH = @srcdir@ |
74 | pkgdatadir = $(datadir)/@PACKAGE@ |
75 | pkgincludedir = $(includedir)/@PACKAGE@ |
76 | @@ -33,14 +35,15 @@ |
77 | POST_UNINSTALL = : |
78 | build_triplet = @build@ |
79 | host_triplet = @host@ |
80 | -subdir = . |
81 | DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ |
82 | $(srcdir)/Makefile.in $(srcdir)/config.h.in \ |
83 | - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ |
84 | - compile config.guess config.sub depcomp install-sh ltmain.sh \ |
85 | - missing mkinstalldirs |
86 | + $(top_srcdir)/Makefile.am.coverage $(top_srcdir)/configure \ |
87 | + AUTHORS COPYING ChangeLog INSTALL NEWS compile config.guess \ |
88 | + config.sub depcomp install-sh ltmain.sh missing mkinstalldirs |
89 | +subdir = . |
90 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
91 | -am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
92 | +am__aclocal_m4_deps = $(top_srcdir)/m4/gcov.m4 \ |
93 | + $(top_srcdir)/configure.ac |
94 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
95 | $(ACLOCAL_M4) |
96 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
97 | @@ -129,6 +132,8 @@ |
98 | CC = @CC@ |
99 | CCDEPMODE = @CCDEPMODE@ |
100 | CFLAGS = @CFLAGS@ |
101 | +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
102 | +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
103 | CPP = @CPP@ |
104 | CPPFLAGS = @CPPFLAGS@ |
105 | CUPS_CONFIG = @CUPS_CONFIG@ |
106 | @@ -146,6 +151,8 @@ |
107 | EGREP = @EGREP@ |
108 | EXEEXT = @EXEEXT@ |
109 | FGREP = @FGREP@ |
110 | +GCOVR = @GCOVR@ |
111 | +GENHTML = @GENHTML@ |
112 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
113 | GMOFILES = @GMOFILES@ |
114 | GMSGFMT = @GMSGFMT@ |
115 | @@ -167,6 +174,7 @@ |
116 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
117 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
118 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
119 | +LCOV = @LCOV@ |
120 | LD = @LD@ |
121 | LDFLAGS = @LDFLAGS@ |
122 | LIBOBJS = @LIBOBJS@ |
123 | @@ -209,6 +217,7 @@ |
124 | SERVICE_LIBS = @SERVICE_LIBS@ |
125 | SET_MAKE = @SET_MAKE@ |
126 | SHELL = @SHELL@ |
127 | +SHTOOL = @SHTOOL@ |
128 | STRIP = @STRIP@ |
129 | USE_NLS = @USE_NLS@ |
130 | VERSION = @VERSION@ |
131 | @@ -275,7 +284,7 @@ |
132 | .SUFFIXES: |
133 | am--refresh: Makefile |
134 | @: |
135 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
136 | +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.coverage $(am__configure_deps) |
137 | @for dep in $?; do \ |
138 | case '$(am__configure_deps)' in \ |
139 | *$$dep*) \ |
140 | @@ -298,6 +307,7 @@ |
141 | echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ |
142 | cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ |
143 | esac; |
144 | +$(top_srcdir)/Makefile.am.coverage: |
145 | |
146 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
147 | $(SHELL) ./config.status --recheck |
148 | @@ -694,7 +704,7 @@ |
149 | @echo "it deletes files that may require special tools to rebuild." |
150 | clean: clean-recursive |
151 | |
152 | -clean-am: clean-generic clean-libtool mostlyclean-am |
153 | +clean-am: clean-generic clean-libtool clean-local mostlyclean-am |
154 | |
155 | distclean: distclean-recursive |
156 | -rm -f $(am__CONFIG_DISTCLEAN_FILES) |
157 | @@ -767,20 +777,59 @@ |
158 | |
159 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
160 | all all-am am--refresh check check-am clean clean-generic \ |
161 | - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ |
162 | - dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \ |
163 | - dist-zip distcheck distclean distclean-generic distclean-hdr \ |
164 | - distclean-libtool distclean-tags distcleancheck distdir \ |
165 | - distuninstallcheck dvi dvi-am html html-am info info-am \ |
166 | - install install-am install-data install-data-am install-dvi \ |
167 | - install-dvi-am install-exec install-exec-am install-html \ |
168 | - install-html-am install-info install-info-am install-man \ |
169 | - install-pdf install-pdf-am install-ps install-ps-am \ |
170 | - install-strip installcheck installcheck-am installdirs \ |
171 | - installdirs-am maintainer-clean maintainer-clean-generic \ |
172 | - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ |
173 | - ps ps-am tags tags-recursive uninstall uninstall-am |
174 | - |
175 | + clean-libtool clean-local ctags ctags-recursive dist dist-all \ |
176 | + dist-bzip2 dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ \ |
177 | + dist-xz dist-zip distcheck distclean distclean-generic \ |
178 | + distclean-hdr distclean-libtool distclean-tags distcleancheck \ |
179 | + distdir distuninstallcheck dvi dvi-am html html-am info \ |
180 | + info-am install install-am install-data install-data-am \ |
181 | + install-dvi install-dvi-am install-exec install-exec-am \ |
182 | + install-html install-html-am install-info install-info-am \ |
183 | + install-man install-pdf install-pdf-am install-ps \ |
184 | + install-ps-am install-strip installcheck installcheck-am \ |
185 | + installdirs installdirs-am maintainer-clean \ |
186 | + maintainer-clean-generic mostlyclean mostlyclean-generic \ |
187 | + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ |
188 | + uninstall uninstall-am |
189 | + |
190 | + |
191 | +.PHONY: clean-gcno clean-gcda \ |
192 | + coverage-html generate-coverage-html clean-coverage-html \ |
193 | + coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr |
194 | + |
195 | +clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr |
196 | + |
197 | +@HAVE_GCOV_TRUE@clean-gcno: |
198 | +@HAVE_GCOV_TRUE@ @echo Removing old coverage instrumentation |
199 | +@HAVE_GCOV_TRUE@ -find -name '*.gcno' -print | xargs -r rm |
200 | + |
201 | +@HAVE_GCOV_TRUE@clean-gcda: |
202 | +@HAVE_GCOV_TRUE@ @echo Removing old coverage results |
203 | +@HAVE_GCOV_TRUE@ -find -name '*.gcda' -print | xargs -r rm |
204 | + |
205 | +@HAVE_GCOV_TRUE@coverage-html: clean-gcda |
206 | +@HAVE_GCOV_TRUE@ -$(MAKE) $(AM_MAKEFLAGS) -k check |
207 | +@HAVE_GCOV_TRUE@ $(MAKE) $(AM_MAKEFLAGS) generate-coverage-html |
208 | + |
209 | +@HAVE_GCOV_TRUE@generate-coverage-html: |
210 | +@HAVE_GCOV_TRUE@ @echo Collecting coverage data |
211 | +@HAVE_GCOV_TRUE@ $(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool |
212 | +@HAVE_GCOV_TRUE@ LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info |
213 | + |
214 | +@HAVE_GCOV_TRUE@clean-coverage-html: clean-gcda |
215 | +@HAVE_GCOV_TRUE@ -$(LCOV) --directory $(top_builddir) -z |
216 | +@HAVE_GCOV_TRUE@ -rm -rf coverage.info coveragereport |
217 | + |
218 | +@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@coverage-gcovr: clean-gcda |
219 | +@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ -$(MAKE) $(AM_MAKEFLAGS) -k check |
220 | +@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ $(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr |
221 | + |
222 | +@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@generate-coverage-gcovr: |
223 | +@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ @echo Generating coverage GCOVR report |
224 | +@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml |
225 | + |
226 | +@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@clean-coverage-gcovr: clean-gcda |
227 | +@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ -rm -rf $(top_builddir)/coverage.xml |
228 | |
229 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
230 | # Otherwise a system limit (for SysV at least) may be exceeded. |
231 | |
232 | === modified file 'configure' |
233 | --- configure 2012-03-20 18:51:17 +0000 |
234 | +++ configure 2012-04-04 20:12:19 +0000 |
235 | @@ -1,6 +1,6 @@ |
236 | #! /bin/sh |
237 | # Guess values for system-dependent variables and create Makefiles. |
238 | -# Generated by GNU Autoconf 2.68 for indicator-printers 0.1.5. |
239 | +# Generated by GNU Autoconf 2.68 for indicator-printers 0.1.6. |
240 | # |
241 | # |
242 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
243 | @@ -567,8 +567,8 @@ |
244 | # Identity of this package. |
245 | PACKAGE_NAME='indicator-printers' |
246 | PACKAGE_TARNAME='indicator-printers' |
247 | -PACKAGE_VERSION='0.1.5' |
248 | -PACKAGE_STRING='indicator-printers 0.1.5' |
249 | +PACKAGE_VERSION='0.1.6' |
250 | +PACKAGE_STRING='indicator-printers 0.1.6' |
251 | PACKAGE_BUGREPORT='' |
252 | PACKAGE_URL='' |
253 | |
254 | @@ -613,6 +613,18 @@ |
255 | LTLIBOBJS |
256 | LIBOBJS |
257 | AM_CFLAGS |
258 | +COVERAGE_LDFLAGS |
259 | +COVERAGE_CFLAGS |
260 | +HAVE_GCOVR_FALSE |
261 | +HAVE_GCOVR_TRUE |
262 | +HAVE_LCOV_FALSE |
263 | +HAVE_LCOV_TRUE |
264 | +HAVE_GCOV_FALSE |
265 | +HAVE_GCOV_TRUE |
266 | +GCOVR |
267 | +GENHTML |
268 | +LCOV |
269 | +SHTOOL |
270 | DBUSSERVICEDIR |
271 | INDICATORICONSDIR |
272 | INDICATORDIR |
273 | @@ -798,6 +810,7 @@ |
274 | enable_silent_rules |
275 | enable_nls |
276 | enable_localinstall |
277 | +enable_gcov |
278 | ' |
279 | ac_precious_vars='build_alias |
280 | host_alias |
281 | @@ -1357,7 +1370,7 @@ |
282 | # Omit some internal or obsolete options to make the list less imposing. |
283 | # This message is too long to be a string in the A/UX 3.1 sh. |
284 | cat <<_ACEOF |
285 | -\`configure' configures indicator-printers 0.1.5 to adapt to many kinds of systems. |
286 | +\`configure' configures indicator-printers 0.1.6 to adapt to many kinds of systems. |
287 | |
288 | Usage: $0 [OPTION]... [VAR=VALUE]... |
289 | |
290 | @@ -1428,7 +1441,7 @@ |
291 | |
292 | if test -n "$ac_init_help"; then |
293 | case $ac_init_help in |
294 | - short | recursive ) echo "Configuration of indicator-printers 0.1.5:";; |
295 | + short | recursive ) echo "Configuration of indicator-printers 0.1.6:";; |
296 | esac |
297 | cat <<\_ACEOF |
298 | |
299 | @@ -1447,6 +1460,7 @@ |
300 | --disable-silent-rules verbose build output (undo: `make V=0') |
301 | --disable-nls do not use Native Language Support |
302 | --enable-localinstall install all files locally (for distcheck) |
303 | + --enable-gcov enable coverage testing with gcov |
304 | |
305 | Optional Packages: |
306 | --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] |
307 | @@ -1545,7 +1559,7 @@ |
308 | test -n "$ac_init_help" && exit $ac_status |
309 | if $ac_init_version; then |
310 | cat <<\_ACEOF |
311 | -indicator-printers configure 0.1.5 |
312 | +indicator-printers configure 0.1.6 |
313 | generated by GNU Autoconf 2.68 |
314 | |
315 | Copyright (C) 2010 Free Software Foundation, Inc. |
316 | @@ -1910,7 +1924,7 @@ |
317 | This file contains any messages produced by compilers while |
318 | running configure, to aid debugging if configure makes a mistake. |
319 | |
320 | -It was created by indicator-printers $as_me 0.1.5, which was |
321 | +It was created by indicator-printers $as_me 0.1.6, which was |
322 | generated by GNU Autoconf 2.68. Invocation command line was |
323 | |
324 | $ $0 $@ |
325 | @@ -2727,7 +2741,7 @@ |
326 | |
327 | # Define the identity of the package. |
328 | PACKAGE='indicator-printers' |
329 | - VERSION='0.1.5' |
330 | + VERSION='0.1.6' |
331 | |
332 | |
333 | cat >>confdefs.h <<_ACEOF |
334 | @@ -11511,6 +11525,7 @@ |
335 | |
336 | |
337 | |
338 | + |
339 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 |
340 | $as_echo_n "checking whether NLS is requested... " >&6; } |
341 | # Check whether --enable-nls was given. |
342 | @@ -13235,6 +13250,278 @@ |
343 | fi |
344 | |
345 | |
346 | +########################### |
347 | +# gcov coverage reporting |
348 | +########################### |
349 | + |
350 | +# Checks for existence of coverage tools: |
351 | +# * gcov |
352 | +# * lcov |
353 | +# * genhtml |
354 | +# * gcovr |
355 | +# |
356 | +# Sets ac_cv_check_gcov to yes if tooling is present |
357 | +# and reports the executables to the variables LCOV, GCOVR and GENHTML. |
358 | + # AC_TDD_GCOV |
359 | + |
360 | + |
361 | + # Check whether --enable-gcov was given. |
362 | +if test "${enable_gcov+set}" = set; then : |
363 | + enableval=$enable_gcov; use_gcov=$enableval |
364 | +else |
365 | + use_gcov=no |
366 | +fi |
367 | + |
368 | + |
369 | + if test "x$use_gcov" = "xyes"; then |
370 | + # we need gcc: |
371 | + if test "$GCC" != "yes"; then |
372 | + as_fn_error $? "GCC is required for --enable-gcov" "$LINENO" 5 |
373 | + fi |
374 | + |
375 | + # Check if ccache is being used |
376 | + # Extract the first word of "shtool", so it can be a program name with args. |
377 | +set dummy shtool; ac_word=$2 |
378 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
379 | +$as_echo_n "checking for $ac_word... " >&6; } |
380 | +if ${ac_cv_prog_SHTOOL+:} false; then : |
381 | + $as_echo_n "(cached) " >&6 |
382 | +else |
383 | + if test -n "$SHTOOL"; then |
384 | + ac_cv_prog_SHTOOL="$SHTOOL" # Let the user override the test. |
385 | +else |
386 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
387 | +for as_dir in $PATH |
388 | +do |
389 | + IFS=$as_save_IFS |
390 | + test -z "$as_dir" && as_dir=. |
391 | + for ac_exec_ext in '' $ac_executable_extensions; do |
392 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
393 | + ac_cv_prog_SHTOOL="shtool" |
394 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
395 | + break 2 |
396 | + fi |
397 | +done |
398 | + done |
399 | +IFS=$as_save_IFS |
400 | + |
401 | +fi |
402 | +fi |
403 | +SHTOOL=$ac_cv_prog_SHTOOL |
404 | +if test -n "$SHTOOL"; then |
405 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHTOOL" >&5 |
406 | +$as_echo "$SHTOOL" >&6; } |
407 | +else |
408 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
409 | +$as_echo "no" >&6; } |
410 | +fi |
411 | + |
412 | + |
413 | + case `$SHTOOL path $CC` in |
414 | + *ccache*) gcc_ccache=yes;; |
415 | + *) gcc_ccache=no;; |
416 | + esac |
417 | + |
418 | + if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then |
419 | + 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 |
420 | + fi |
421 | + |
422 | + lcov_version_list="1.6 1.7 1.8 1.9" |
423 | + # Extract the first word of "lcov", so it can be a program name with args. |
424 | +set dummy lcov; ac_word=$2 |
425 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
426 | +$as_echo_n "checking for $ac_word... " >&6; } |
427 | +if ${ac_cv_prog_LCOV+:} false; then : |
428 | + $as_echo_n "(cached) " >&6 |
429 | +else |
430 | + if test -n "$LCOV"; then |
431 | + ac_cv_prog_LCOV="$LCOV" # Let the user override the test. |
432 | +else |
433 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
434 | +for as_dir in $PATH |
435 | +do |
436 | + IFS=$as_save_IFS |
437 | + test -z "$as_dir" && as_dir=. |
438 | + for ac_exec_ext in '' $ac_executable_extensions; do |
439 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
440 | + ac_cv_prog_LCOV="lcov" |
441 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
442 | + break 2 |
443 | + fi |
444 | +done |
445 | + done |
446 | +IFS=$as_save_IFS |
447 | + |
448 | +fi |
449 | +fi |
450 | +LCOV=$ac_cv_prog_LCOV |
451 | +if test -n "$LCOV"; then |
452 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCOV" >&5 |
453 | +$as_echo "$LCOV" >&6; } |
454 | +else |
455 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
456 | +$as_echo "no" >&6; } |
457 | +fi |
458 | + |
459 | + |
460 | + # Extract the first word of "genhtml", so it can be a program name with args. |
461 | +set dummy genhtml; ac_word=$2 |
462 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
463 | +$as_echo_n "checking for $ac_word... " >&6; } |
464 | +if ${ac_cv_prog_GENHTML+:} false; then : |
465 | + $as_echo_n "(cached) " >&6 |
466 | +else |
467 | + if test -n "$GENHTML"; then |
468 | + ac_cv_prog_GENHTML="$GENHTML" # Let the user override the test. |
469 | +else |
470 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
471 | +for as_dir in $PATH |
472 | +do |
473 | + IFS=$as_save_IFS |
474 | + test -z "$as_dir" && as_dir=. |
475 | + for ac_exec_ext in '' $ac_executable_extensions; do |
476 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
477 | + ac_cv_prog_GENHTML="genhtml" |
478 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
479 | + break 2 |
480 | + fi |
481 | +done |
482 | + done |
483 | +IFS=$as_save_IFS |
484 | + |
485 | +fi |
486 | +fi |
487 | +GENHTML=$ac_cv_prog_GENHTML |
488 | +if test -n "$GENHTML"; then |
489 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GENHTML" >&5 |
490 | +$as_echo "$GENHTML" >&6; } |
491 | +else |
492 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
493 | +$as_echo "no" >&6; } |
494 | +fi |
495 | + |
496 | + |
497 | + |
498 | + if test "$LCOV"; then |
499 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lcov version" >&5 |
500 | +$as_echo_n "checking for lcov version... " >&6; } |
501 | +if ${glib_cv_lcov_version+:} false; then : |
502 | + $as_echo_n "(cached) " >&6 |
503 | +else |
504 | + |
505 | + glib_cv_lcov_version=invalid |
506 | + lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'` |
507 | + for lcov_check_version in $lcov_version_list; do |
508 | + if test "$lcov_version" = "$lcov_check_version"; then |
509 | + glib_cv_lcov_version="$lcov_check_version (ok)" |
510 | + fi |
511 | + done |
512 | + |
513 | +fi |
514 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $glib_cv_lcov_version" >&5 |
515 | +$as_echo "$glib_cv_lcov_version" >&6; } |
516 | + else |
517 | + lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list" |
518 | + as_fn_error $? "$lcov_msg" "$LINENO" 5 |
519 | + fi |
520 | + |
521 | + case $glib_cv_lcov_version in |
522 | + ""|invalid) |
523 | + lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)." |
524 | + as_fn_error $? "$lcov_msg" "$LINENO" 5 |
525 | + LCOV="exit 0;" |
526 | + ;; |
527 | + esac |
528 | + |
529 | + if test -z "$GENHTML"; then |
530 | + as_fn_error $? "Could not find genhtml from the lcov package" "$LINENO" 5 |
531 | + fi |
532 | + |
533 | + ac_cv_check_gcov=yes |
534 | + ac_cv_check_lcov=yes |
535 | + |
536 | + # Remove all optimization flags from CFLAGS |
537 | + |
538 | + CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'` |
539 | + |
540 | + |
541 | + # Add the special gcc flags |
542 | + COVERAGE_CFLAGS="-O0 -fprofile-arcs -ftest-coverage" |
543 | + COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage" |
544 | + COVERAGE_LDFLAGS="-lgcov" |
545 | + |
546 | + # Check availability of gcovr |
547 | + # Extract the first word of "gcovr", so it can be a program name with args. |
548 | +set dummy gcovr; ac_word=$2 |
549 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
550 | +$as_echo_n "checking for $ac_word... " >&6; } |
551 | +if ${ac_cv_prog_GCOVR+:} false; then : |
552 | + $as_echo_n "(cached) " >&6 |
553 | +else |
554 | + if test -n "$GCOVR"; then |
555 | + ac_cv_prog_GCOVR="$GCOVR" # Let the user override the test. |
556 | +else |
557 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
558 | +for as_dir in $PATH |
559 | +do |
560 | + IFS=$as_save_IFS |
561 | + test -z "$as_dir" && as_dir=. |
562 | + for ac_exec_ext in '' $ac_executable_extensions; do |
563 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
564 | + ac_cv_prog_GCOVR="gcovr" |
565 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
566 | + break 2 |
567 | + fi |
568 | +done |
569 | + done |
570 | +IFS=$as_save_IFS |
571 | + |
572 | +fi |
573 | +fi |
574 | +GCOVR=$ac_cv_prog_GCOVR |
575 | +if test -n "$GCOVR"; then |
576 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCOVR" >&5 |
577 | +$as_echo "$GCOVR" >&6; } |
578 | +else |
579 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
580 | +$as_echo "no" >&6; } |
581 | +fi |
582 | + |
583 | + |
584 | + if test -z "$GCOVR"; then |
585 | + ac_cv_check_gcovr=no |
586 | + else |
587 | + ac_cv_check_gcovr=yes |
588 | + fi |
589 | + |
590 | +fi |
591 | + |
592 | + if test "x$ac_cv_check_gcov" = xyes; then |
593 | + HAVE_GCOV_TRUE= |
594 | + HAVE_GCOV_FALSE='#' |
595 | +else |
596 | + HAVE_GCOV_TRUE='#' |
597 | + HAVE_GCOV_FALSE= |
598 | +fi |
599 | + |
600 | + if test "x$ac_cv_check_lcov" = xyes; then |
601 | + HAVE_LCOV_TRUE= |
602 | + HAVE_LCOV_FALSE='#' |
603 | +else |
604 | + HAVE_LCOV_TRUE='#' |
605 | + HAVE_LCOV_FALSE= |
606 | +fi |
607 | + |
608 | + if test "x$ac_cv_check_gcovr" = xyes; then |
609 | + HAVE_GCOVR_TRUE= |
610 | + HAVE_GCOVR_FALSE='#' |
611 | +else |
612 | + HAVE_GCOVR_TRUE='#' |
613 | + HAVE_GCOVR_FALSE= |
614 | +fi |
615 | + |
616 | + |
617 | + |
618 | |
619 | AM_CFLAGS="-Wall" |
620 | |
621 | @@ -13368,6 +13655,18 @@ |
622 | ac_config_commands="$ac_config_commands po/stamp-it" |
623 | |
624 | |
625 | +if test -z "${HAVE_GCOV_TRUE}" && test -z "${HAVE_GCOV_FALSE}"; then |
626 | + as_fn_error $? "conditional \"HAVE_GCOV\" was never defined. |
627 | +Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
628 | +fi |
629 | +if test -z "${HAVE_LCOV_TRUE}" && test -z "${HAVE_LCOV_FALSE}"; then |
630 | + as_fn_error $? "conditional \"HAVE_LCOV\" was never defined. |
631 | +Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
632 | +fi |
633 | +if test -z "${HAVE_GCOVR_TRUE}" && test -z "${HAVE_GCOVR_FALSE}"; then |
634 | + as_fn_error $? "conditional \"HAVE_GCOVR\" was never defined. |
635 | +Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
636 | +fi |
637 | |
638 | : "${CONFIG_STATUS=./config.status}" |
639 | ac_write_fail=0 |
640 | @@ -13777,7 +14076,7 @@ |
641 | # report actual input values of CONFIG_FILES etc. instead of their |
642 | # values after options handling. |
643 | ac_log=" |
644 | -This file was extended by indicator-printers $as_me 0.1.5, which was |
645 | +This file was extended by indicator-printers $as_me 0.1.6, which was |
646 | generated by GNU Autoconf 2.68. Invocation command line was |
647 | |
648 | CONFIG_FILES = $CONFIG_FILES |
649 | @@ -13843,7 +14142,7 @@ |
650 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
651 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
652 | ac_cs_version="\\ |
653 | -indicator-printers config.status 0.1.5 |
654 | +indicator-printers config.status 0.1.6 |
655 | configured by $0, generated by GNU Autoconf 2.68, |
656 | with options \\"\$ac_cs_config\\" |
657 | |
658 | |
659 | === modified file 'configure.ac' |
660 | --- configure.ac 2012-03-20 18:51:17 +0000 |
661 | +++ configure.ac 2012-04-04 20:12:19 +0000 |
662 | @@ -1,5 +1,5 @@ |
663 | |
664 | -AC_INIT(indicator-printers, 0.1.5) |
665 | +AC_INIT(indicator-printers, 0.1.6) |
666 | |
667 | AC_PREREQ(2.53) |
668 | AM_INIT_AUTOMAKE([]) |
669 | @@ -9,6 +9,7 @@ |
670 | AC_PROG_LIBTOOL |
671 | AM_PROG_CC_C_O |
672 | AM_SILENT_RULES([yes]) |
673 | +AC_CONFIG_MACRO_DIR([m4]) |
674 | |
675 | IT_PROG_INTLTOOL([0.35.0]) |
676 | GETTEXT_PACKAGE=indicator-printers |
677 | @@ -68,6 +69,17 @@ |
678 | fi |
679 | AC_SUBST(DBUSSERVICEDIR) |
680 | |
681 | +########################### |
682 | +# gcov coverage reporting |
683 | +########################### |
684 | + |
685 | +m4_include([m4/gcov.m4]) |
686 | +AC_TDD_GCOV |
687 | +AM_CONDITIONAL([HAVE_GCOV], [test "x$ac_cv_check_gcov" = xyes]) |
688 | +AM_CONDITIONAL([HAVE_LCOV], [test "x$ac_cv_check_lcov" = xyes]) |
689 | +AM_CONDITIONAL([HAVE_GCOVR], [test "x$ac_cv_check_gcovr" = xyes]) |
690 | +AC_SUBST(COVERAGE_CFLAGS) |
691 | +AC_SUBST(COVERAGE_LDFLAGS) |
692 | |
693 | AC_SUBST(AM_CFLAGS, "-Wall") |
694 | |
695 | |
696 | === modified file 'data/Makefile.in' |
697 | --- data/Makefile.in 2012-02-17 20:19:11 +0000 |
698 | +++ data/Makefile.in 2012-04-04 20:12:19 +0000 |
699 | @@ -37,7 +37,8 @@ |
700 | subdir = data |
701 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
702 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
703 | -am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
704 | +am__aclocal_m4_deps = $(top_srcdir)/m4/gcov.m4 \ |
705 | + $(top_srcdir)/configure.ac |
706 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
707 | $(ACLOCAL_M4) |
708 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
709 | @@ -99,6 +100,8 @@ |
710 | CC = @CC@ |
711 | CCDEPMODE = @CCDEPMODE@ |
712 | CFLAGS = @CFLAGS@ |
713 | +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
714 | +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
715 | CPP = @CPP@ |
716 | CPPFLAGS = @CPPFLAGS@ |
717 | CUPS_CONFIG = @CUPS_CONFIG@ |
718 | @@ -116,6 +119,8 @@ |
719 | EGREP = @EGREP@ |
720 | EXEEXT = @EXEEXT@ |
721 | FGREP = @FGREP@ |
722 | +GCOVR = @GCOVR@ |
723 | +GENHTML = @GENHTML@ |
724 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
725 | GMOFILES = @GMOFILES@ |
726 | GMSGFMT = @GMSGFMT@ |
727 | @@ -137,6 +142,7 @@ |
728 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
729 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
730 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
731 | +LCOV = @LCOV@ |
732 | LD = @LD@ |
733 | LDFLAGS = @LDFLAGS@ |
734 | LIBOBJS = @LIBOBJS@ |
735 | @@ -179,6 +185,7 @@ |
736 | SERVICE_LIBS = @SERVICE_LIBS@ |
737 | SET_MAKE = @SET_MAKE@ |
738 | SHELL = @SHELL@ |
739 | +SHTOOL = @SHTOOL@ |
740 | STRIP = @STRIP@ |
741 | USE_NLS = @USE_NLS@ |
742 | VERSION = @VERSION@ |
743 | |
744 | === modified file 'debian/changelog' |
745 | --- debian/changelog 2012-03-20 17:50:46 +0000 |
746 | +++ debian/changelog 2012-04-04 20:12:19 +0000 |
747 | @@ -1,3 +1,10 @@ |
748 | +indicator-printers (0.1.6-0ubuntu1~ppa1) precise; urgency=low |
749 | + |
750 | + * New upstream release. |
751 | + * Add test coverage build targets |
752 | + |
753 | + -- Ted Gould <ted@ubuntu.com> Wed, 04 Apr 2012 15:05:58 -0500 |
754 | + |
755 | indicator-printers (0.1.5-0ubuntu1) precise; urgency=low |
756 | |
757 | * New upstream release. |
758 | |
759 | === added directory 'm4' |
760 | === added file 'm4/gcov.m4' |
761 | --- m4/gcov.m4 1970-01-01 00:00:00 +0000 |
762 | +++ m4/gcov.m4 2012-04-04 20:12:19 +0000 |
763 | @@ -0,0 +1,86 @@ |
764 | +# Checks for existence of coverage tools: |
765 | +# * gcov |
766 | +# * lcov |
767 | +# * genhtml |
768 | +# * gcovr |
769 | +# |
770 | +# Sets ac_cv_check_gcov to yes if tooling is present |
771 | +# and reports the executables to the variables LCOV, GCOVR and GENHTML. |
772 | +AC_DEFUN([AC_TDD_GCOV], |
773 | +[ |
774 | + AC_ARG_ENABLE(gcov, |
775 | + AS_HELP_STRING([--enable-gcov], |
776 | + [enable coverage testing with gcov]), |
777 | + [use_gcov=$enableval], [use_gcov=no]) |
778 | + |
779 | + if test "x$use_gcov" = "xyes"; then |
780 | + # we need gcc: |
781 | + if test "$GCC" != "yes"; then |
782 | + AC_MSG_ERROR([GCC is required for --enable-gcov]) |
783 | + fi |
784 | + |
785 | + # Check if ccache is being used |
786 | + AC_CHECK_PROG(SHTOOL, shtool, shtool) |
787 | + case `$SHTOOL path $CC` in |
788 | + *ccache*[)] gcc_ccache=yes;; |
789 | + *[)] gcc_ccache=no;; |
790 | + esac |
791 | + |
792 | + if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then |
793 | + AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.]) |
794 | + fi |
795 | + |
796 | + lcov_version_list="1.6 1.7 1.8 1.9" |
797 | + AC_CHECK_PROG(LCOV, lcov, lcov) |
798 | + AC_CHECK_PROG(GENHTML, genhtml, genhtml) |
799 | + |
800 | + if test "$LCOV"; then |
801 | + AC_CACHE_CHECK([for lcov version], glib_cv_lcov_version, [ |
802 | + glib_cv_lcov_version=invalid |
803 | + lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'` |
804 | + for lcov_check_version in $lcov_version_list; do |
805 | + if test "$lcov_version" = "$lcov_check_version"; then |
806 | + glib_cv_lcov_version="$lcov_check_version (ok)" |
807 | + fi |
808 | + done |
809 | + ]) |
810 | + else |
811 | + lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list" |
812 | + AC_MSG_ERROR([$lcov_msg]) |
813 | + fi |
814 | + |
815 | + case $glib_cv_lcov_version in |
816 | + ""|invalid[)] |
817 | + lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)." |
818 | + AC_MSG_ERROR([$lcov_msg]) |
819 | + LCOV="exit 0;" |
820 | + ;; |
821 | + esac |
822 | + |
823 | + if test -z "$GENHTML"; then |
824 | + AC_MSG_ERROR([Could not find genhtml from the lcov package]) |
825 | + fi |
826 | + |
827 | + ac_cv_check_gcov=yes |
828 | + ac_cv_check_lcov=yes |
829 | + |
830 | + # Remove all optimization flags from CFLAGS |
831 | + changequote({,}) |
832 | + CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'` |
833 | + changequote([,]) |
834 | + |
835 | + # Add the special gcc flags |
836 | + COVERAGE_CFLAGS="-O0 -fprofile-arcs -ftest-coverage" |
837 | + COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage" |
838 | + COVERAGE_LDFLAGS="-lgcov" |
839 | + |
840 | + # Check availability of gcovr |
841 | + AC_CHECK_PROG(GCOVR, gcovr, gcovr) |
842 | + if test -z "$GCOVR"; then |
843 | + ac_cv_check_gcovr=no |
844 | + else |
845 | + ac_cv_check_gcovr=yes |
846 | + fi |
847 | + |
848 | +fi |
849 | +]) # AC_TDD_GCOV |
850 | |
851 | === modified file 'src/Makefile.am' |
852 | --- src/Makefile.am 2012-02-16 18:45:24 +0000 |
853 | +++ src/Makefile.am 2012-04-04 20:12:19 +0000 |
854 | @@ -9,8 +9,11 @@ |
855 | dbus-names.h |
856 | |
857 | libprintersmenu_la_CPPFLAGS = $(APPLET_CFLAGS) |
858 | +libprintersmenu_la_CFLAGS = $(COVERAGE_CFLAGS) |
859 | libprintersmenu_la_LIBADD = $(APPLET_LIBS) -lm |
860 | -libprintersmenu_la_LDFLAGS = -module -avoid-version |
861 | +libprintersmenu_la_LDFLAGS = \ |
862 | + $(COVERAGE_LDFLAGS) \ |
863 | + -module -avoid-version |
864 | |
865 | |
866 | cups_notifier_sources = \ |
867 | @@ -39,7 +42,9 @@ |
868 | nodist_indicator_printers_service_SOURCES = $(cups_notifier_sources) |
869 | |
870 | indicator_printers_service_CPPFLAGS = $(SERVICE_CFLAGS) |
871 | +indicator_printers_service_CFLAGS = $(COVERAGE_CFLAGS) |
872 | indicator_printers_service_LDADD = $(SERVICE_LIBS) |
873 | +indicator_printers_service_LDFLAGS = $(COVERAGE_LDFLAGS) |
874 | |
875 | |
876 | BUILT_SOURCES = $(cups_notifier_sources) |
877 | |
878 | === modified file 'src/Makefile.in' |
879 | --- src/Makefile.in 2012-02-17 20:16:15 +0000 |
880 | +++ src/Makefile.in 2012-04-04 20:12:19 +0000 |
881 | @@ -39,7 +39,8 @@ |
882 | subdir = src |
883 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
884 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
885 | -am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
886 | +am__aclocal_m4_deps = $(top_srcdir)/m4/gcov.m4 \ |
887 | + $(top_srcdir)/configure.ac |
888 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
889 | $(ACLOCAL_M4) |
890 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
891 | @@ -87,8 +88,8 @@ |
892 | am__v_lt_0 = --silent |
893 | libprintersmenu_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ |
894 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ |
895 | - $(AM_CFLAGS) $(CFLAGS) $(libprintersmenu_la_LDFLAGS) \ |
896 | - $(LDFLAGS) -o $@ |
897 | + $(libprintersmenu_la_CFLAGS) $(CFLAGS) \ |
898 | + $(libprintersmenu_la_LDFLAGS) $(LDFLAGS) -o $@ |
899 | PROGRAMS = $(libexec_PROGRAMS) |
900 | am_indicator_printers_service_OBJECTS = indicator_printers_service-indicator-printers-service.$(OBJEXT) \ |
901 | indicator_printers_service-indicator-printers-menu.$(OBJEXT) \ |
902 | @@ -100,6 +101,10 @@ |
903 | $(am_indicator_printers_service_OBJECTS) \ |
904 | $(nodist_indicator_printers_service_OBJECTS) |
905 | indicator_printers_service_DEPENDENCIES = $(am__DEPENDENCIES_1) |
906 | +indicator_printers_service_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ |
907 | + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ |
908 | + $(indicator_printers_service_CFLAGS) $(CFLAGS) \ |
909 | + $(indicator_printers_service_LDFLAGS) $(LDFLAGS) -o $@ |
910 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) |
911 | depcomp = $(SHELL) $(top_srcdir)/depcomp |
912 | am__depfiles_maybe = depfiles |
913 | @@ -151,6 +156,8 @@ |
914 | CC = @CC@ |
915 | CCDEPMODE = @CCDEPMODE@ |
916 | CFLAGS = @CFLAGS@ |
917 | +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
918 | +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
919 | CPP = @CPP@ |
920 | CPPFLAGS = @CPPFLAGS@ |
921 | CUPS_CONFIG = @CUPS_CONFIG@ |
922 | @@ -168,6 +175,8 @@ |
923 | EGREP = @EGREP@ |
924 | EXEEXT = @EXEEXT@ |
925 | FGREP = @FGREP@ |
926 | +GCOVR = @GCOVR@ |
927 | +GENHTML = @GENHTML@ |
928 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
929 | GMOFILES = @GMOFILES@ |
930 | GMSGFMT = @GMSGFMT@ |
931 | @@ -189,6 +198,7 @@ |
932 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
933 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
934 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
935 | +LCOV = @LCOV@ |
936 | LD = @LD@ |
937 | LDFLAGS = @LDFLAGS@ |
938 | LIBOBJS = @LIBOBJS@ |
939 | @@ -231,6 +241,7 @@ |
940 | SERVICE_LIBS = @SERVICE_LIBS@ |
941 | SET_MAKE = @SET_MAKE@ |
942 | SHELL = @SHELL@ |
943 | +SHTOOL = @SHTOOL@ |
944 | STRIP = @STRIP@ |
945 | USE_NLS = @USE_NLS@ |
946 | VERSION = @VERSION@ |
947 | @@ -299,8 +310,12 @@ |
948 | dbus-names.h |
949 | |
950 | libprintersmenu_la_CPPFLAGS = $(APPLET_CFLAGS) |
951 | +libprintersmenu_la_CFLAGS = $(COVERAGE_CFLAGS) |
952 | libprintersmenu_la_LIBADD = $(APPLET_LIBS) -lm |
953 | -libprintersmenu_la_LDFLAGS = -module -avoid-version |
954 | +libprintersmenu_la_LDFLAGS = \ |
955 | + $(COVERAGE_LDFLAGS) \ |
956 | + -module -avoid-version |
957 | + |
958 | cups_notifier_sources = \ |
959 | cups-notifier.c \ |
960 | cups-notifier.h |
961 | @@ -317,7 +332,9 @@ |
962 | |
963 | nodist_indicator_printers_service_SOURCES = $(cups_notifier_sources) |
964 | indicator_printers_service_CPPFLAGS = $(SERVICE_CFLAGS) |
965 | +indicator_printers_service_CFLAGS = $(COVERAGE_CFLAGS) |
966 | indicator_printers_service_LDADD = $(SERVICE_LIBS) |
967 | +indicator_printers_service_LDFLAGS = $(COVERAGE_LDFLAGS) |
968 | BUILT_SOURCES = $(cups_notifier_sources) |
969 | CLEANFILES = $(BUILT_SOURCES) |
970 | EXTRA_DIST = org.cups.cupsd.Notifier.xml |
971 | @@ -434,7 +451,7 @@ |
972 | rm -f $$list |
973 | indicator-printers-service$(EXEEXT): $(indicator_printers_service_OBJECTS) $(indicator_printers_service_DEPENDENCIES) $(EXTRA_indicator_printers_service_DEPENDENCIES) |
974 | @rm -f indicator-printers-service$(EXEEXT) |
975 | - $(AM_V_CCLD)$(LINK) $(indicator_printers_service_OBJECTS) $(indicator_printers_service_LDADD) $(LIBS) |
976 | + $(AM_V_CCLD)$(indicator_printers_service_LINK) $(indicator_printers_service_OBJECTS) $(indicator_printers_service_LDADD) $(LIBS) |
977 | |
978 | mostlyclean-compile: |
979 | -rm -f *.$(OBJEXT) |
980 | @@ -472,88 +489,88 @@ |
981 | @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< |
982 | |
983 | libprintersmenu_la-indicator-printers.lo: indicator-printers.c |
984 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintersmenu_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libprintersmenu_la-indicator-printers.lo -MD -MP -MF $(DEPDIR)/libprintersmenu_la-indicator-printers.Tpo -c -o libprintersmenu_la-indicator-printers.lo `test -f 'indicator-printers.c' || echo '$(srcdir)/'`indicator-printers.c |
985 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintersmenu_la_CPPFLAGS) $(CPPFLAGS) $(libprintersmenu_la_CFLAGS) $(CFLAGS) -MT libprintersmenu_la-indicator-printers.lo -MD -MP -MF $(DEPDIR)/libprintersmenu_la-indicator-printers.Tpo -c -o libprintersmenu_la-indicator-printers.lo `test -f 'indicator-printers.c' || echo '$(srcdir)/'`indicator-printers.c |
986 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libprintersmenu_la-indicator-printers.Tpo $(DEPDIR)/libprintersmenu_la-indicator-printers.Plo |
987 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-printers.c' object='libprintersmenu_la-indicator-printers.lo' libtool=yes @AMDEPBACKSLASH@ |
988 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
989 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintersmenu_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libprintersmenu_la-indicator-printers.lo `test -f 'indicator-printers.c' || echo '$(srcdir)/'`indicator-printers.c |
990 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintersmenu_la_CPPFLAGS) $(CPPFLAGS) $(libprintersmenu_la_CFLAGS) $(CFLAGS) -c -o libprintersmenu_la-indicator-printers.lo `test -f 'indicator-printers.c' || echo '$(srcdir)/'`indicator-printers.c |
991 | |
992 | libprintersmenu_la-indicator-menu-item.lo: indicator-menu-item.c |
993 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintersmenu_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libprintersmenu_la-indicator-menu-item.lo -MD -MP -MF $(DEPDIR)/libprintersmenu_la-indicator-menu-item.Tpo -c -o libprintersmenu_la-indicator-menu-item.lo `test -f 'indicator-menu-item.c' || echo '$(srcdir)/'`indicator-menu-item.c |
994 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintersmenu_la_CPPFLAGS) $(CPPFLAGS) $(libprintersmenu_la_CFLAGS) $(CFLAGS) -MT libprintersmenu_la-indicator-menu-item.lo -MD -MP -MF $(DEPDIR)/libprintersmenu_la-indicator-menu-item.Tpo -c -o libprintersmenu_la-indicator-menu-item.lo `test -f 'indicator-menu-item.c' || echo '$(srcdir)/'`indicator-menu-item.c |
995 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libprintersmenu_la-indicator-menu-item.Tpo $(DEPDIR)/libprintersmenu_la-indicator-menu-item.Plo |
996 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-menu-item.c' object='libprintersmenu_la-indicator-menu-item.lo' libtool=yes @AMDEPBACKSLASH@ |
997 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
998 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintersmenu_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libprintersmenu_la-indicator-menu-item.lo `test -f 'indicator-menu-item.c' || echo '$(srcdir)/'`indicator-menu-item.c |
999 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintersmenu_la_CPPFLAGS) $(CPPFLAGS) $(libprintersmenu_la_CFLAGS) $(CFLAGS) -c -o libprintersmenu_la-indicator-menu-item.lo `test -f 'indicator-menu-item.c' || echo '$(srcdir)/'`indicator-menu-item.c |
1000 | |
1001 | indicator_printers_service-indicator-printers-service.o: indicator-printers-service.c |
1002 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT indicator_printers_service-indicator-printers-service.o -MD -MP -MF $(DEPDIR)/indicator_printers_service-indicator-printers-service.Tpo -c -o indicator_printers_service-indicator-printers-service.o `test -f 'indicator-printers-service.c' || echo '$(srcdir)/'`indicator-printers-service.c |
1003 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(indicator_printers_service_CFLAGS) $(CFLAGS) -MT indicator_printers_service-indicator-printers-service.o -MD -MP -MF $(DEPDIR)/indicator_printers_service-indicator-printers-service.Tpo -c -o indicator_printers_service-indicator-printers-service.o `test -f 'indicator-printers-service.c' || echo '$(srcdir)/'`indicator-printers-service.c |
1004 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_printers_service-indicator-printers-service.Tpo $(DEPDIR)/indicator_printers_service-indicator-printers-service.Po |
1005 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-printers-service.c' object='indicator_printers_service-indicator-printers-service.o' libtool=no @AMDEPBACKSLASH@ |
1006 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
1007 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o indicator_printers_service-indicator-printers-service.o `test -f 'indicator-printers-service.c' || echo '$(srcdir)/'`indicator-printers-service.c |
1008 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(indicator_printers_service_CFLAGS) $(CFLAGS) -c -o indicator_printers_service-indicator-printers-service.o `test -f 'indicator-printers-service.c' || echo '$(srcdir)/'`indicator-printers-service.c |
1009 | |
1010 | indicator_printers_service-indicator-printers-service.obj: indicator-printers-service.c |
1011 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT indicator_printers_service-indicator-printers-service.obj -MD -MP -MF $(DEPDIR)/indicator_printers_service-indicator-printers-service.Tpo -c -o indicator_printers_service-indicator-printers-service.obj `if test -f 'indicator-printers-service.c'; then $(CYGPATH_W) 'indicator-printers-service.c'; else $(CYGPATH_W) '$(srcdir)/indicator-printers-service.c'; fi` |
1012 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(indicator_printers_service_CFLAGS) $(CFLAGS) -MT indicator_printers_service-indicator-printers-service.obj -MD -MP -MF $(DEPDIR)/indicator_printers_service-indicator-printers-service.Tpo -c -o indicator_printers_service-indicator-printers-service.obj `if test -f 'indicator-printers-service.c'; then $(CYGPATH_W) 'indicator-printers-service.c'; else $(CYGPATH_W) '$(srcdir)/indicator-printers-service.c'; fi` |
1013 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_printers_service-indicator-printers-service.Tpo $(DEPDIR)/indicator_printers_service-indicator-printers-service.Po |
1014 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-printers-service.c' object='indicator_printers_service-indicator-printers-service.obj' libtool=no @AMDEPBACKSLASH@ |
1015 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
1016 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o indicator_printers_service-indicator-printers-service.obj `if test -f 'indicator-printers-service.c'; then $(CYGPATH_W) 'indicator-printers-service.c'; else $(CYGPATH_W) '$(srcdir)/indicator-printers-service.c'; fi` |
1017 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(indicator_printers_service_CFLAGS) $(CFLAGS) -c -o indicator_printers_service-indicator-printers-service.obj `if test -f 'indicator-printers-service.c'; then $(CYGPATH_W) 'indicator-printers-service.c'; else $(CYGPATH_W) '$(srcdir)/indicator-printers-service.c'; fi` |
1018 | |
1019 | indicator_printers_service-indicator-printers-menu.o: indicator-printers-menu.c |
1020 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT indicator_printers_service-indicator-printers-menu.o -MD -MP -MF $(DEPDIR)/indicator_printers_service-indicator-printers-menu.Tpo -c -o indicator_printers_service-indicator-printers-menu.o `test -f 'indicator-printers-menu.c' || echo '$(srcdir)/'`indicator-printers-menu.c |
1021 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(indicator_printers_service_CFLAGS) $(CFLAGS) -MT indicator_printers_service-indicator-printers-menu.o -MD -MP -MF $(DEPDIR)/indicator_printers_service-indicator-printers-menu.Tpo -c -o indicator_printers_service-indicator-printers-menu.o `test -f 'indicator-printers-menu.c' || echo '$(srcdir)/'`indicator-printers-menu.c |
1022 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_printers_service-indicator-printers-menu.Tpo $(DEPDIR)/indicator_printers_service-indicator-printers-menu.Po |
1023 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-printers-menu.c' object='indicator_printers_service-indicator-printers-menu.o' libtool=no @AMDEPBACKSLASH@ |
1024 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
1025 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o indicator_printers_service-indicator-printers-menu.o `test -f 'indicator-printers-menu.c' || echo '$(srcdir)/'`indicator-printers-menu.c |
1026 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(indicator_printers_service_CFLAGS) $(CFLAGS) -c -o indicator_printers_service-indicator-printers-menu.o `test -f 'indicator-printers-menu.c' || echo '$(srcdir)/'`indicator-printers-menu.c |
1027 | |
1028 | indicator_printers_service-indicator-printers-menu.obj: indicator-printers-menu.c |
1029 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT indicator_printers_service-indicator-printers-menu.obj -MD -MP -MF $(DEPDIR)/indicator_printers_service-indicator-printers-menu.Tpo -c -o indicator_printers_service-indicator-printers-menu.obj `if test -f 'indicator-printers-menu.c'; then $(CYGPATH_W) 'indicator-printers-menu.c'; else $(CYGPATH_W) '$(srcdir)/indicator-printers-menu.c'; fi` |
1030 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(indicator_printers_service_CFLAGS) $(CFLAGS) -MT indicator_printers_service-indicator-printers-menu.obj -MD -MP -MF $(DEPDIR)/indicator_printers_service-indicator-printers-menu.Tpo -c -o indicator_printers_service-indicator-printers-menu.obj `if test -f 'indicator-printers-menu.c'; then $(CYGPATH_W) 'indicator-printers-menu.c'; else $(CYGPATH_W) '$(srcdir)/indicator-printers-menu.c'; fi` |
1031 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_printers_service-indicator-printers-menu.Tpo $(DEPDIR)/indicator_printers_service-indicator-printers-menu.Po |
1032 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-printers-menu.c' object='indicator_printers_service-indicator-printers-menu.obj' libtool=no @AMDEPBACKSLASH@ |
1033 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
1034 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o indicator_printers_service-indicator-printers-menu.obj `if test -f 'indicator-printers-menu.c'; then $(CYGPATH_W) 'indicator-printers-menu.c'; else $(CYGPATH_W) '$(srcdir)/indicator-printers-menu.c'; fi` |
1035 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(indicator_printers_service_CFLAGS) $(CFLAGS) -c -o indicator_printers_service-indicator-printers-menu.obj `if test -f 'indicator-printers-menu.c'; then $(CYGPATH_W) 'indicator-printers-menu.c'; else $(CYGPATH_W) '$(srcdir)/indicator-printers-menu.c'; fi` |
1036 | |
1037 | indicator_printers_service-indicator-printer-state-notifier.o: indicator-printer-state-notifier.c |
1038 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT indicator_printers_service-indicator-printer-state-notifier.o -MD -MP -MF $(DEPDIR)/indicator_printers_service-indicator-printer-state-notifier.Tpo -c -o indicator_printers_service-indicator-printer-state-notifier.o `test -f 'indicator-printer-state-notifier.c' || echo '$(srcdir)/'`indicator-printer-state-notifier.c |
1039 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(indicator_printers_service_CFLAGS) $(CFLAGS) -MT indicator_printers_service-indicator-printer-state-notifier.o -MD -MP -MF $(DEPDIR)/indicator_printers_service-indicator-printer-state-notifier.Tpo -c -o indicator_printers_service-indicator-printer-state-notifier.o `test -f 'indicator-printer-state-notifier.c' || echo '$(srcdir)/'`indicator-printer-state-notifier.c |
1040 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_printers_service-indicator-printer-state-notifier.Tpo $(DEPDIR)/indicator_printers_service-indicator-printer-state-notifier.Po |
1041 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-printer-state-notifier.c' object='indicator_printers_service-indicator-printer-state-notifier.o' libtool=no @AMDEPBACKSLASH@ |
1042 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
1043 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o indicator_printers_service-indicator-printer-state-notifier.o `test -f 'indicator-printer-state-notifier.c' || echo '$(srcdir)/'`indicator-printer-state-notifier.c |
1044 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(indicator_printers_service_CFLAGS) $(CFLAGS) -c -o indicator_printers_service-indicator-printer-state-notifier.o `test -f 'indicator-printer-state-notifier.c' || echo '$(srcdir)/'`indicator-printer-state-notifier.c |
1045 | |
1046 | indicator_printers_service-indicator-printer-state-notifier.obj: indicator-printer-state-notifier.c |
1047 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT indicator_printers_service-indicator-printer-state-notifier.obj -MD -MP -MF $(DEPDIR)/indicator_printers_service-indicator-printer-state-notifier.Tpo -c -o indicator_printers_service-indicator-printer-state-notifier.obj `if test -f 'indicator-printer-state-notifier.c'; then $(CYGPATH_W) 'indicator-printer-state-notifier.c'; else $(CYGPATH_W) '$(srcdir)/indicator-printer-state-notifier.c'; fi` |
1048 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(indicator_printers_service_CFLAGS) $(CFLAGS) -MT indicator_printers_service-indicator-printer-state-notifier.obj -MD -MP -MF $(DEPDIR)/indicator_printers_service-indicator-printer-state-notifier.Tpo -c -o indicator_printers_service-indicator-printer-state-notifier.obj `if test -f 'indicator-printer-state-notifier.c'; then $(CYGPATH_W) 'indicator-printer-state-notifier.c'; else $(CYGPATH_W) '$(srcdir)/indicator-printer-state-notifier.c'; fi` |
1049 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_printers_service-indicator-printer-state-notifier.Tpo $(DEPDIR)/indicator_printers_service-indicator-printer-state-notifier.Po |
1050 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-printer-state-notifier.c' object='indicator_printers_service-indicator-printer-state-notifier.obj' libtool=no @AMDEPBACKSLASH@ |
1051 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
1052 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o indicator_printers_service-indicator-printer-state-notifier.obj `if test -f 'indicator-printer-state-notifier.c'; then $(CYGPATH_W) 'indicator-printer-state-notifier.c'; else $(CYGPATH_W) '$(srcdir)/indicator-printer-state-notifier.c'; fi` |
1053 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(indicator_printers_service_CFLAGS) $(CFLAGS) -c -o indicator_printers_service-indicator-printer-state-notifier.obj `if test -f 'indicator-printer-state-notifier.c'; then $(CYGPATH_W) 'indicator-printer-state-notifier.c'; else $(CYGPATH_W) '$(srcdir)/indicator-printer-state-notifier.c'; fi` |
1054 | |
1055 | indicator_printers_service-spawn-printer-settings.o: spawn-printer-settings.c |
1056 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT indicator_printers_service-spawn-printer-settings.o -MD -MP -MF $(DEPDIR)/indicator_printers_service-spawn-printer-settings.Tpo -c -o indicator_printers_service-spawn-printer-settings.o `test -f 'spawn-printer-settings.c' || echo '$(srcdir)/'`spawn-printer-settings.c |
1057 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(indicator_printers_service_CFLAGS) $(CFLAGS) -MT indicator_printers_service-spawn-printer-settings.o -MD -MP -MF $(DEPDIR)/indicator_printers_service-spawn-printer-settings.Tpo -c -o indicator_printers_service-spawn-printer-settings.o `test -f 'spawn-printer-settings.c' || echo '$(srcdir)/'`spawn-printer-settings.c |
1058 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_printers_service-spawn-printer-settings.Tpo $(DEPDIR)/indicator_printers_service-spawn-printer-settings.Po |
1059 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='spawn-printer-settings.c' object='indicator_printers_service-spawn-printer-settings.o' libtool=no @AMDEPBACKSLASH@ |
1060 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
1061 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o indicator_printers_service-spawn-printer-settings.o `test -f 'spawn-printer-settings.c' || echo '$(srcdir)/'`spawn-printer-settings.c |
1062 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(indicator_printers_service_CFLAGS) $(CFLAGS) -c -o indicator_printers_service-spawn-printer-settings.o `test -f 'spawn-printer-settings.c' || echo '$(srcdir)/'`spawn-printer-settings.c |
1063 | |
1064 | indicator_printers_service-spawn-printer-settings.obj: spawn-printer-settings.c |
1065 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT indicator_printers_service-spawn-printer-settings.obj -MD -MP -MF $(DEPDIR)/indicator_printers_service-spawn-printer-settings.Tpo -c -o indicator_printers_service-spawn-printer-settings.obj `if test -f 'spawn-printer-settings.c'; then $(CYGPATH_W) 'spawn-printer-settings.c'; else $(CYGPATH_W) '$(srcdir)/spawn-printer-settings.c'; fi` |
1066 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(indicator_printers_service_CFLAGS) $(CFLAGS) -MT indicator_printers_service-spawn-printer-settings.obj -MD -MP -MF $(DEPDIR)/indicator_printers_service-spawn-printer-settings.Tpo -c -o indicator_printers_service-spawn-printer-settings.obj `if test -f 'spawn-printer-settings.c'; then $(CYGPATH_W) 'spawn-printer-settings.c'; else $(CYGPATH_W) '$(srcdir)/spawn-printer-settings.c'; fi` |
1067 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_printers_service-spawn-printer-settings.Tpo $(DEPDIR)/indicator_printers_service-spawn-printer-settings.Po |
1068 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='spawn-printer-settings.c' object='indicator_printers_service-spawn-printer-settings.obj' libtool=no @AMDEPBACKSLASH@ |
1069 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
1070 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o indicator_printers_service-spawn-printer-settings.obj `if test -f 'spawn-printer-settings.c'; then $(CYGPATH_W) 'spawn-printer-settings.c'; else $(CYGPATH_W) '$(srcdir)/spawn-printer-settings.c'; fi` |
1071 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(indicator_printers_service_CFLAGS) $(CFLAGS) -c -o indicator_printers_service-spawn-printer-settings.obj `if test -f 'spawn-printer-settings.c'; then $(CYGPATH_W) 'spawn-printer-settings.c'; else $(CYGPATH_W) '$(srcdir)/spawn-printer-settings.c'; fi` |
1072 | |
1073 | indicator_printers_service-cups-notifier.o: cups-notifier.c |
1074 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT indicator_printers_service-cups-notifier.o -MD -MP -MF $(DEPDIR)/indicator_printers_service-cups-notifier.Tpo -c -o indicator_printers_service-cups-notifier.o `test -f 'cups-notifier.c' || echo '$(srcdir)/'`cups-notifier.c |
1075 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(indicator_printers_service_CFLAGS) $(CFLAGS) -MT indicator_printers_service-cups-notifier.o -MD -MP -MF $(DEPDIR)/indicator_printers_service-cups-notifier.Tpo -c -o indicator_printers_service-cups-notifier.o `test -f 'cups-notifier.c' || echo '$(srcdir)/'`cups-notifier.c |
1076 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_printers_service-cups-notifier.Tpo $(DEPDIR)/indicator_printers_service-cups-notifier.Po |
1077 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cups-notifier.c' object='indicator_printers_service-cups-notifier.o' libtool=no @AMDEPBACKSLASH@ |
1078 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
1079 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o indicator_printers_service-cups-notifier.o `test -f 'cups-notifier.c' || echo '$(srcdir)/'`cups-notifier.c |
1080 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(indicator_printers_service_CFLAGS) $(CFLAGS) -c -o indicator_printers_service-cups-notifier.o `test -f 'cups-notifier.c' || echo '$(srcdir)/'`cups-notifier.c |
1081 | |
1082 | indicator_printers_service-cups-notifier.obj: cups-notifier.c |
1083 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT indicator_printers_service-cups-notifier.obj -MD -MP -MF $(DEPDIR)/indicator_printers_service-cups-notifier.Tpo -c -o indicator_printers_service-cups-notifier.obj `if test -f 'cups-notifier.c'; then $(CYGPATH_W) 'cups-notifier.c'; else $(CYGPATH_W) '$(srcdir)/cups-notifier.c'; fi` |
1084 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(indicator_printers_service_CFLAGS) $(CFLAGS) -MT indicator_printers_service-cups-notifier.obj -MD -MP -MF $(DEPDIR)/indicator_printers_service-cups-notifier.Tpo -c -o indicator_printers_service-cups-notifier.obj `if test -f 'cups-notifier.c'; then $(CYGPATH_W) 'cups-notifier.c'; else $(CYGPATH_W) '$(srcdir)/cups-notifier.c'; fi` |
1085 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_printers_service-cups-notifier.Tpo $(DEPDIR)/indicator_printers_service-cups-notifier.Po |
1086 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cups-notifier.c' object='indicator_printers_service-cups-notifier.obj' libtool=no @AMDEPBACKSLASH@ |
1087 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
1088 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o indicator_printers_service-cups-notifier.obj `if test -f 'cups-notifier.c'; then $(CYGPATH_W) 'cups-notifier.c'; else $(CYGPATH_W) '$(srcdir)/cups-notifier.c'; fi` |
1089 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(indicator_printers_service_CPPFLAGS) $(CPPFLAGS) $(indicator_printers_service_CFLAGS) $(CFLAGS) -c -o indicator_printers_service-cups-notifier.obj `if test -f 'cups-notifier.c'; then $(CYGPATH_W) 'cups-notifier.c'; else $(CYGPATH_W) '$(srcdir)/cups-notifier.c'; fi` |
1090 | |
1091 | mostlyclean-libtool: |
1092 | -rm -f *.lo |
1093 | |
1094 | === modified file 'test/Makefile.in' |
1095 | --- test/Makefile.in 2012-02-17 20:16:15 +0000 |
1096 | +++ test/Makefile.in 2012-04-04 20:12:19 +0000 |
1097 | @@ -38,7 +38,8 @@ |
1098 | subdir = test |
1099 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
1100 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
1101 | -am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
1102 | +am__aclocal_m4_deps = $(top_srcdir)/m4/gcov.m4 \ |
1103 | + $(top_srcdir)/configure.ac |
1104 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1105 | $(ACLOCAL_M4) |
1106 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1107 | @@ -106,6 +107,8 @@ |
1108 | CC = @CC@ |
1109 | CCDEPMODE = @CCDEPMODE@ |
1110 | CFLAGS = @CFLAGS@ |
1111 | +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
1112 | +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
1113 | CPP = @CPP@ |
1114 | CPPFLAGS = @CPPFLAGS@ |
1115 | CUPS_CONFIG = @CUPS_CONFIG@ |
1116 | @@ -123,6 +126,8 @@ |
1117 | EGREP = @EGREP@ |
1118 | EXEEXT = @EXEEXT@ |
1119 | FGREP = @FGREP@ |
1120 | +GCOVR = @GCOVR@ |
1121 | +GENHTML = @GENHTML@ |
1122 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1123 | GMOFILES = @GMOFILES@ |
1124 | GMSGFMT = @GMSGFMT@ |
1125 | @@ -144,6 +149,7 @@ |
1126 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1127 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1128 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1129 | +LCOV = @LCOV@ |
1130 | LD = @LD@ |
1131 | LDFLAGS = @LDFLAGS@ |
1132 | LIBOBJS = @LIBOBJS@ |
1133 | @@ -186,6 +192,7 @@ |
1134 | SERVICE_LIBS = @SERVICE_LIBS@ |
1135 | SET_MAKE = @SET_MAKE@ |
1136 | SHELL = @SHELL@ |
1137 | +SHTOOL = @SHTOOL@ |
1138 | STRIP = @STRIP@ |
1139 | USE_NLS = @USE_NLS@ |
1140 | VERSION = @VERSION@ |