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 | 2 | SUBDIRS = src data test po | 2 | SUBDIRS = src data test po |
6 | 3 | 3 | ||
7 | 4 | DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall | 4 | DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall |
8 | 5 | |||
9 | 6 | include $(top_srcdir)/Makefile.am.coverage | ||
10 | 5 | 7 | ||
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 | 1 | |||
16 | 2 | # Coverage targets | ||
17 | 3 | |||
18 | 4 | .PHONY: clean-gcno clean-gcda \ | ||
19 | 5 | coverage-html generate-coverage-html clean-coverage-html \ | ||
20 | 6 | coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr | ||
21 | 7 | |||
22 | 8 | clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr | ||
23 | 9 | |||
24 | 10 | if HAVE_GCOV | ||
25 | 11 | |||
26 | 12 | clean-gcno: | ||
27 | 13 | @echo Removing old coverage instrumentation | ||
28 | 14 | -find -name '*.gcno' -print | xargs -r rm | ||
29 | 15 | |||
30 | 16 | clean-gcda: | ||
31 | 17 | @echo Removing old coverage results | ||
32 | 18 | -find -name '*.gcda' -print | xargs -r rm | ||
33 | 19 | |||
34 | 20 | coverage-html: clean-gcda | ||
35 | 21 | -$(MAKE) $(AM_MAKEFLAGS) -k check | ||
36 | 22 | $(MAKE) $(AM_MAKEFLAGS) generate-coverage-html | ||
37 | 23 | |||
38 | 24 | generate-coverage-html: | ||
39 | 25 | @echo Collecting coverage data | ||
40 | 26 | $(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool | ||
41 | 27 | LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info | ||
42 | 28 | |||
43 | 29 | clean-coverage-html: clean-gcda | ||
44 | 30 | -$(LCOV) --directory $(top_builddir) -z | ||
45 | 31 | -rm -rf coverage.info coveragereport | ||
46 | 32 | |||
47 | 33 | if HAVE_GCOVR | ||
48 | 34 | |||
49 | 35 | coverage-gcovr: clean-gcda | ||
50 | 36 | -$(MAKE) $(AM_MAKEFLAGS) -k check | ||
51 | 37 | $(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr | ||
52 | 38 | |||
53 | 39 | generate-coverage-gcovr: | ||
54 | 40 | @echo Generating coverage GCOVR report | ||
55 | 41 | $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml | ||
56 | 42 | |||
57 | 43 | clean-coverage-gcovr: clean-gcda | ||
58 | 44 | -rm -rf $(top_builddir)/coverage.xml | ||
59 | 45 | |||
60 | 46 | endif # HAVE_GCOVR | ||
61 | 47 | |||
62 | 48 | endif # HAVE_GCOV | ||
63 | 0 | 49 | ||
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 | 14 | # PARTICULAR PURPOSE. | 14 | # PARTICULAR PURPOSE. |
69 | 15 | 15 | ||
70 | 16 | @SET_MAKE@ | 16 | @SET_MAKE@ |
71 | 17 | |||
72 | 18 | # Coverage targets | ||
73 | 17 | VPATH = @srcdir@ | 19 | VPATH = @srcdir@ |
74 | 18 | pkgdatadir = $(datadir)/@PACKAGE@ | 20 | pkgdatadir = $(datadir)/@PACKAGE@ |
75 | 19 | pkgincludedir = $(includedir)/@PACKAGE@ | 21 | pkgincludedir = $(includedir)/@PACKAGE@ |
76 | @@ -33,14 +35,15 @@ | |||
77 | 33 | POST_UNINSTALL = : | 35 | POST_UNINSTALL = : |
78 | 34 | build_triplet = @build@ | 36 | build_triplet = @build@ |
79 | 35 | host_triplet = @host@ | 37 | host_triplet = @host@ |
80 | 36 | subdir = . | ||
81 | 37 | DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ | 38 | DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ |
82 | 38 | $(srcdir)/Makefile.in $(srcdir)/config.h.in \ | 39 | $(srcdir)/Makefile.in $(srcdir)/config.h.in \ |
86 | 39 | $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ | 40 | $(top_srcdir)/Makefile.am.coverage $(top_srcdir)/configure \ |
87 | 40 | compile config.guess config.sub depcomp install-sh ltmain.sh \ | 41 | AUTHORS COPYING ChangeLog INSTALL NEWS compile config.guess \ |
88 | 41 | missing mkinstalldirs | 42 | config.sub depcomp install-sh ltmain.sh missing mkinstalldirs |
89 | 43 | subdir = . | ||
90 | 42 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 44 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
92 | 43 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac | 45 | am__aclocal_m4_deps = $(top_srcdir)/m4/gcov.m4 \ |
93 | 46 | $(top_srcdir)/configure.ac | ||
94 | 44 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 47 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
95 | 45 | $(ACLOCAL_M4) | 48 | $(ACLOCAL_M4) |
96 | 46 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ | 49 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
97 | @@ -129,6 +132,8 @@ | |||
98 | 129 | CC = @CC@ | 132 | CC = @CC@ |
99 | 130 | CCDEPMODE = @CCDEPMODE@ | 133 | CCDEPMODE = @CCDEPMODE@ |
100 | 131 | CFLAGS = @CFLAGS@ | 134 | CFLAGS = @CFLAGS@ |
101 | 135 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | ||
102 | 136 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | ||
103 | 132 | CPP = @CPP@ | 137 | CPP = @CPP@ |
104 | 133 | CPPFLAGS = @CPPFLAGS@ | 138 | CPPFLAGS = @CPPFLAGS@ |
105 | 134 | CUPS_CONFIG = @CUPS_CONFIG@ | 139 | CUPS_CONFIG = @CUPS_CONFIG@ |
106 | @@ -146,6 +151,8 @@ | |||
107 | 146 | EGREP = @EGREP@ | 151 | EGREP = @EGREP@ |
108 | 147 | EXEEXT = @EXEEXT@ | 152 | EXEEXT = @EXEEXT@ |
109 | 148 | FGREP = @FGREP@ | 153 | FGREP = @FGREP@ |
110 | 154 | GCOVR = @GCOVR@ | ||
111 | 155 | GENHTML = @GENHTML@ | ||
112 | 149 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ | 156 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
113 | 150 | GMOFILES = @GMOFILES@ | 157 | GMOFILES = @GMOFILES@ |
114 | 151 | GMSGFMT = @GMSGFMT@ | 158 | GMSGFMT = @GMSGFMT@ |
115 | @@ -167,6 +174,7 @@ | |||
116 | 167 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ | 174 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
117 | 168 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ | 175 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
118 | 169 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ | 176 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
119 | 177 | LCOV = @LCOV@ | ||
120 | 170 | LD = @LD@ | 178 | LD = @LD@ |
121 | 171 | LDFLAGS = @LDFLAGS@ | 179 | LDFLAGS = @LDFLAGS@ |
122 | 172 | LIBOBJS = @LIBOBJS@ | 180 | LIBOBJS = @LIBOBJS@ |
123 | @@ -209,6 +217,7 @@ | |||
124 | 209 | SERVICE_LIBS = @SERVICE_LIBS@ | 217 | SERVICE_LIBS = @SERVICE_LIBS@ |
125 | 210 | SET_MAKE = @SET_MAKE@ | 218 | SET_MAKE = @SET_MAKE@ |
126 | 211 | SHELL = @SHELL@ | 219 | SHELL = @SHELL@ |
127 | 220 | SHTOOL = @SHTOOL@ | ||
128 | 212 | STRIP = @STRIP@ | 221 | STRIP = @STRIP@ |
129 | 213 | USE_NLS = @USE_NLS@ | 222 | USE_NLS = @USE_NLS@ |
130 | 214 | VERSION = @VERSION@ | 223 | VERSION = @VERSION@ |
131 | @@ -275,7 +284,7 @@ | |||
132 | 275 | .SUFFIXES: | 284 | .SUFFIXES: |
133 | 276 | am--refresh: Makefile | 285 | am--refresh: Makefile |
134 | 277 | @: | 286 | @: |
136 | 278 | $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | 287 | $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.coverage $(am__configure_deps) |
137 | 279 | @for dep in $?; do \ | 288 | @for dep in $?; do \ |
138 | 280 | case '$(am__configure_deps)' in \ | 289 | case '$(am__configure_deps)' in \ |
139 | 281 | *$$dep*) \ | 290 | *$$dep*) \ |
140 | @@ -298,6 +307,7 @@ | |||
141 | 298 | echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ | 307 | echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ |
142 | 299 | cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ | 308 | cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ |
143 | 300 | esac; | 309 | esac; |
144 | 310 | $(top_srcdir)/Makefile.am.coverage: | ||
145 | 301 | 311 | ||
146 | 302 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | 312 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
147 | 303 | $(SHELL) ./config.status --recheck | 313 | $(SHELL) ./config.status --recheck |
148 | @@ -694,7 +704,7 @@ | |||
149 | 694 | @echo "it deletes files that may require special tools to rebuild." | 704 | @echo "it deletes files that may require special tools to rebuild." |
150 | 695 | clean: clean-recursive | 705 | clean: clean-recursive |
151 | 696 | 706 | ||
153 | 697 | clean-am: clean-generic clean-libtool mostlyclean-am | 707 | clean-am: clean-generic clean-libtool clean-local mostlyclean-am |
154 | 698 | 708 | ||
155 | 699 | distclean: distclean-recursive | 709 | distclean: distclean-recursive |
156 | 700 | -rm -f $(am__CONFIG_DISTCLEAN_FILES) | 710 | -rm -f $(am__CONFIG_DISTCLEAN_FILES) |
157 | @@ -767,20 +777,59 @@ | |||
158 | 767 | 777 | ||
159 | 768 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ | 778 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
160 | 769 | all all-am am--refresh check check-am clean clean-generic \ | 779 | all all-am am--refresh check check-am clean clean-generic \ |
175 | 770 | clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ | 780 | clean-libtool clean-local ctags ctags-recursive dist dist-all \ |
176 | 771 | dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \ | 781 | dist-bzip2 dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ \ |
177 | 772 | dist-zip distcheck distclean distclean-generic distclean-hdr \ | 782 | dist-xz dist-zip distcheck distclean distclean-generic \ |
178 | 773 | distclean-libtool distclean-tags distcleancheck distdir \ | 783 | distclean-hdr distclean-libtool distclean-tags distcleancheck \ |
179 | 774 | distuninstallcheck dvi dvi-am html html-am info info-am \ | 784 | distdir distuninstallcheck dvi dvi-am html html-am info \ |
180 | 775 | install install-am install-data install-data-am install-dvi \ | 785 | info-am install install-am install-data install-data-am \ |
181 | 776 | install-dvi-am install-exec install-exec-am install-html \ | 786 | install-dvi install-dvi-am install-exec install-exec-am \ |
182 | 777 | install-html-am install-info install-info-am install-man \ | 787 | install-html install-html-am install-info install-info-am \ |
183 | 778 | install-pdf install-pdf-am install-ps install-ps-am \ | 788 | install-man install-pdf install-pdf-am install-ps \ |
184 | 779 | install-strip installcheck installcheck-am installdirs \ | 789 | install-ps-am install-strip installcheck installcheck-am \ |
185 | 780 | installdirs-am maintainer-clean maintainer-clean-generic \ | 790 | installdirs installdirs-am maintainer-clean \ |
186 | 781 | mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ | 791 | maintainer-clean-generic mostlyclean mostlyclean-generic \ |
187 | 782 | ps ps-am tags tags-recursive uninstall uninstall-am | 792 | mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ |
188 | 783 | 793 | uninstall uninstall-am | |
189 | 794 | |||
190 | 795 | |||
191 | 796 | .PHONY: clean-gcno clean-gcda \ | ||
192 | 797 | coverage-html generate-coverage-html clean-coverage-html \ | ||
193 | 798 | coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr | ||
194 | 799 | |||
195 | 800 | clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr | ||
196 | 801 | |||
197 | 802 | @HAVE_GCOV_TRUE@clean-gcno: | ||
198 | 803 | @HAVE_GCOV_TRUE@ @echo Removing old coverage instrumentation | ||
199 | 804 | @HAVE_GCOV_TRUE@ -find -name '*.gcno' -print | xargs -r rm | ||
200 | 805 | |||
201 | 806 | @HAVE_GCOV_TRUE@clean-gcda: | ||
202 | 807 | @HAVE_GCOV_TRUE@ @echo Removing old coverage results | ||
203 | 808 | @HAVE_GCOV_TRUE@ -find -name '*.gcda' -print | xargs -r rm | ||
204 | 809 | |||
205 | 810 | @HAVE_GCOV_TRUE@coverage-html: clean-gcda | ||
206 | 811 | @HAVE_GCOV_TRUE@ -$(MAKE) $(AM_MAKEFLAGS) -k check | ||
207 | 812 | @HAVE_GCOV_TRUE@ $(MAKE) $(AM_MAKEFLAGS) generate-coverage-html | ||
208 | 813 | |||
209 | 814 | @HAVE_GCOV_TRUE@generate-coverage-html: | ||
210 | 815 | @HAVE_GCOV_TRUE@ @echo Collecting coverage data | ||
211 | 816 | @HAVE_GCOV_TRUE@ $(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool | ||
212 | 817 | @HAVE_GCOV_TRUE@ LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info | ||
213 | 818 | |||
214 | 819 | @HAVE_GCOV_TRUE@clean-coverage-html: clean-gcda | ||
215 | 820 | @HAVE_GCOV_TRUE@ -$(LCOV) --directory $(top_builddir) -z | ||
216 | 821 | @HAVE_GCOV_TRUE@ -rm -rf coverage.info coveragereport | ||
217 | 822 | |||
218 | 823 | @HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@coverage-gcovr: clean-gcda | ||
219 | 824 | @HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ -$(MAKE) $(AM_MAKEFLAGS) -k check | ||
220 | 825 | @HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ $(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr | ||
221 | 826 | |||
222 | 827 | @HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@generate-coverage-gcovr: | ||
223 | 828 | @HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ @echo Generating coverage GCOVR report | ||
224 | 829 | @HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml | ||
225 | 830 | |||
226 | 831 | @HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@clean-coverage-gcovr: clean-gcda | ||
227 | 832 | @HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ -rm -rf $(top_builddir)/coverage.xml | ||
228 | 784 | 833 | ||
229 | 785 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | 834 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
230 | 786 | # Otherwise a system limit (for SysV at least) may be exceeded. | 835 | # Otherwise a system limit (for SysV at least) may be exceeded. |
231 | 787 | 836 | ||
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 | 1 | #! /bin/sh | 1 | #! /bin/sh |
237 | 2 | # Guess values for system-dependent variables and create Makefiles. | 2 | # Guess values for system-dependent variables and create Makefiles. |
239 | 3 | # Generated by GNU Autoconf 2.68 for indicator-printers 0.1.5. | 3 | # Generated by GNU Autoconf 2.68 for indicator-printers 0.1.6. |
240 | 4 | # | 4 | # |
241 | 5 | # | 5 | # |
242 | 6 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | 6 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
243 | @@ -567,8 +567,8 @@ | |||
244 | 567 | # Identity of this package. | 567 | # Identity of this package. |
245 | 568 | PACKAGE_NAME='indicator-printers' | 568 | PACKAGE_NAME='indicator-printers' |
246 | 569 | PACKAGE_TARNAME='indicator-printers' | 569 | PACKAGE_TARNAME='indicator-printers' |
249 | 570 | PACKAGE_VERSION='0.1.5' | 570 | PACKAGE_VERSION='0.1.6' |
250 | 571 | PACKAGE_STRING='indicator-printers 0.1.5' | 571 | PACKAGE_STRING='indicator-printers 0.1.6' |
251 | 572 | PACKAGE_BUGREPORT='' | 572 | PACKAGE_BUGREPORT='' |
252 | 573 | PACKAGE_URL='' | 573 | PACKAGE_URL='' |
253 | 574 | 574 | ||
254 | @@ -613,6 +613,18 @@ | |||
255 | 613 | LTLIBOBJS | 613 | LTLIBOBJS |
256 | 614 | LIBOBJS | 614 | LIBOBJS |
257 | 615 | AM_CFLAGS | 615 | AM_CFLAGS |
258 | 616 | COVERAGE_LDFLAGS | ||
259 | 617 | COVERAGE_CFLAGS | ||
260 | 618 | HAVE_GCOVR_FALSE | ||
261 | 619 | HAVE_GCOVR_TRUE | ||
262 | 620 | HAVE_LCOV_FALSE | ||
263 | 621 | HAVE_LCOV_TRUE | ||
264 | 622 | HAVE_GCOV_FALSE | ||
265 | 623 | HAVE_GCOV_TRUE | ||
266 | 624 | GCOVR | ||
267 | 625 | GENHTML | ||
268 | 626 | LCOV | ||
269 | 627 | SHTOOL | ||
270 | 616 | DBUSSERVICEDIR | 628 | DBUSSERVICEDIR |
271 | 617 | INDICATORICONSDIR | 629 | INDICATORICONSDIR |
272 | 618 | INDICATORDIR | 630 | INDICATORDIR |
273 | @@ -798,6 +810,7 @@ | |||
274 | 798 | enable_silent_rules | 810 | enable_silent_rules |
275 | 799 | enable_nls | 811 | enable_nls |
276 | 800 | enable_localinstall | 812 | enable_localinstall |
277 | 813 | enable_gcov | ||
278 | 801 | ' | 814 | ' |
279 | 802 | ac_precious_vars='build_alias | 815 | ac_precious_vars='build_alias |
280 | 803 | host_alias | 816 | host_alias |
281 | @@ -1357,7 +1370,7 @@ | |||
282 | 1357 | # Omit some internal or obsolete options to make the list less imposing. | 1370 | # Omit some internal or obsolete options to make the list less imposing. |
283 | 1358 | # This message is too long to be a string in the A/UX 3.1 sh. | 1371 | # This message is too long to be a string in the A/UX 3.1 sh. |
284 | 1359 | cat <<_ACEOF | 1372 | cat <<_ACEOF |
286 | 1360 | \`configure' configures indicator-printers 0.1.5 to adapt to many kinds of systems. | 1373 | \`configure' configures indicator-printers 0.1.6 to adapt to many kinds of systems. |
287 | 1361 | 1374 | ||
288 | 1362 | Usage: $0 [OPTION]... [VAR=VALUE]... | 1375 | Usage: $0 [OPTION]... [VAR=VALUE]... |
289 | 1363 | 1376 | ||
290 | @@ -1428,7 +1441,7 @@ | |||
291 | 1428 | 1441 | ||
292 | 1429 | if test -n "$ac_init_help"; then | 1442 | if test -n "$ac_init_help"; then |
293 | 1430 | case $ac_init_help in | 1443 | case $ac_init_help in |
295 | 1431 | short | recursive ) echo "Configuration of indicator-printers 0.1.5:";; | 1444 | short | recursive ) echo "Configuration of indicator-printers 0.1.6:";; |
296 | 1432 | esac | 1445 | esac |
297 | 1433 | cat <<\_ACEOF | 1446 | cat <<\_ACEOF |
298 | 1434 | 1447 | ||
299 | @@ -1447,6 +1460,7 @@ | |||
300 | 1447 | --disable-silent-rules verbose build output (undo: `make V=0') | 1460 | --disable-silent-rules verbose build output (undo: `make V=0') |
301 | 1448 | --disable-nls do not use Native Language Support | 1461 | --disable-nls do not use Native Language Support |
302 | 1449 | --enable-localinstall install all files locally (for distcheck) | 1462 | --enable-localinstall install all files locally (for distcheck) |
303 | 1463 | --enable-gcov enable coverage testing with gcov | ||
304 | 1450 | 1464 | ||
305 | 1451 | Optional Packages: | 1465 | Optional Packages: |
306 | 1452 | --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] | 1466 | --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] |
307 | @@ -1545,7 +1559,7 @@ | |||
308 | 1545 | test -n "$ac_init_help" && exit $ac_status | 1559 | test -n "$ac_init_help" && exit $ac_status |
309 | 1546 | if $ac_init_version; then | 1560 | if $ac_init_version; then |
310 | 1547 | cat <<\_ACEOF | 1561 | cat <<\_ACEOF |
312 | 1548 | indicator-printers configure 0.1.5 | 1562 | indicator-printers configure 0.1.6 |
313 | 1549 | generated by GNU Autoconf 2.68 | 1563 | generated by GNU Autoconf 2.68 |
314 | 1550 | 1564 | ||
315 | 1551 | Copyright (C) 2010 Free Software Foundation, Inc. | 1565 | Copyright (C) 2010 Free Software Foundation, Inc. |
316 | @@ -1910,7 +1924,7 @@ | |||
317 | 1910 | This file contains any messages produced by compilers while | 1924 | This file contains any messages produced by compilers while |
318 | 1911 | running configure, to aid debugging if configure makes a mistake. | 1925 | running configure, to aid debugging if configure makes a mistake. |
319 | 1912 | 1926 | ||
321 | 1913 | It was created by indicator-printers $as_me 0.1.5, which was | 1927 | It was created by indicator-printers $as_me 0.1.6, which was |
322 | 1914 | generated by GNU Autoconf 2.68. Invocation command line was | 1928 | generated by GNU Autoconf 2.68. Invocation command line was |
323 | 1915 | 1929 | ||
324 | 1916 | $ $0 $@ | 1930 | $ $0 $@ |
325 | @@ -2727,7 +2741,7 @@ | |||
326 | 2727 | 2741 | ||
327 | 2728 | # Define the identity of the package. | 2742 | # Define the identity of the package. |
328 | 2729 | PACKAGE='indicator-printers' | 2743 | PACKAGE='indicator-printers' |
330 | 2730 | VERSION='0.1.5' | 2744 | VERSION='0.1.6' |
331 | 2731 | 2745 | ||
332 | 2732 | 2746 | ||
333 | 2733 | cat >>confdefs.h <<_ACEOF | 2747 | cat >>confdefs.h <<_ACEOF |
334 | @@ -11511,6 +11525,7 @@ | |||
335 | 11511 | 11525 | ||
336 | 11512 | 11526 | ||
337 | 11513 | 11527 | ||
338 | 11528 | |||
339 | 11514 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 | 11529 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 |
340 | 11515 | $as_echo_n "checking whether NLS is requested... " >&6; } | 11530 | $as_echo_n "checking whether NLS is requested... " >&6; } |
341 | 11516 | # Check whether --enable-nls was given. | 11531 | # Check whether --enable-nls was given. |
342 | @@ -13235,6 +13250,278 @@ | |||
343 | 13235 | fi | 13250 | fi |
344 | 13236 | 13251 | ||
345 | 13237 | 13252 | ||
346 | 13253 | ########################### | ||
347 | 13254 | # gcov coverage reporting | ||
348 | 13255 | ########################### | ||
349 | 13256 | |||
350 | 13257 | # Checks for existence of coverage tools: | ||
351 | 13258 | # * gcov | ||
352 | 13259 | # * lcov | ||
353 | 13260 | # * genhtml | ||
354 | 13261 | # * gcovr | ||
355 | 13262 | # | ||
356 | 13263 | # Sets ac_cv_check_gcov to yes if tooling is present | ||
357 | 13264 | # and reports the executables to the variables LCOV, GCOVR and GENHTML. | ||
358 | 13265 | # AC_TDD_GCOV | ||
359 | 13266 | |||
360 | 13267 | |||
361 | 13268 | # Check whether --enable-gcov was given. | ||
362 | 13269 | if test "${enable_gcov+set}" = set; then : | ||
363 | 13270 | enableval=$enable_gcov; use_gcov=$enableval | ||
364 | 13271 | else | ||
365 | 13272 | use_gcov=no | ||
366 | 13273 | fi | ||
367 | 13274 | |||
368 | 13275 | |||
369 | 13276 | if test "x$use_gcov" = "xyes"; then | ||
370 | 13277 | # we need gcc: | ||
371 | 13278 | if test "$GCC" != "yes"; then | ||
372 | 13279 | as_fn_error $? "GCC is required for --enable-gcov" "$LINENO" 5 | ||
373 | 13280 | fi | ||
374 | 13281 | |||
375 | 13282 | # Check if ccache is being used | ||
376 | 13283 | # Extract the first word of "shtool", so it can be a program name with args. | ||
377 | 13284 | set dummy shtool; ac_word=$2 | ||
378 | 13285 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
379 | 13286 | $as_echo_n "checking for $ac_word... " >&6; } | ||
380 | 13287 | if ${ac_cv_prog_SHTOOL+:} false; then : | ||
381 | 13288 | $as_echo_n "(cached) " >&6 | ||
382 | 13289 | else | ||
383 | 13290 | if test -n "$SHTOOL"; then | ||
384 | 13291 | ac_cv_prog_SHTOOL="$SHTOOL" # Let the user override the test. | ||
385 | 13292 | else | ||
386 | 13293 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
387 | 13294 | for as_dir in $PATH | ||
388 | 13295 | do | ||
389 | 13296 | IFS=$as_save_IFS | ||
390 | 13297 | test -z "$as_dir" && as_dir=. | ||
391 | 13298 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
392 | 13299 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
393 | 13300 | ac_cv_prog_SHTOOL="shtool" | ||
394 | 13301 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
395 | 13302 | break 2 | ||
396 | 13303 | fi | ||
397 | 13304 | done | ||
398 | 13305 | done | ||
399 | 13306 | IFS=$as_save_IFS | ||
400 | 13307 | |||
401 | 13308 | fi | ||
402 | 13309 | fi | ||
403 | 13310 | SHTOOL=$ac_cv_prog_SHTOOL | ||
404 | 13311 | if test -n "$SHTOOL"; then | ||
405 | 13312 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHTOOL" >&5 | ||
406 | 13313 | $as_echo "$SHTOOL" >&6; } | ||
407 | 13314 | else | ||
408 | 13315 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
409 | 13316 | $as_echo "no" >&6; } | ||
410 | 13317 | fi | ||
411 | 13318 | |||
412 | 13319 | |||
413 | 13320 | case `$SHTOOL path $CC` in | ||
414 | 13321 | *ccache*) gcc_ccache=yes;; | ||
415 | 13322 | *) gcc_ccache=no;; | ||
416 | 13323 | esac | ||
417 | 13324 | |||
418 | 13325 | if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then | ||
419 | 13326 | 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 | 13327 | fi | ||
421 | 13328 | |||
422 | 13329 | lcov_version_list="1.6 1.7 1.8 1.9" | ||
423 | 13330 | # Extract the first word of "lcov", so it can be a program name with args. | ||
424 | 13331 | set dummy lcov; ac_word=$2 | ||
425 | 13332 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
426 | 13333 | $as_echo_n "checking for $ac_word... " >&6; } | ||
427 | 13334 | if ${ac_cv_prog_LCOV+:} false; then : | ||
428 | 13335 | $as_echo_n "(cached) " >&6 | ||
429 | 13336 | else | ||
430 | 13337 | if test -n "$LCOV"; then | ||
431 | 13338 | ac_cv_prog_LCOV="$LCOV" # Let the user override the test. | ||
432 | 13339 | else | ||
433 | 13340 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
434 | 13341 | for as_dir in $PATH | ||
435 | 13342 | do | ||
436 | 13343 | IFS=$as_save_IFS | ||
437 | 13344 | test -z "$as_dir" && as_dir=. | ||
438 | 13345 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
439 | 13346 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
440 | 13347 | ac_cv_prog_LCOV="lcov" | ||
441 | 13348 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
442 | 13349 | break 2 | ||
443 | 13350 | fi | ||
444 | 13351 | done | ||
445 | 13352 | done | ||
446 | 13353 | IFS=$as_save_IFS | ||
447 | 13354 | |||
448 | 13355 | fi | ||
449 | 13356 | fi | ||
450 | 13357 | LCOV=$ac_cv_prog_LCOV | ||
451 | 13358 | if test -n "$LCOV"; then | ||
452 | 13359 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCOV" >&5 | ||
453 | 13360 | $as_echo "$LCOV" >&6; } | ||
454 | 13361 | else | ||
455 | 13362 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
456 | 13363 | $as_echo "no" >&6; } | ||
457 | 13364 | fi | ||
458 | 13365 | |||
459 | 13366 | |||
460 | 13367 | # Extract the first word of "genhtml", so it can be a program name with args. | ||
461 | 13368 | set dummy genhtml; ac_word=$2 | ||
462 | 13369 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
463 | 13370 | $as_echo_n "checking for $ac_word... " >&6; } | ||
464 | 13371 | if ${ac_cv_prog_GENHTML+:} false; then : | ||
465 | 13372 | $as_echo_n "(cached) " >&6 | ||
466 | 13373 | else | ||
467 | 13374 | if test -n "$GENHTML"; then | ||
468 | 13375 | ac_cv_prog_GENHTML="$GENHTML" # Let the user override the test. | ||
469 | 13376 | else | ||
470 | 13377 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
471 | 13378 | for as_dir in $PATH | ||
472 | 13379 | do | ||
473 | 13380 | IFS=$as_save_IFS | ||
474 | 13381 | test -z "$as_dir" && as_dir=. | ||
475 | 13382 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
476 | 13383 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
477 | 13384 | ac_cv_prog_GENHTML="genhtml" | ||
478 | 13385 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
479 | 13386 | break 2 | ||
480 | 13387 | fi | ||
481 | 13388 | done | ||
482 | 13389 | done | ||
483 | 13390 | IFS=$as_save_IFS | ||
484 | 13391 | |||
485 | 13392 | fi | ||
486 | 13393 | fi | ||
487 | 13394 | GENHTML=$ac_cv_prog_GENHTML | ||
488 | 13395 | if test -n "$GENHTML"; then | ||
489 | 13396 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GENHTML" >&5 | ||
490 | 13397 | $as_echo "$GENHTML" >&6; } | ||
491 | 13398 | else | ||
492 | 13399 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
493 | 13400 | $as_echo "no" >&6; } | ||
494 | 13401 | fi | ||
495 | 13402 | |||
496 | 13403 | |||
497 | 13404 | |||
498 | 13405 | if test "$LCOV"; then | ||
499 | 13406 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lcov version" >&5 | ||
500 | 13407 | $as_echo_n "checking for lcov version... " >&6; } | ||
501 | 13408 | if ${glib_cv_lcov_version+:} false; then : | ||
502 | 13409 | $as_echo_n "(cached) " >&6 | ||
503 | 13410 | else | ||
504 | 13411 | |||
505 | 13412 | glib_cv_lcov_version=invalid | ||
506 | 13413 | lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'` | ||
507 | 13414 | for lcov_check_version in $lcov_version_list; do | ||
508 | 13415 | if test "$lcov_version" = "$lcov_check_version"; then | ||
509 | 13416 | glib_cv_lcov_version="$lcov_check_version (ok)" | ||
510 | 13417 | fi | ||
511 | 13418 | done | ||
512 | 13419 | |||
513 | 13420 | fi | ||
514 | 13421 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glib_cv_lcov_version" >&5 | ||
515 | 13422 | $as_echo "$glib_cv_lcov_version" >&6; } | ||
516 | 13423 | else | ||
517 | 13424 | lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list" | ||
518 | 13425 | as_fn_error $? "$lcov_msg" "$LINENO" 5 | ||
519 | 13426 | fi | ||
520 | 13427 | |||
521 | 13428 | case $glib_cv_lcov_version in | ||
522 | 13429 | ""|invalid) | ||
523 | 13430 | lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)." | ||
524 | 13431 | as_fn_error $? "$lcov_msg" "$LINENO" 5 | ||
525 | 13432 | LCOV="exit 0;" | ||
526 | 13433 | ;; | ||
527 | 13434 | esac | ||
528 | 13435 | |||
529 | 13436 | if test -z "$GENHTML"; then | ||
530 | 13437 | as_fn_error $? "Could not find genhtml from the lcov package" "$LINENO" 5 | ||
531 | 13438 | fi | ||
532 | 13439 | |||
533 | 13440 | ac_cv_check_gcov=yes | ||
534 | 13441 | ac_cv_check_lcov=yes | ||
535 | 13442 | |||
536 | 13443 | # Remove all optimization flags from CFLAGS | ||
537 | 13444 | |||
538 | 13445 | CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'` | ||
539 | 13446 | |||
540 | 13447 | |||
541 | 13448 | # Add the special gcc flags | ||
542 | 13449 | COVERAGE_CFLAGS="-O0 -fprofile-arcs -ftest-coverage" | ||
543 | 13450 | COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage" | ||
544 | 13451 | COVERAGE_LDFLAGS="-lgcov" | ||
545 | 13452 | |||
546 | 13453 | # Check availability of gcovr | ||
547 | 13454 | # Extract the first word of "gcovr", so it can be a program name with args. | ||
548 | 13455 | set dummy gcovr; ac_word=$2 | ||
549 | 13456 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
550 | 13457 | $as_echo_n "checking for $ac_word... " >&6; } | ||
551 | 13458 | if ${ac_cv_prog_GCOVR+:} false; then : | ||
552 | 13459 | $as_echo_n "(cached) " >&6 | ||
553 | 13460 | else | ||
554 | 13461 | if test -n "$GCOVR"; then | ||
555 | 13462 | ac_cv_prog_GCOVR="$GCOVR" # Let the user override the test. | ||
556 | 13463 | else | ||
557 | 13464 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
558 | 13465 | for as_dir in $PATH | ||
559 | 13466 | do | ||
560 | 13467 | IFS=$as_save_IFS | ||
561 | 13468 | test -z "$as_dir" && as_dir=. | ||
562 | 13469 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
563 | 13470 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
564 | 13471 | ac_cv_prog_GCOVR="gcovr" | ||
565 | 13472 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
566 | 13473 | break 2 | ||
567 | 13474 | fi | ||
568 | 13475 | done | ||
569 | 13476 | done | ||
570 | 13477 | IFS=$as_save_IFS | ||
571 | 13478 | |||
572 | 13479 | fi | ||
573 | 13480 | fi | ||
574 | 13481 | GCOVR=$ac_cv_prog_GCOVR | ||
575 | 13482 | if test -n "$GCOVR"; then | ||
576 | 13483 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCOVR" >&5 | ||
577 | 13484 | $as_echo "$GCOVR" >&6; } | ||
578 | 13485 | else | ||
579 | 13486 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
580 | 13487 | $as_echo "no" >&6; } | ||
581 | 13488 | fi | ||
582 | 13489 | |||
583 | 13490 | |||
584 | 13491 | if test -z "$GCOVR"; then | ||
585 | 13492 | ac_cv_check_gcovr=no | ||
586 | 13493 | else | ||
587 | 13494 | ac_cv_check_gcovr=yes | ||
588 | 13495 | fi | ||
589 | 13496 | |||
590 | 13497 | fi | ||
591 | 13498 | |||
592 | 13499 | if test "x$ac_cv_check_gcov" = xyes; then | ||
593 | 13500 | HAVE_GCOV_TRUE= | ||
594 | 13501 | HAVE_GCOV_FALSE='#' | ||
595 | 13502 | else | ||
596 | 13503 | HAVE_GCOV_TRUE='#' | ||
597 | 13504 | HAVE_GCOV_FALSE= | ||
598 | 13505 | fi | ||
599 | 13506 | |||
600 | 13507 | if test "x$ac_cv_check_lcov" = xyes; then | ||
601 | 13508 | HAVE_LCOV_TRUE= | ||
602 | 13509 | HAVE_LCOV_FALSE='#' | ||
603 | 13510 | else | ||
604 | 13511 | HAVE_LCOV_TRUE='#' | ||
605 | 13512 | HAVE_LCOV_FALSE= | ||
606 | 13513 | fi | ||
607 | 13514 | |||
608 | 13515 | if test "x$ac_cv_check_gcovr" = xyes; then | ||
609 | 13516 | HAVE_GCOVR_TRUE= | ||
610 | 13517 | HAVE_GCOVR_FALSE='#' | ||
611 | 13518 | else | ||
612 | 13519 | HAVE_GCOVR_TRUE='#' | ||
613 | 13520 | HAVE_GCOVR_FALSE= | ||
614 | 13521 | fi | ||
615 | 13522 | |||
616 | 13523 | |||
617 | 13524 | |||
618 | 13238 | 13525 | ||
619 | 13239 | AM_CFLAGS="-Wall" | 13526 | AM_CFLAGS="-Wall" |
620 | 13240 | 13527 | ||
621 | @@ -13368,6 +13655,18 @@ | |||
622 | 13368 | ac_config_commands="$ac_config_commands po/stamp-it" | 13655 | ac_config_commands="$ac_config_commands po/stamp-it" |
623 | 13369 | 13656 | ||
624 | 13370 | 13657 | ||
625 | 13658 | if test -z "${HAVE_GCOV_TRUE}" && test -z "${HAVE_GCOV_FALSE}"; then | ||
626 | 13659 | as_fn_error $? "conditional \"HAVE_GCOV\" was never defined. | ||
627 | 13660 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
628 | 13661 | fi | ||
629 | 13662 | if test -z "${HAVE_LCOV_TRUE}" && test -z "${HAVE_LCOV_FALSE}"; then | ||
630 | 13663 | as_fn_error $? "conditional \"HAVE_LCOV\" was never defined. | ||
631 | 13664 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
632 | 13665 | fi | ||
633 | 13666 | if test -z "${HAVE_GCOVR_TRUE}" && test -z "${HAVE_GCOVR_FALSE}"; then | ||
634 | 13667 | as_fn_error $? "conditional \"HAVE_GCOVR\" was never defined. | ||
635 | 13668 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
636 | 13669 | fi | ||
637 | 13371 | 13670 | ||
638 | 13372 | : "${CONFIG_STATUS=./config.status}" | 13671 | : "${CONFIG_STATUS=./config.status}" |
639 | 13373 | ac_write_fail=0 | 13672 | ac_write_fail=0 |
640 | @@ -13777,7 +14076,7 @@ | |||
641 | 13777 | # report actual input values of CONFIG_FILES etc. instead of their | 14076 | # report actual input values of CONFIG_FILES etc. instead of their |
642 | 13778 | # values after options handling. | 14077 | # values after options handling. |
643 | 13779 | ac_log=" | 14078 | ac_log=" |
645 | 13780 | This file was extended by indicator-printers $as_me 0.1.5, which was | 14079 | This file was extended by indicator-printers $as_me 0.1.6, which was |
646 | 13781 | generated by GNU Autoconf 2.68. Invocation command line was | 14080 | generated by GNU Autoconf 2.68. Invocation command line was |
647 | 13782 | 14081 | ||
648 | 13783 | CONFIG_FILES = $CONFIG_FILES | 14082 | CONFIG_FILES = $CONFIG_FILES |
649 | @@ -13843,7 +14142,7 @@ | |||
650 | 13843 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 14142 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
651 | 13844 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | 14143 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
652 | 13845 | ac_cs_version="\\ | 14144 | ac_cs_version="\\ |
654 | 13846 | indicator-printers config.status 0.1.5 | 14145 | indicator-printers config.status 0.1.6 |
655 | 13847 | configured by $0, generated by GNU Autoconf 2.68, | 14146 | configured by $0, generated by GNU Autoconf 2.68, |
656 | 13848 | with options \\"\$ac_cs_config\\" | 14147 | with options \\"\$ac_cs_config\\" |
657 | 13849 | 14148 | ||
658 | 13850 | 14149 | ||
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 | 1 | 1 | ||
665 | 2 | AC_INIT(indicator-printers, 0.1.5) | 2 | AC_INIT(indicator-printers, 0.1.6) |
666 | 3 | 3 | ||
667 | 4 | AC_PREREQ(2.53) | 4 | AC_PREREQ(2.53) |
668 | 5 | AM_INIT_AUTOMAKE([]) | 5 | AM_INIT_AUTOMAKE([]) |
669 | @@ -9,6 +9,7 @@ | |||
670 | 9 | AC_PROG_LIBTOOL | 9 | AC_PROG_LIBTOOL |
671 | 10 | AM_PROG_CC_C_O | 10 | AM_PROG_CC_C_O |
672 | 11 | AM_SILENT_RULES([yes]) | 11 | AM_SILENT_RULES([yes]) |
673 | 12 | AC_CONFIG_MACRO_DIR([m4]) | ||
674 | 12 | 13 | ||
675 | 13 | IT_PROG_INTLTOOL([0.35.0]) | 14 | IT_PROG_INTLTOOL([0.35.0]) |
676 | 14 | GETTEXT_PACKAGE=indicator-printers | 15 | GETTEXT_PACKAGE=indicator-printers |
677 | @@ -68,6 +69,17 @@ | |||
678 | 68 | fi | 69 | fi |
679 | 69 | AC_SUBST(DBUSSERVICEDIR) | 70 | AC_SUBST(DBUSSERVICEDIR) |
680 | 70 | 71 | ||
681 | 72 | ########################### | ||
682 | 73 | # gcov coverage reporting | ||
683 | 74 | ########################### | ||
684 | 75 | |||
685 | 76 | m4_include([m4/gcov.m4]) | ||
686 | 77 | AC_TDD_GCOV | ||
687 | 78 | AM_CONDITIONAL([HAVE_GCOV], [test "x$ac_cv_check_gcov" = xyes]) | ||
688 | 79 | AM_CONDITIONAL([HAVE_LCOV], [test "x$ac_cv_check_lcov" = xyes]) | ||
689 | 80 | AM_CONDITIONAL([HAVE_GCOVR], [test "x$ac_cv_check_gcovr" = xyes]) | ||
690 | 81 | AC_SUBST(COVERAGE_CFLAGS) | ||
691 | 82 | AC_SUBST(COVERAGE_LDFLAGS) | ||
692 | 71 | 83 | ||
693 | 72 | AC_SUBST(AM_CFLAGS, "-Wall") | 84 | AC_SUBST(AM_CFLAGS, "-Wall") |
694 | 73 | 85 | ||
695 | 74 | 86 | ||
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 | 37 | subdir = data | 37 | subdir = data |
701 | 38 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | 38 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
702 | 39 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 39 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
704 | 40 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac | 40 | am__aclocal_m4_deps = $(top_srcdir)/m4/gcov.m4 \ |
705 | 41 | $(top_srcdir)/configure.ac | ||
706 | 41 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 42 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
707 | 42 | $(ACLOCAL_M4) | 43 | $(ACLOCAL_M4) |
708 | 43 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | 44 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
709 | @@ -99,6 +100,8 @@ | |||
710 | 99 | CC = @CC@ | 100 | CC = @CC@ |
711 | 100 | CCDEPMODE = @CCDEPMODE@ | 101 | CCDEPMODE = @CCDEPMODE@ |
712 | 101 | CFLAGS = @CFLAGS@ | 102 | CFLAGS = @CFLAGS@ |
713 | 103 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | ||
714 | 104 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | ||
715 | 102 | CPP = @CPP@ | 105 | CPP = @CPP@ |
716 | 103 | CPPFLAGS = @CPPFLAGS@ | 106 | CPPFLAGS = @CPPFLAGS@ |
717 | 104 | CUPS_CONFIG = @CUPS_CONFIG@ | 107 | CUPS_CONFIG = @CUPS_CONFIG@ |
718 | @@ -116,6 +119,8 @@ | |||
719 | 116 | EGREP = @EGREP@ | 119 | EGREP = @EGREP@ |
720 | 117 | EXEEXT = @EXEEXT@ | 120 | EXEEXT = @EXEEXT@ |
721 | 118 | FGREP = @FGREP@ | 121 | FGREP = @FGREP@ |
722 | 122 | GCOVR = @GCOVR@ | ||
723 | 123 | GENHTML = @GENHTML@ | ||
724 | 119 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ | 124 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
725 | 120 | GMOFILES = @GMOFILES@ | 125 | GMOFILES = @GMOFILES@ |
726 | 121 | GMSGFMT = @GMSGFMT@ | 126 | GMSGFMT = @GMSGFMT@ |
727 | @@ -137,6 +142,7 @@ | |||
728 | 137 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ | 142 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
729 | 138 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ | 143 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
730 | 139 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ | 144 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
731 | 145 | LCOV = @LCOV@ | ||
732 | 140 | LD = @LD@ | 146 | LD = @LD@ |
733 | 141 | LDFLAGS = @LDFLAGS@ | 147 | LDFLAGS = @LDFLAGS@ |
734 | 142 | LIBOBJS = @LIBOBJS@ | 148 | LIBOBJS = @LIBOBJS@ |
735 | @@ -179,6 +185,7 @@ | |||
736 | 179 | SERVICE_LIBS = @SERVICE_LIBS@ | 185 | SERVICE_LIBS = @SERVICE_LIBS@ |
737 | 180 | SET_MAKE = @SET_MAKE@ | 186 | SET_MAKE = @SET_MAKE@ |
738 | 181 | SHELL = @SHELL@ | 187 | SHELL = @SHELL@ |
739 | 188 | SHTOOL = @SHTOOL@ | ||
740 | 182 | STRIP = @STRIP@ | 189 | STRIP = @STRIP@ |
741 | 183 | USE_NLS = @USE_NLS@ | 190 | USE_NLS = @USE_NLS@ |
742 | 184 | VERSION = @VERSION@ | 191 | VERSION = @VERSION@ |
743 | 185 | 192 | ||
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 | 1 | indicator-printers (0.1.6-0ubuntu1~ppa1) precise; urgency=low | ||
749 | 2 | |||
750 | 3 | * New upstream release. | ||
751 | 4 | * Add test coverage build targets | ||
752 | 5 | |||
753 | 6 | -- Ted Gould <ted@ubuntu.com> Wed, 04 Apr 2012 15:05:58 -0500 | ||
754 | 7 | |||
755 | 1 | indicator-printers (0.1.5-0ubuntu1) precise; urgency=low | 8 | indicator-printers (0.1.5-0ubuntu1) precise; urgency=low |
756 | 2 | 9 | ||
757 | 3 | * New upstream release. | 10 | * New upstream release. |
758 | 4 | 11 | ||
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 | 1 | # Checks for existence of coverage tools: | ||
765 | 2 | # * gcov | ||
766 | 3 | # * lcov | ||
767 | 4 | # * genhtml | ||
768 | 5 | # * gcovr | ||
769 | 6 | # | ||
770 | 7 | # Sets ac_cv_check_gcov to yes if tooling is present | ||
771 | 8 | # and reports the executables to the variables LCOV, GCOVR and GENHTML. | ||
772 | 9 | AC_DEFUN([AC_TDD_GCOV], | ||
773 | 10 | [ | ||
774 | 11 | AC_ARG_ENABLE(gcov, | ||
775 | 12 | AS_HELP_STRING([--enable-gcov], | ||
776 | 13 | [enable coverage testing with gcov]), | ||
777 | 14 | [use_gcov=$enableval], [use_gcov=no]) | ||
778 | 15 | |||
779 | 16 | if test "x$use_gcov" = "xyes"; then | ||
780 | 17 | # we need gcc: | ||
781 | 18 | if test "$GCC" != "yes"; then | ||
782 | 19 | AC_MSG_ERROR([GCC is required for --enable-gcov]) | ||
783 | 20 | fi | ||
784 | 21 | |||
785 | 22 | # Check if ccache is being used | ||
786 | 23 | AC_CHECK_PROG(SHTOOL, shtool, shtool) | ||
787 | 24 | case `$SHTOOL path $CC` in | ||
788 | 25 | *ccache*[)] gcc_ccache=yes;; | ||
789 | 26 | *[)] gcc_ccache=no;; | ||
790 | 27 | esac | ||
791 | 28 | |||
792 | 29 | if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then | ||
793 | 30 | 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 | 31 | fi | ||
795 | 32 | |||
796 | 33 | lcov_version_list="1.6 1.7 1.8 1.9" | ||
797 | 34 | AC_CHECK_PROG(LCOV, lcov, lcov) | ||
798 | 35 | AC_CHECK_PROG(GENHTML, genhtml, genhtml) | ||
799 | 36 | |||
800 | 37 | if test "$LCOV"; then | ||
801 | 38 | AC_CACHE_CHECK([for lcov version], glib_cv_lcov_version, [ | ||
802 | 39 | glib_cv_lcov_version=invalid | ||
803 | 40 | lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'` | ||
804 | 41 | for lcov_check_version in $lcov_version_list; do | ||
805 | 42 | if test "$lcov_version" = "$lcov_check_version"; then | ||
806 | 43 | glib_cv_lcov_version="$lcov_check_version (ok)" | ||
807 | 44 | fi | ||
808 | 45 | done | ||
809 | 46 | ]) | ||
810 | 47 | else | ||
811 | 48 | lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list" | ||
812 | 49 | AC_MSG_ERROR([$lcov_msg]) | ||
813 | 50 | fi | ||
814 | 51 | |||
815 | 52 | case $glib_cv_lcov_version in | ||
816 | 53 | ""|invalid[)] | ||
817 | 54 | lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)." | ||
818 | 55 | AC_MSG_ERROR([$lcov_msg]) | ||
819 | 56 | LCOV="exit 0;" | ||
820 | 57 | ;; | ||
821 | 58 | esac | ||
822 | 59 | |||
823 | 60 | if test -z "$GENHTML"; then | ||
824 | 61 | AC_MSG_ERROR([Could not find genhtml from the lcov package]) | ||
825 | 62 | fi | ||
826 | 63 | |||
827 | 64 | ac_cv_check_gcov=yes | ||
828 | 65 | ac_cv_check_lcov=yes | ||
829 | 66 | |||
830 | 67 | # Remove all optimization flags from CFLAGS | ||
831 | 68 | changequote({,}) | ||
832 | 69 | CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'` | ||
833 | 70 | changequote([,]) | ||
834 | 71 | |||
835 | 72 | # Add the special gcc flags | ||
836 | 73 | COVERAGE_CFLAGS="-O0 -fprofile-arcs -ftest-coverage" | ||
837 | 74 | COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage" | ||
838 | 75 | COVERAGE_LDFLAGS="-lgcov" | ||
839 | 76 | |||
840 | 77 | # Check availability of gcovr | ||
841 | 78 | AC_CHECK_PROG(GCOVR, gcovr, gcovr) | ||
842 | 79 | if test -z "$GCOVR"; then | ||
843 | 80 | ac_cv_check_gcovr=no | ||
844 | 81 | else | ||
845 | 82 | ac_cv_check_gcovr=yes | ||
846 | 83 | fi | ||
847 | 84 | |||
848 | 85 | fi | ||
849 | 86 | ]) # AC_TDD_GCOV | ||
850 | 0 | 87 | ||
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 | 9 | dbus-names.h | 9 | dbus-names.h |
856 | 10 | 10 | ||
857 | 11 | libprintersmenu_la_CPPFLAGS = $(APPLET_CFLAGS) | 11 | libprintersmenu_la_CPPFLAGS = $(APPLET_CFLAGS) |
858 | 12 | libprintersmenu_la_CFLAGS = $(COVERAGE_CFLAGS) | ||
859 | 12 | libprintersmenu_la_LIBADD = $(APPLET_LIBS) -lm | 13 | libprintersmenu_la_LIBADD = $(APPLET_LIBS) -lm |
861 | 13 | libprintersmenu_la_LDFLAGS = -module -avoid-version | 14 | libprintersmenu_la_LDFLAGS = \ |
862 | 15 | $(COVERAGE_LDFLAGS) \ | ||
863 | 16 | -module -avoid-version | ||
864 | 14 | 17 | ||
865 | 15 | 18 | ||
866 | 16 | cups_notifier_sources = \ | 19 | cups_notifier_sources = \ |
867 | @@ -39,7 +42,9 @@ | |||
868 | 39 | nodist_indicator_printers_service_SOURCES = $(cups_notifier_sources) | 42 | nodist_indicator_printers_service_SOURCES = $(cups_notifier_sources) |
869 | 40 | 43 | ||
870 | 41 | indicator_printers_service_CPPFLAGS = $(SERVICE_CFLAGS) | 44 | indicator_printers_service_CPPFLAGS = $(SERVICE_CFLAGS) |
871 | 45 | indicator_printers_service_CFLAGS = $(COVERAGE_CFLAGS) | ||
872 | 42 | indicator_printers_service_LDADD = $(SERVICE_LIBS) | 46 | indicator_printers_service_LDADD = $(SERVICE_LIBS) |
873 | 47 | indicator_printers_service_LDFLAGS = $(COVERAGE_LDFLAGS) | ||
874 | 43 | 48 | ||
875 | 44 | 49 | ||
876 | 45 | BUILT_SOURCES = $(cups_notifier_sources) | 50 | BUILT_SOURCES = $(cups_notifier_sources) |
877 | 46 | 51 | ||
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 | 39 | subdir = src | 39 | subdir = src |
883 | 40 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | 40 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
884 | 41 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 41 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
886 | 42 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac | 42 | am__aclocal_m4_deps = $(top_srcdir)/m4/gcov.m4 \ |
887 | 43 | $(top_srcdir)/configure.ac | ||
888 | 43 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 44 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
889 | 44 | $(ACLOCAL_M4) | 45 | $(ACLOCAL_M4) |
890 | 45 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | 46 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
891 | @@ -87,8 +88,8 @@ | |||
892 | 87 | am__v_lt_0 = --silent | 88 | am__v_lt_0 = --silent |
893 | 88 | libprintersmenu_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ | 89 | libprintersmenu_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ |
894 | 89 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ | 90 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ |
897 | 90 | $(AM_CFLAGS) $(CFLAGS) $(libprintersmenu_la_LDFLAGS) \ | 91 | $(libprintersmenu_la_CFLAGS) $(CFLAGS) \ |
898 | 91 | $(LDFLAGS) -o $@ | 92 | $(libprintersmenu_la_LDFLAGS) $(LDFLAGS) -o $@ |
899 | 92 | PROGRAMS = $(libexec_PROGRAMS) | 93 | PROGRAMS = $(libexec_PROGRAMS) |
900 | 93 | am_indicator_printers_service_OBJECTS = indicator_printers_service-indicator-printers-service.$(OBJEXT) \ | 94 | am_indicator_printers_service_OBJECTS = indicator_printers_service-indicator-printers-service.$(OBJEXT) \ |
901 | 94 | indicator_printers_service-indicator-printers-menu.$(OBJEXT) \ | 95 | indicator_printers_service-indicator-printers-menu.$(OBJEXT) \ |
902 | @@ -100,6 +101,10 @@ | |||
903 | 100 | $(am_indicator_printers_service_OBJECTS) \ | 101 | $(am_indicator_printers_service_OBJECTS) \ |
904 | 101 | $(nodist_indicator_printers_service_OBJECTS) | 102 | $(nodist_indicator_printers_service_OBJECTS) |
905 | 102 | indicator_printers_service_DEPENDENCIES = $(am__DEPENDENCIES_1) | 103 | indicator_printers_service_DEPENDENCIES = $(am__DEPENDENCIES_1) |
906 | 104 | indicator_printers_service_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ | ||
907 | 105 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ | ||
908 | 106 | $(indicator_printers_service_CFLAGS) $(CFLAGS) \ | ||
909 | 107 | $(indicator_printers_service_LDFLAGS) $(LDFLAGS) -o $@ | ||
910 | 103 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | 108 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) |
911 | 104 | depcomp = $(SHELL) $(top_srcdir)/depcomp | 109 | depcomp = $(SHELL) $(top_srcdir)/depcomp |
912 | 105 | am__depfiles_maybe = depfiles | 110 | am__depfiles_maybe = depfiles |
913 | @@ -151,6 +156,8 @@ | |||
914 | 151 | CC = @CC@ | 156 | CC = @CC@ |
915 | 152 | CCDEPMODE = @CCDEPMODE@ | 157 | CCDEPMODE = @CCDEPMODE@ |
916 | 153 | CFLAGS = @CFLAGS@ | 158 | CFLAGS = @CFLAGS@ |
917 | 159 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | ||
918 | 160 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | ||
919 | 154 | CPP = @CPP@ | 161 | CPP = @CPP@ |
920 | 155 | CPPFLAGS = @CPPFLAGS@ | 162 | CPPFLAGS = @CPPFLAGS@ |
921 | 156 | CUPS_CONFIG = @CUPS_CONFIG@ | 163 | CUPS_CONFIG = @CUPS_CONFIG@ |
922 | @@ -168,6 +175,8 @@ | |||
923 | 168 | EGREP = @EGREP@ | 175 | EGREP = @EGREP@ |
924 | 169 | EXEEXT = @EXEEXT@ | 176 | EXEEXT = @EXEEXT@ |
925 | 170 | FGREP = @FGREP@ | 177 | FGREP = @FGREP@ |
926 | 178 | GCOVR = @GCOVR@ | ||
927 | 179 | GENHTML = @GENHTML@ | ||
928 | 171 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ | 180 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
929 | 172 | GMOFILES = @GMOFILES@ | 181 | GMOFILES = @GMOFILES@ |
930 | 173 | GMSGFMT = @GMSGFMT@ | 182 | GMSGFMT = @GMSGFMT@ |
931 | @@ -189,6 +198,7 @@ | |||
932 | 189 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ | 198 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
933 | 190 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ | 199 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
934 | 191 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ | 200 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
935 | 201 | LCOV = @LCOV@ | ||
936 | 192 | LD = @LD@ | 202 | LD = @LD@ |
937 | 193 | LDFLAGS = @LDFLAGS@ | 203 | LDFLAGS = @LDFLAGS@ |
938 | 194 | LIBOBJS = @LIBOBJS@ | 204 | LIBOBJS = @LIBOBJS@ |
939 | @@ -231,6 +241,7 @@ | |||
940 | 231 | SERVICE_LIBS = @SERVICE_LIBS@ | 241 | SERVICE_LIBS = @SERVICE_LIBS@ |
941 | 232 | SET_MAKE = @SET_MAKE@ | 242 | SET_MAKE = @SET_MAKE@ |
942 | 233 | SHELL = @SHELL@ | 243 | SHELL = @SHELL@ |
943 | 244 | SHTOOL = @SHTOOL@ | ||
944 | 234 | STRIP = @STRIP@ | 245 | STRIP = @STRIP@ |
945 | 235 | USE_NLS = @USE_NLS@ | 246 | USE_NLS = @USE_NLS@ |
946 | 236 | VERSION = @VERSION@ | 247 | VERSION = @VERSION@ |
947 | @@ -299,8 +310,12 @@ | |||
948 | 299 | dbus-names.h | 310 | dbus-names.h |
949 | 300 | 311 | ||
950 | 301 | libprintersmenu_la_CPPFLAGS = $(APPLET_CFLAGS) | 312 | libprintersmenu_la_CPPFLAGS = $(APPLET_CFLAGS) |
951 | 313 | libprintersmenu_la_CFLAGS = $(COVERAGE_CFLAGS) | ||
952 | 302 | libprintersmenu_la_LIBADD = $(APPLET_LIBS) -lm | 314 | libprintersmenu_la_LIBADD = $(APPLET_LIBS) -lm |
954 | 303 | libprintersmenu_la_LDFLAGS = -module -avoid-version | 315 | libprintersmenu_la_LDFLAGS = \ |
955 | 316 | $(COVERAGE_LDFLAGS) \ | ||
956 | 317 | -module -avoid-version | ||
957 | 318 | |||
958 | 304 | cups_notifier_sources = \ | 319 | cups_notifier_sources = \ |
959 | 305 | cups-notifier.c \ | 320 | cups-notifier.c \ |
960 | 306 | cups-notifier.h | 321 | cups-notifier.h |
961 | @@ -317,7 +332,9 @@ | |||
962 | 317 | 332 | ||
963 | 318 | nodist_indicator_printers_service_SOURCES = $(cups_notifier_sources) | 333 | nodist_indicator_printers_service_SOURCES = $(cups_notifier_sources) |
964 | 319 | indicator_printers_service_CPPFLAGS = $(SERVICE_CFLAGS) | 334 | indicator_printers_service_CPPFLAGS = $(SERVICE_CFLAGS) |
965 | 335 | indicator_printers_service_CFLAGS = $(COVERAGE_CFLAGS) | ||
966 | 320 | indicator_printers_service_LDADD = $(SERVICE_LIBS) | 336 | indicator_printers_service_LDADD = $(SERVICE_LIBS) |
967 | 337 | indicator_printers_service_LDFLAGS = $(COVERAGE_LDFLAGS) | ||
968 | 321 | BUILT_SOURCES = $(cups_notifier_sources) | 338 | BUILT_SOURCES = $(cups_notifier_sources) |
969 | 322 | CLEANFILES = $(BUILT_SOURCES) | 339 | CLEANFILES = $(BUILT_SOURCES) |
970 | 323 | EXTRA_DIST = org.cups.cupsd.Notifier.xml | 340 | EXTRA_DIST = org.cups.cupsd.Notifier.xml |
971 | @@ -434,7 +451,7 @@ | |||
972 | 434 | rm -f $$list | 451 | rm -f $$list |
973 | 435 | indicator-printers-service$(EXEEXT): $(indicator_printers_service_OBJECTS) $(indicator_printers_service_DEPENDENCIES) $(EXTRA_indicator_printers_service_DEPENDENCIES) | 452 | indicator-printers-service$(EXEEXT): $(indicator_printers_service_OBJECTS) $(indicator_printers_service_DEPENDENCIES) $(EXTRA_indicator_printers_service_DEPENDENCIES) |
974 | 436 | @rm -f indicator-printers-service$(EXEEXT) | 453 | @rm -f indicator-printers-service$(EXEEXT) |
976 | 437 | $(AM_V_CCLD)$(LINK) $(indicator_printers_service_OBJECTS) $(indicator_printers_service_LDADD) $(LIBS) | 454 | $(AM_V_CCLD)$(indicator_printers_service_LINK) $(indicator_printers_service_OBJECTS) $(indicator_printers_service_LDADD) $(LIBS) |
977 | 438 | 455 | ||
978 | 439 | mostlyclean-compile: | 456 | mostlyclean-compile: |
979 | 440 | -rm -f *.$(OBJEXT) | 457 | -rm -f *.$(OBJEXT) |
980 | @@ -472,88 +489,88 @@ | |||
981 | 472 | @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< | 489 | @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< |
982 | 473 | 490 | ||
983 | 474 | libprintersmenu_la-indicator-printers.lo: indicator-printers.c | 491 | libprintersmenu_la-indicator-printers.lo: indicator-printers.c |
985 | 475 | @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 | 492 | @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 | 476 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libprintersmenu_la-indicator-printers.Tpo $(DEPDIR)/libprintersmenu_la-indicator-printers.Plo | 493 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libprintersmenu_la-indicator-printers.Tpo $(DEPDIR)/libprintersmenu_la-indicator-printers.Plo |
987 | 477 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-printers.c' object='libprintersmenu_la-indicator-printers.lo' libtool=yes @AMDEPBACKSLASH@ | 494 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-printers.c' object='libprintersmenu_la-indicator-printers.lo' libtool=yes @AMDEPBACKSLASH@ |
988 | 478 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 495 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
990 | 479 | @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 | 496 | @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 | 480 | 497 | ||
992 | 481 | libprintersmenu_la-indicator-menu-item.lo: indicator-menu-item.c | 498 | libprintersmenu_la-indicator-menu-item.lo: indicator-menu-item.c |
994 | 482 | @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 | 499 | @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 | 483 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libprintersmenu_la-indicator-menu-item.Tpo $(DEPDIR)/libprintersmenu_la-indicator-menu-item.Plo | 500 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libprintersmenu_la-indicator-menu-item.Tpo $(DEPDIR)/libprintersmenu_la-indicator-menu-item.Plo |
996 | 484 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-menu-item.c' object='libprintersmenu_la-indicator-menu-item.lo' libtool=yes @AMDEPBACKSLASH@ | 501 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-menu-item.c' object='libprintersmenu_la-indicator-menu-item.lo' libtool=yes @AMDEPBACKSLASH@ |
997 | 485 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 502 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
999 | 486 | @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 | 503 | @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 | 487 | 504 | ||
1001 | 488 | indicator_printers_service-indicator-printers-service.o: indicator-printers-service.c | 505 | indicator_printers_service-indicator-printers-service.o: indicator-printers-service.c |
1003 | 489 | @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 | 506 | @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 | 490 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_printers_service-indicator-printers-service.Tpo $(DEPDIR)/indicator_printers_service-indicator-printers-service.Po | 507 | @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 | 491 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-printers-service.c' object='indicator_printers_service-indicator-printers-service.o' libtool=no @AMDEPBACKSLASH@ | 508 | @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 | 492 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 509 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
1008 | 493 | @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 | 510 | @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 | 494 | 511 | ||
1010 | 495 | indicator_printers_service-indicator-printers-service.obj: indicator-printers-service.c | 512 | indicator_printers_service-indicator-printers-service.obj: indicator-printers-service.c |
1012 | 496 | @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` | 513 | @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 | 497 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_printers_service-indicator-printers-service.Tpo $(DEPDIR)/indicator_printers_service-indicator-printers-service.Po | 514 | @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 | 498 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-printers-service.c' object='indicator_printers_service-indicator-printers-service.obj' libtool=no @AMDEPBACKSLASH@ | 515 | @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 | 499 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 516 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
1017 | 500 | @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` | 517 | @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 | 501 | 518 | ||
1019 | 502 | indicator_printers_service-indicator-printers-menu.o: indicator-printers-menu.c | 519 | indicator_printers_service-indicator-printers-menu.o: indicator-printers-menu.c |
1021 | 503 | @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 | 520 | @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 | 504 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_printers_service-indicator-printers-menu.Tpo $(DEPDIR)/indicator_printers_service-indicator-printers-menu.Po | 521 | @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 | 505 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-printers-menu.c' object='indicator_printers_service-indicator-printers-menu.o' libtool=no @AMDEPBACKSLASH@ | 522 | @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 | 506 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 523 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
1026 | 507 | @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 | 524 | @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 | 508 | 525 | ||
1028 | 509 | indicator_printers_service-indicator-printers-menu.obj: indicator-printers-menu.c | 526 | indicator_printers_service-indicator-printers-menu.obj: indicator-printers-menu.c |
1030 | 510 | @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` | 527 | @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 | 511 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_printers_service-indicator-printers-menu.Tpo $(DEPDIR)/indicator_printers_service-indicator-printers-menu.Po | 528 | @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 | 512 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-printers-menu.c' object='indicator_printers_service-indicator-printers-menu.obj' libtool=no @AMDEPBACKSLASH@ | 529 | @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 | 513 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 530 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
1035 | 514 | @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` | 531 | @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 | 515 | 532 | ||
1037 | 516 | indicator_printers_service-indicator-printer-state-notifier.o: indicator-printer-state-notifier.c | 533 | indicator_printers_service-indicator-printer-state-notifier.o: indicator-printer-state-notifier.c |
1039 | 517 | @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 | 534 | @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 | 518 | @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 | 535 | @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 | 519 | @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@ | 536 | @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 | 520 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 537 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
1044 | 521 | @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 | 538 | @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 | 522 | 539 | ||
1046 | 523 | indicator_printers_service-indicator-printer-state-notifier.obj: indicator-printer-state-notifier.c | 540 | indicator_printers_service-indicator-printer-state-notifier.obj: indicator-printer-state-notifier.c |
1048 | 524 | @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` | 541 | @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 | 525 | @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 | 542 | @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 | 526 | @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@ | 543 | @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 | 527 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 544 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
1053 | 528 | @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` | 545 | @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 | 529 | 546 | ||
1055 | 530 | indicator_printers_service-spawn-printer-settings.o: spawn-printer-settings.c | 547 | indicator_printers_service-spawn-printer-settings.o: spawn-printer-settings.c |
1057 | 531 | @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 | 548 | @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 | 532 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_printers_service-spawn-printer-settings.Tpo $(DEPDIR)/indicator_printers_service-spawn-printer-settings.Po | 549 | @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 | 533 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='spawn-printer-settings.c' object='indicator_printers_service-spawn-printer-settings.o' libtool=no @AMDEPBACKSLASH@ | 550 | @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 | 534 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 551 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
1062 | 535 | @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 | 552 | @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 | 536 | 553 | ||
1064 | 537 | indicator_printers_service-spawn-printer-settings.obj: spawn-printer-settings.c | 554 | indicator_printers_service-spawn-printer-settings.obj: spawn-printer-settings.c |
1066 | 538 | @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` | 555 | @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 | 539 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_printers_service-spawn-printer-settings.Tpo $(DEPDIR)/indicator_printers_service-spawn-printer-settings.Po | 556 | @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 | 540 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='spawn-printer-settings.c' object='indicator_printers_service-spawn-printer-settings.obj' libtool=no @AMDEPBACKSLASH@ | 557 | @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 | 541 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 558 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
1071 | 542 | @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` | 559 | @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 | 543 | 560 | ||
1073 | 544 | indicator_printers_service-cups-notifier.o: cups-notifier.c | 561 | indicator_printers_service-cups-notifier.o: cups-notifier.c |
1075 | 545 | @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 | 562 | @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 | 546 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_printers_service-cups-notifier.Tpo $(DEPDIR)/indicator_printers_service-cups-notifier.Po | 563 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_printers_service-cups-notifier.Tpo $(DEPDIR)/indicator_printers_service-cups-notifier.Po |
1077 | 547 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cups-notifier.c' object='indicator_printers_service-cups-notifier.o' libtool=no @AMDEPBACKSLASH@ | 564 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cups-notifier.c' object='indicator_printers_service-cups-notifier.o' libtool=no @AMDEPBACKSLASH@ |
1078 | 548 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 565 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
1080 | 549 | @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 | 566 | @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 | 550 | 567 | ||
1082 | 551 | indicator_printers_service-cups-notifier.obj: cups-notifier.c | 568 | indicator_printers_service-cups-notifier.obj: cups-notifier.c |
1084 | 552 | @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` | 569 | @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 | 553 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_printers_service-cups-notifier.Tpo $(DEPDIR)/indicator_printers_service-cups-notifier.Po | 570 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_printers_service-cups-notifier.Tpo $(DEPDIR)/indicator_printers_service-cups-notifier.Po |
1086 | 554 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cups-notifier.c' object='indicator_printers_service-cups-notifier.obj' libtool=no @AMDEPBACKSLASH@ | 571 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cups-notifier.c' object='indicator_printers_service-cups-notifier.obj' libtool=no @AMDEPBACKSLASH@ |
1087 | 555 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 572 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
1089 | 556 | @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` | 573 | @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 | 557 | 574 | ||
1091 | 558 | mostlyclean-libtool: | 575 | mostlyclean-libtool: |
1092 | 559 | -rm -f *.lo | 576 | -rm -f *.lo |
1093 | 560 | 577 | ||
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 | 38 | subdir = test | 38 | subdir = test |
1099 | 39 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | 39 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
1100 | 40 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 40 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
1102 | 41 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac | 41 | am__aclocal_m4_deps = $(top_srcdir)/m4/gcov.m4 \ |
1103 | 42 | $(top_srcdir)/configure.ac | ||
1104 | 42 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 43 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1105 | 43 | $(ACLOCAL_M4) | 44 | $(ACLOCAL_M4) |
1106 | 44 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | 45 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1107 | @@ -106,6 +107,8 @@ | |||
1108 | 106 | CC = @CC@ | 107 | CC = @CC@ |
1109 | 107 | CCDEPMODE = @CCDEPMODE@ | 108 | CCDEPMODE = @CCDEPMODE@ |
1110 | 108 | CFLAGS = @CFLAGS@ | 109 | CFLAGS = @CFLAGS@ |
1111 | 110 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | ||
1112 | 111 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | ||
1113 | 109 | CPP = @CPP@ | 112 | CPP = @CPP@ |
1114 | 110 | CPPFLAGS = @CPPFLAGS@ | 113 | CPPFLAGS = @CPPFLAGS@ |
1115 | 111 | CUPS_CONFIG = @CUPS_CONFIG@ | 114 | CUPS_CONFIG = @CUPS_CONFIG@ |
1116 | @@ -123,6 +126,8 @@ | |||
1117 | 123 | EGREP = @EGREP@ | 126 | EGREP = @EGREP@ |
1118 | 124 | EXEEXT = @EXEEXT@ | 127 | EXEEXT = @EXEEXT@ |
1119 | 125 | FGREP = @FGREP@ | 128 | FGREP = @FGREP@ |
1120 | 129 | GCOVR = @GCOVR@ | ||
1121 | 130 | GENHTML = @GENHTML@ | ||
1122 | 126 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ | 131 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1123 | 127 | GMOFILES = @GMOFILES@ | 132 | GMOFILES = @GMOFILES@ |
1124 | 128 | GMSGFMT = @GMSGFMT@ | 133 | GMSGFMT = @GMSGFMT@ |
1125 | @@ -144,6 +149,7 @@ | |||
1126 | 144 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ | 149 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1127 | 145 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ | 150 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1128 | 146 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ | 151 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1129 | 152 | LCOV = @LCOV@ | ||
1130 | 147 | LD = @LD@ | 153 | LD = @LD@ |
1131 | 148 | LDFLAGS = @LDFLAGS@ | 154 | LDFLAGS = @LDFLAGS@ |
1132 | 149 | LIBOBJS = @LIBOBJS@ | 155 | LIBOBJS = @LIBOBJS@ |
1133 | @@ -186,6 +192,7 @@ | |||
1134 | 186 | SERVICE_LIBS = @SERVICE_LIBS@ | 192 | SERVICE_LIBS = @SERVICE_LIBS@ |
1135 | 187 | SET_MAKE = @SET_MAKE@ | 193 | SET_MAKE = @SET_MAKE@ |
1136 | 188 | SHELL = @SHELL@ | 194 | SHELL = @SHELL@ |
1137 | 195 | SHTOOL = @SHTOOL@ | ||
1138 | 189 | STRIP = @STRIP@ | 196 | STRIP = @STRIP@ |
1139 | 190 | USE_NLS = @USE_NLS@ | 197 | USE_NLS = @USE_NLS@ |
1140 | 191 | VERSION = @VERSION@ | 198 | VERSION = @VERSION@ |