Merge lp:~indicator-applet-developers/ubuntu/precise/indicator-printers/upstream into lp:~ubuntu-desktop/indicator-printers/ubuntu

[Ted Gould]

0.1.6

=== modified file 'Makefile.am'
--- Makefile.am	2012-02-16 18:54:07 +0000
+++ Makefile.am	2012-04-04 20:12:19 +0000
@@ -2,3 +2,5 @@
 SUBDIRS = src data test po
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
+
+include $(top_srcdir)/Makefile.am.coverage
 
=== added file 'Makefile.am.coverage'
--- Makefile.am.coverage	1970-01-01 00:00:00 +0000
+++ Makefile.am.coverage	2012-04-04 20:12:19 +0000
@@ -0,0 +1,48 @@
+
+# Coverage targets
+
+.PHONY: clean-gcno clean-gcda \
+	coverage-html generate-coverage-html clean-coverage-html \
+	coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr
+
+clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr
+
+if HAVE_GCOV
+
+clean-gcno:
+	@echo Removing old coverage instrumentation
+	-find -name '*.gcno' -print | xargs -r rm
+
+clean-gcda:
+	@echo Removing old coverage results
+	-find -name '*.gcda' -print | xargs -r rm
+  
+coverage-html: clean-gcda
+	-$(MAKE) $(AM_MAKEFLAGS) -k check
+	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
+  
+generate-coverage-html:
+	@echo Collecting coverage data
+	$(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
+	LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
+  
+clean-coverage-html: clean-gcda
+	-$(LCOV) --directory $(top_builddir) -z
+	-rm -rf coverage.info coveragereport
+
+if HAVE_GCOVR
+
+coverage-gcovr: clean-gcda
+	-$(MAKE) $(AM_MAKEFLAGS) -k check
+	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr
+	
+generate-coverage-gcovr:
+	@echo Generating coverage GCOVR report
+	$(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml
+	
+clean-coverage-gcovr: clean-gcda
+	-rm -rf $(top_builddir)/coverage.xml
+
+endif # HAVE_GCOVR
+
+endif # HAVE_GCOV
 
=== modified file 'Makefile.in'
--- Makefile.in	2012-02-17 20:16:15 +0000
+++ Makefile.in	2012-04-04 20:12:19 +0000
@@ -14,6 +14,8 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
+# Coverage targets
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -33,14 +35,15 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	compile config.guess config.sub depcomp install-sh ltmain.sh \
-	missing mkinstalldirs
+	$(top_srcdir)/Makefile.am.coverage $(top_srcdir)/configure \
+	AUTHORS COPYING ChangeLog INSTALL NEWS compile config.guess \
+	config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gcov.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -129,6 +132,8 @@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+COVERAGE_CFLAGS = @COVERAGE_CFLAGS@
+COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
@@ -146,6 +151,8 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GCOVR = @GCOVR@
+GENHTML = @GENHTML@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -167,6 +174,7 @@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -209,6 +217,7 @@
 SERVICE_LIBS = @SERVICE_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SHTOOL = @SHTOOL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@@ -275,7 +284,7 @@
 .SUFFIXES:
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.coverage $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -298,6 +307,7 @@
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
+$(top_srcdir)/Makefile.am.coverage:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -694,7 +704,7 @@
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
-clean-am: clean-generic clean-libtool mostlyclean-am
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -767,20 +777,59 @@
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am am--refresh check check-am clean clean-generic \
-	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
-	dist-zip distcheck distclean distclean-generic distclean-hdr \
-	distclean-libtool distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags tags-recursive uninstall uninstall-am
-
+	clean-libtool clean-local ctags ctags-recursive dist dist-all \
+	dist-bzip2 dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ \
+	dist-xz dist-zip distcheck distclean distclean-generic \
+	distclean-hdr distclean-libtool distclean-tags distcleancheck \
+	distdir distuninstallcheck dvi dvi-am html html-am info \
+	info-am install install-am install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
+
+
+.PHONY: clean-gcno clean-gcda \
+	coverage-html generate-coverage-html clean-coverage-html \
+	coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr
+
+clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr
+
+@HAVE_GCOV_TRUE@clean-gcno:
+@HAVE_GCOV_TRUE@	@echo Removing old coverage instrumentation
+@HAVE_GCOV_TRUE@	-find -name '*.gcno' -print | xargs -r rm
+
+@HAVE_GCOV_TRUE@clean-gcda:
+@HAVE_GCOV_TRUE@	@echo Removing old coverage results
+@HAVE_GCOV_TRUE@	-find -name '*.gcda' -print | xargs -r rm
+
+@HAVE_GCOV_TRUE@coverage-html: clean-gcda
+@HAVE_GCOV_TRUE@	-$(MAKE) $(AM_MAKEFLAGS) -k check
+@HAVE_GCOV_TRUE@	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
+
+@HAVE_GCOV_TRUE@generate-coverage-html:
+@HAVE_GCOV_TRUE@	@echo Collecting coverage data
+@HAVE_GCOV_TRUE@	$(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
+@HAVE_GCOV_TRUE@	LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
+
+@HAVE_GCOV_TRUE@clean-coverage-html: clean-gcda
+@HAVE_GCOV_TRUE@	-$(LCOV) --directory $(top_builddir) -z
+@HAVE_GCOV_TRUE@	-rm -rf coverage.info coveragereport
+
+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@coverage-gcovr: clean-gcda
+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@	-$(MAKE) $(AM_MAKEFLAGS) -k check
+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr
+
+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@generate-coverage-gcovr:
+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@	@echo Generating coverage GCOVR report
+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@	$(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml
+
+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@clean-coverage-gcovr: clean-gcda
+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@	-rm -rf $(top_builddir)/coverage.xml
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 
=== modified file 'configure'
--- configure	2012-03-20 18:51:17 +0000
+++ configure	2012-04-04 20:12:19 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for indicator-printers 0.1.5.
+# Generated by GNU Autoconf 2.68 for indicator-printers 0.1.6.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@
 # Identity of this package.
 PACKAGE_NAME='indicator-printers'
 PACKAGE_TARNAME='indicator-printers'
-PACKAGE_VERSION='0.1.5'
-PACKAGE_STRING='indicator-printers 0.1.5'
+PACKAGE_VERSION='0.1.6'
+PACKAGE_STRING='indicator-printers 0.1.6'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -613,6 +613,18 @@
 LTLIBOBJS
 LIBOBJS
 AM_CFLAGS
+COVERAGE_LDFLAGS
+COVERAGE_CFLAGS
+HAVE_GCOVR_FALSE
+HAVE_GCOVR_TRUE
+HAVE_LCOV_FALSE
+HAVE_LCOV_TRUE
+HAVE_GCOV_FALSE
+HAVE_GCOV_TRUE
+GCOVR
+GENHTML
+LCOV
+SHTOOL
 DBUSSERVICEDIR
 INDICATORICONSDIR
 INDICATORDIR
@@ -798,6 +810,7 @@
 enable_silent_rules
 enable_nls
 enable_localinstall
+enable_gcov
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1357,7 +1370,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures indicator-printers 0.1.5 to adapt to many kinds of systems.
+\`configure' configures indicator-printers 0.1.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1428,7 +1441,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of indicator-printers 0.1.5:";;
+     short | recursive ) echo "Configuration of indicator-printers 0.1.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1447,6 +1460,7 @@
   --disable-silent-rules         verbose build output (undo: `make V=0')
   --disable-nls           do not use Native Language Support
   --enable-localinstall   install all files locally (for distcheck)
+  --enable-gcov           enable coverage testing with gcov
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1545,7 +1559,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-indicator-printers configure 0.1.5
+indicator-printers configure 0.1.6
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1910,7 +1924,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by indicator-printers $as_me 0.1.5, which was
+It was created by indicator-printers $as_me 0.1.6, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2727,7 +2741,7 @@
 
 # Define the identity of the package.
  PACKAGE='indicator-printers'
- VERSION='0.1.5'
+ VERSION='0.1.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -11511,6 +11525,7 @@
 
 
 
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 $as_echo_n "checking whether NLS is requested... " >&6; }
     # Check whether --enable-nls was given.
@@ -13235,6 +13250,278 @@
 fi
 
 
+###########################
+# gcov coverage reporting
+###########################
+
+# Checks for existence of coverage tools:
+#  * gcov
+#  * lcov
+#  * genhtml
+#  * gcovr
+#
+# Sets ac_cv_check_gcov to yes if tooling is present
+# and reports the executables to the variables LCOV, GCOVR and GENHTML.
+ # AC_TDD_GCOV
+
+
+  # Check whether --enable-gcov was given.
+if test "${enable_gcov+set}" = set; then :
+  enableval=$enable_gcov; use_gcov=$enableval
+else
+  use_gcov=no
+fi
+
+
+  if test "x$use_gcov" = "xyes"; then
+  # we need gcc:
+  if test "$GCC" != "yes"; then
+    as_fn_error $? "GCC is required for --enable-gcov" "$LINENO" 5
+  fi
+
+  # Check if ccache is being used
+  # Extract the first word of "shtool", so it can be a program name with args.
+set dummy shtool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_SHTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$SHTOOL"; then
+  ac_cv_prog_SHTOOL="$SHTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_SHTOOL="shtool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+SHTOOL=$ac_cv_prog_SHTOOL
+if test -n "$SHTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHTOOL" >&5
+$as_echo "$SHTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  case `$SHTOOL path $CC` in
+    *ccache*) gcc_ccache=yes;;
+    *) gcc_ccache=no;;
+  esac
+
+  if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then
+    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
+  fi
+
+  lcov_version_list="1.6 1.7 1.8 1.9"
+  # Extract the first word of "lcov", so it can be a program name with args.
+set dummy lcov; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_LCOV+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LCOV"; then
+  ac_cv_prog_LCOV="$LCOV" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_LCOV="lcov"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LCOV=$ac_cv_prog_LCOV
+if test -n "$LCOV"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCOV" >&5
+$as_echo "$LCOV" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  # Extract the first word of "genhtml", so it can be a program name with args.
+set dummy genhtml; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_GENHTML+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$GENHTML"; then
+  ac_cv_prog_GENHTML="$GENHTML" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_GENHTML="genhtml"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+GENHTML=$ac_cv_prog_GENHTML
+if test -n "$GENHTML"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GENHTML" >&5
+$as_echo "$GENHTML" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+  if test "$LCOV"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lcov version" >&5
+$as_echo_n "checking for lcov version... " >&6; }
+if ${glib_cv_lcov_version+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+      glib_cv_lcov_version=invalid
+      lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'`
+      for lcov_check_version in $lcov_version_list; do
+        if test "$lcov_version" = "$lcov_check_version"; then
+          glib_cv_lcov_version="$lcov_check_version (ok)"
+        fi
+      done
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $glib_cv_lcov_version" >&5
+$as_echo "$glib_cv_lcov_version" >&6; }
+  else
+    lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list"
+    as_fn_error $? "$lcov_msg" "$LINENO" 5
+  fi
+
+  case $glib_cv_lcov_version in
+    ""|invalid)
+      lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)."
+      as_fn_error $? "$lcov_msg" "$LINENO" 5
+      LCOV="exit 0;"
+      ;;
+  esac
+
+  if test -z "$GENHTML"; then
+    as_fn_error $? "Could not find genhtml from the lcov package" "$LINENO" 5
+  fi
+
+  ac_cv_check_gcov=yes
+  ac_cv_check_lcov=yes
+
+  # Remove all optimization flags from CFLAGS
+
+  CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'`
+
+
+  # Add the special gcc flags
+  COVERAGE_CFLAGS="-O0 -fprofile-arcs -ftest-coverage"
+  COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage"
+  COVERAGE_LDFLAGS="-lgcov"
+
+  # Check availability of gcovr
+  # Extract the first word of "gcovr", so it can be a program name with args.
+set dummy gcovr; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_GCOVR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$GCOVR"; then
+  ac_cv_prog_GCOVR="$GCOVR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_GCOVR="gcovr"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+GCOVR=$ac_cv_prog_GCOVR
+if test -n "$GCOVR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCOVR" >&5
+$as_echo "$GCOVR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  if test -z "$GCOVR"; then
+    ac_cv_check_gcovr=no
+  else
+    ac_cv_check_gcovr=yes
+  fi
+
+fi
+
+ if test "x$ac_cv_check_gcov" = xyes; then
+  HAVE_GCOV_TRUE=
+  HAVE_GCOV_FALSE='#'
+else
+  HAVE_GCOV_TRUE='#'
+  HAVE_GCOV_FALSE=
+fi
+
+ if test "x$ac_cv_check_lcov" = xyes; then
+  HAVE_LCOV_TRUE=
+  HAVE_LCOV_FALSE='#'
+else
+  HAVE_LCOV_TRUE='#'
+  HAVE_LCOV_FALSE=
+fi
+
+ if test "x$ac_cv_check_gcovr" = xyes; then
+  HAVE_GCOVR_TRUE=
+  HAVE_GCOVR_FALSE='#'
+else
+  HAVE_GCOVR_TRUE='#'
+  HAVE_GCOVR_FALSE=
+fi
+
+
+
 
 AM_CFLAGS="-Wall"
 
@@ -13368,6 +13655,18 @@
   ac_config_commands="$ac_config_commands po/stamp-it"
 
 
+if test -z "${HAVE_GCOV_TRUE}" && test -z "${HAVE_GCOV_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_GCOV\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_LCOV_TRUE}" && test -z "${HAVE_LCOV_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_LCOV\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_GCOVR_TRUE}" && test -z "${HAVE_GCOVR_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_GCOVR\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -13777,7 +14076,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by indicator-printers $as_me 0.1.5, which was
+This file was extended by indicator-printers $as_me 0.1.6, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13843,7 +14142,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-indicator-printers config.status 0.1.5
+indicator-printers config.status 0.1.6
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
 
=== modified file 'configure.ac'
--- configure.ac	2012-03-20 18:51:17 +0000
+++ configure.ac	2012-04-04 20:12:19 +0000
@@ -1,5 +1,5 @@
 
-AC_INIT(indicator-printers, 0.1.5)
+AC_INIT(indicator-printers, 0.1.6)
 
 AC_PREREQ(2.53)
 AM_INIT_AUTOMAKE([])
@@ -9,6 +9,7 @@
 AC_PROG_LIBTOOL
 AM_PROG_CC_C_O
 AM_SILENT_RULES([yes])
+AC_CONFIG_MACRO_DIR([m4])
 
 IT_PROG_INTLTOOL([0.35.0])
 GETTEXT_PACKAGE=indicator-printers
@@ -68,6 +69,17 @@
 fi
 AC_SUBST(DBUSSERVICEDIR)
 
+###########################
+# gcov coverage reporting
+###########################
+
+m4_include([m4/gcov.m4])
+AC_TDD_GCOV
+AM_CONDITIONAL([HAVE_GCOV], [test "x$ac_cv_check_gcov" = xyes])
+AM_CONDITIONAL([HAVE_LCOV], [test "x$ac_cv_check_lcov" = xyes])
+AM_CONDITIONAL([HAVE_GCOVR], [test "x$ac_cv_check_gcovr" = xyes])
+AC_SUBST(COVERAGE_CFLAGS)
+AC_SUBST(COVERAGE_LDFLAGS)
 
 AC_SUBST(AM_CFLAGS, "-Wall")
 
 
=== modified file 'data/Makefile.in'
--- data/Makefile.in	2012-02-17 20:19:11 +0000
+++ data/Makefile.in	2012-04-04 20:12:19 +0000
@@ -37,7 +37,8 @@
 subdir = data
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gcov.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -99,6 +100,8 @@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+COVERAGE_CFLAGS = @COVERAGE_CFLAGS@
+COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
@@ -116,6 +119,8 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GCOVR = @GCOVR@
+GENHTML = @GENHTML@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -137,6 +142,7 @@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -179,6 +185,7 @@
 SERVICE_LIBS = @SERVICE_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SHTOOL = @SHTOOL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-03-20 17:50:46 +0000
+++ debian/changelog	2012-04-04 20:12:19 +0000
@@ -1,3 +1,10 @@
+indicator-printers (0.1.6-0ubuntu1~ppa1) precise; urgency=low
+
+  * New upstream release.
+    * Add test coverage build targets
+
+ -- Ted Gould <[e-mail]>  Wed, 04 Apr 2012 15:05:58 -0500
+
 indicator-printers (0.1.5-0ubuntu1) precise; urgency=low
 
   * New upstream release.
 
=== added directory 'm4'
=== added file 'm4/gcov.m4'
--- m4/gcov.m4	1970-01-01 00:00:00 +0000
+++ m4/gcov.m4	2012-04-04 20:12:19 +0000
@@ -0,0 +1,86 @@
+# Checks for existence of coverage tools:
+#  * gcov
+#  * lcov
+#  * genhtml
+#  * gcovr
+# 
+# Sets ac_cv_check_gcov to yes if tooling is present
+# and reports the executables to the variables LCOV, GCOVR and GENHTML.
+AC_DEFUN([AC_TDD_GCOV],
+[
+  AC_ARG_ENABLE(gcov,
+  AS_HELP_STRING([--enable-gcov],
+		 [enable coverage testing with gcov]),
+  [use_gcov=$enableval], [use_gcov=no])
+
+  if test "x$use_gcov" = "xyes"; then
+  # we need gcc:
+  if test "$GCC" != "yes"; then
+    AC_MSG_ERROR([GCC is required for --enable-gcov])
+  fi
+
+  # Check if ccache is being used
+  AC_CHECK_PROG(SHTOOL, shtool, shtool)
+  case `$SHTOOL path $CC` in
+    *ccache*[)] gcc_ccache=yes;;
+    *[)] gcc_ccache=no;;
+  esac
+
+  if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then
+    AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
+  fi
+
+  lcov_version_list="1.6 1.7 1.8 1.9"
+  AC_CHECK_PROG(LCOV, lcov, lcov)
+  AC_CHECK_PROG(GENHTML, genhtml, genhtml)
+
+  if test "$LCOV"; then
+    AC_CACHE_CHECK([for lcov version], glib_cv_lcov_version, [
+      glib_cv_lcov_version=invalid
+      lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'`
+      for lcov_check_version in $lcov_version_list; do
+        if test "$lcov_version" = "$lcov_check_version"; then
+          glib_cv_lcov_version="$lcov_check_version (ok)"
+        fi
+      done
+    ])
+  else
+    lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list"
+    AC_MSG_ERROR([$lcov_msg])
+  fi
+
+  case $glib_cv_lcov_version in
+    ""|invalid[)]
+      lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)."
+      AC_MSG_ERROR([$lcov_msg])
+      LCOV="exit 0;"
+      ;;
+  esac
+
+  if test -z "$GENHTML"; then
+    AC_MSG_ERROR([Could not find genhtml from the lcov package])
+  fi
+
+  ac_cv_check_gcov=yes
+  ac_cv_check_lcov=yes
+
+  # Remove all optimization flags from CFLAGS
+  changequote({,})
+  CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'`
+  changequote([,])
+
+  # Add the special gcc flags
+  COVERAGE_CFLAGS="-O0 -fprofile-arcs -ftest-coverage"
+  COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage"	
+  COVERAGE_LDFLAGS="-lgcov"
+
+  # Check availability of gcovr
+  AC_CHECK_PROG(GCOVR, gcovr, gcovr)
+  if test -z "$GCOVR"; then
+    ac_cv_check_gcovr=no
+  else
+    ac_cv_check_gcovr=yes
+  fi
+
+fi
+]) # AC_TDD_GCOV
 
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-02-16 18:45:24 +0000
+++ src/Makefile.am	2012-04-04 20:12:19 +0000
@@ -9,8 +9,11 @@
 	dbus-names.h
 
 libprintersmenu_la_CPPFLAGS = $(APPLET_CFLAGS)
+libprintersmenu_la_CFLAGS = $(COVERAGE_CFLAGS)
 libprintersmenu_la_LIBADD = $(APPLET_LIBS) -lm
-libprintersmenu_la_LDFLAGS = -module -avoid-version
+libprintersmenu_la_LDFLAGS = \
+	$(COVERAGE_LDFLAGS) \
+	-module -avoid-version
 
 
 cups_notifier_sources = \
@@ -39,7 +42,9 @@
 nodist_indicator_printers_service_SOURCES = $(cups_notifier_sources)
 
 indicator_printers_service_CPPFLAGS = $(SERVICE_CFLAGS)
+indicator_printers_service_CFLAGS = $(COVERAGE_CFLAGS)
 indicator_printers_service_LDADD = $(SERVICE_LIBS)
+indicator_printers_service_LDFLAGS = $(COVERAGE_LDFLAGS)
 
 
 BUILT_SOURCES = $(cups_notifier_sources)
 
=== modified file 'src/Makefile.in'
--- src/Makefile.in	2012-02-17 20:16:15 +0000
+++ src/Makefile.in	2012-04-04 20:12:19 +0000
@@ -39,7 +39,8 @@
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gcov.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -87,8 +88,8 @@
 am__v_lt_0 = --silent
 libprintersmenu_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(libprintersmenu_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+	$(libprintersmenu_la_CFLAGS) $(CFLAGS) \
+	$(libprintersmenu_la_LDFLAGS) $(LDFLAGS) -o $@
 PROGRAMS = $(libexec_PROGRAMS)
 am_indicator_printers_service_OBJECTS = indicator_printers_service-indicator-printers-service.$(OBJEXT) \
 	indicator_printers_service-indicator-printers-menu.$(OBJEXT) \
@@ -100,6 +101,10 @@
 	$(am_indicator_printers_service_OBJECTS) \
 	$(nodist_indicator_printers_service_OBJECTS)
 indicator_printers_service_DEPENDENCIES = $(am__DEPENDENCIES_1)
+indicator_printers_service_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(indicator_printers_service_CFLAGS) $(CFLAGS) \
+	$(indicator_printers_service_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -151,6 +156,8 @@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+COVERAGE_CFLAGS = @COVERAGE_CFLAGS@
+COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
@@ -168,6 +175,8 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GCOVR = @GCOVR@
+GENHTML = @GENHTML@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -189,6 +198,7 @@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -231,6 +241,7 @@
 SERVICE_LIBS = @SERVICE_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SHTOOL = @SHTOOL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@@ -299,8 +310,12 @@
 	dbus-names.h
 
 libprintersmenu_la_CPPFLAGS = $(APPLET_CFLAGS)
+libprintersmenu_la_CFLAGS = $(COVERAGE_CFLAGS)
 libprintersmenu_la_LIBADD = $(APPLET_LIBS) -lm
-libprintersmenu_la_LDFLAGS = -module -avoid-version
+libprintersmenu_la_LDFLAGS = \
+	$(COVERAGE_LDFLAGS) \
+	-module -avoid-version
+
 cups_notifier_sources = \
 	cups-notifier.c \
 	cups-notifier.h
@@ -317,7 +332,9 @@
 
 nodist_indicator_printers_service_SOURCES = $(cups_notifier_sources)
 indicator_printers_service_CPPFLAGS = $(SERVICE_CFLAGS)
+indicator_printers_service_CFLAGS = $(COVERAGE_CFLAGS)
 indicator_printers_service_LDADD = $(SERVICE_LIBS)
+indicator_printers_service_LDFLAGS = $(COVERAGE_LDFLAGS)
 BUILT_SOURCES = $(cups_notifier_sources)
 CLEANFILES = $(BUILT_SOURCES)
 EXTRA_DIST = org.cups.cupsd.Notifier.xml
@@ -434,7 +451,7 @@
 	rm -f $$list
 indicator-printers-service$(EXEEXT): $(indicator_printers_service_OBJECTS) $(indicator_printers_service_DEPENDENCIES) $(EXTRA_indicator_printers_service_DEPENDENCIES) 
 	@rm -f indicator-printers-service$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(indicator_printers_service_OBJECTS) $(indicator_printers_service_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(indicator_printers_service_LINK) $(indicator_printers_service_OBJECTS) $(indicator_printers_service_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -472,88 +489,88 @@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 libprintersmenu_la-indicator-printers.lo: indicator-printers.c
-@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
+@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
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libprintersmenu_la-indicator-printers.Tpo $(DEPDIR)/libprintersmenu_la-indicator-printers.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='indicator-printers.c' object='libprintersmenu_la-indicator-printers.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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
+@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
 
 libprintersmenu_la-indicator-menu-item.lo: indicator-menu-item.c
-@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
+@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
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libprintersmenu_la-indicator-menu-item.Tpo $(DEPDIR)/libprintersmenu_la-indicator-menu-item.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='indicator-menu-item.c' object='libprintersmenu_la-indicator-menu-item.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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
+@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
 
 indicator_printers_service-indicator-printers-service.o: indicator-printers-service.c
-@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
+@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
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_printers_service-indicator-printers-service.Tpo $(DEPDIR)/indicator_printers_service-indicator-printers-service.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='indicator-printers-service.c' object='indicator_printers_service-indicator-printers-service.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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
+@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
 
 indicator_printers_service-indicator-printers-service.obj: indicator-printers-service.c
-@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`
+@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`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_printers_service-indicator-printers-service.Tpo $(DEPDIR)/indicator_printers_service-indicator-printers-service.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='indicator-printers-service.c' object='indicator_printers_service-indicator-printers-service.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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`
+@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`
 
 indicator_printers_service-indicator-printers-menu.o: indicator-printers-menu.c
-@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
+@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
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_printers_service-indicator-printers-menu.Tpo $(DEPDIR)/indicator_printers_service-indicator-printers-menu.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='indicator-printers-menu.c' object='indicator_printers_service-indicator-printers-menu.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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
+@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
 
 indicator_printers_service-indicator-printers-menu.obj: indicator-printers-menu.c
-@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`
+@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`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_printers_service-indicator-printers-menu.Tpo $(DEPDIR)/indicator_printers_service-indicator-printers-menu.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='indicator-printers-menu.c' object='indicator_printers_service-indicator-printers-menu.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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`
+@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`
 
 indicator_printers_service-indicator-printer-state-notifier.o: indicator-printer-state-notifier.c
-@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
+@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
 @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
 @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@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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
+@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
 
 indicator_printers_service-indicator-printer-state-notifier.obj: indicator-printer-state-notifier.c
-@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`
+@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`
 @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
 @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@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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`
+@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`
 
 indicator_printers_service-spawn-printer-settings.o: spawn-printer-settings.c
-@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
+@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
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_printers_service-spawn-printer-settings.Tpo $(DEPDIR)/indicator_printers_service-spawn-printer-settings.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='spawn-printer-settings.c' object='indicator_printers_service-spawn-printer-settings.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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
+@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
 
 indicator_printers_service-spawn-printer-settings.obj: spawn-printer-settings.c
-@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`
+@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`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_printers_service-spawn-printer-settings.Tpo $(DEPDIR)/indicator_printers_service-spawn-printer-settings.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='spawn-printer-settings.c' object='indicator_printers_service-spawn-printer-settings.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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`
+@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`
 
 indicator_printers_service-cups-notifier.o: cups-notifier.c
-@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
+@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
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_printers_service-cups-notifier.Tpo $(DEPDIR)/indicator_printers_service-cups-notifier.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cups-notifier.c' object='indicator_printers_service-cups-notifier.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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
+@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
 
 indicator_printers_service-cups-notifier.obj: cups-notifier.c
-@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`
+@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`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_printers_service-cups-notifier.Tpo $(DEPDIR)/indicator_printers_service-cups-notifier.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cups-notifier.c' object='indicator_printers_service-cups-notifier.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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`
+@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`
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
=== modified file 'test/Makefile.in'
--- test/Makefile.in	2012-02-17 20:16:15 +0000
+++ test/Makefile.in	2012-04-04 20:12:19 +0000
@@ -38,7 +38,8 @@
 subdir = test
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gcov.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -106,6 +107,8 @@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+COVERAGE_CFLAGS = @COVERAGE_CFLAGS@
+COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
@@ -123,6 +126,8 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GCOVR = @GCOVR@
+GENHTML = @GENHTML@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -144,6 +149,7 @@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -186,6 +192,7 @@
 SERVICE_LIBS = @SERVICE_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SHTOOL = @SHTOOL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@