diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2012-04-05 15:07:16 -0400 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2012-04-05 15:07:16 -0400 |
| commit | 016b902f90a8ea66201dd8f5517ad2557ea4d98d (patch) | |
| tree | 2f2899f32a41130b1097980df1aac772bba780ae | |
| parent | 96e1a9f55bedc6ac86bf9a9299bfcc380b7329fb (diff) | |
| parent | 7897fdf647ff172bfc79aed5bd63fc6f5d52b0a8 (diff) | |
| download | ayatana-indicator-session-016b902f90a8ea66201dd8f5517ad2557ea4d98d.tar.gz ayatana-indicator-session-016b902f90a8ea66201dd8f5517ad2557ea4d98d.tar.bz2 ayatana-indicator-session-016b902f90a8ea66201dd8f5517ad2557ea4d98d.zip | |
* New upstream release.
* Remove desktop files so they don't appear in the dash. (LP: #973181)
* Add gcov to the build for coverage statistics
37 files changed, 775 insertions, 189 deletions
@@ -2,6 +2,7 @@ Alberto Mardegan Alexander Sack + Allan LeSage Charles Kerr Christoph Korn Cody Russell @@ -1,5 +1,41 @@ # Generated by Makefile. Do not edit. +2012-04-05 Charles Kerr <charles.kerr@canonical.com> + + 0.3.96 + +2012-04-04 Charles Kerr <charles.kerr@canonical.com> + + merge lp:~ted/indicator-session/no-system-desktop-files to remove the desktop files so they don't appear in the dash. + +2012-04-04 Ted Gould <ted@gould.cx> + + Attaching bug + +2012-04-04 Ted Gould <ted@gould.cx> + + Dropping the desktop files from translations + +2012-04-04 Ted Gould <ted@gould.cx> + + Dropping the desktop files from the build + +2012-03-29 Charles Kerr <charles.kerr@canonical.com> + + merge lp:~allanlesage/indicator-session/TDD to add gcov to the build for coverage statitistics + +2012-03-29 Allan LeSage <allanlesage@gmail.com> + + Advised changes to fix implicit declarations. + +2012-03-28 Allan LeSage <allanlesage@gmail.com> + + Merged from trunk. + +2012-03-27 Allan LeSage <allanlesage@gmail.com> + + Added gcov coverage tooling. + 2012-03-21 Charles Kerr <charles.kerr@canonical.com> 0.3.95 diff --git a/Makefile.am b/Makefile.am index d63dac8..bb27c84 100644 --- a/Makefile.am +++ b/Makefile.am @@ -72,3 +72,5 @@ test-ascii-quotes: po @chmod +x $@ CLEANFILES = $(TESTS) + +include $(top_srcdir)/Makefile.am.coverage diff --git a/Makefile.am.coverage b/Makefile.am.coverage new file mode 100644 index 0000000..fb97747 --- /dev/null +++ b/Makefile.am.coverage @@ -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 diff --git a/Makefile.in b/Makefile.in index 0951a30..2d8ccef 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,6 +14,8 @@ # PARTICULAR PURPOSE. @SET_MAKE@ + +# Coverage targets VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -33,17 +35,18 @@ PRE_UNINSTALL = : 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)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(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 \ @@ -133,6 +136,8 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -149,6 +154,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOVR = @GCOVR@ +GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ @@ -177,6 +184,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ 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@ @@ -222,6 +230,7 @@ SESSIONSERVICE_CFLAGS = @SESSIONSERVICE_CFLAGS@ SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHTOOL = @SHTOOL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -300,7 +309,7 @@ all: config.h .SUFFIXES: am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.coverage $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -323,6 +332,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status 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 @@ -817,7 +827,7 @@ maintainer-clean-generic: @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) @@ -890,10 +900,10 @@ uninstall-am: .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-TESTS check-am clean \ - clean-generic clean-libtool ctags ctags-recursive dist \ - dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-lzma \ - dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ - distclean-generic distclean-hdr distclean-libtool \ + clean-generic clean-libtool clean-local ctags ctags-recursive \ + dist dist-all dist-bzip2 dist-gzip dist-hook 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 \ @@ -964,6 +974,44 @@ test-ascii-quotes: po @echo "exit 0" >> $@ @chmod +x $@ +.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. .NOEXPORT: @@ -615,6 +615,18 @@ LTLIBOBJS LIBOBJS HAS_GUDEV_FALSE HAS_GUDEV_TRUE +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 MKINSTALLDIRS POSUB POFILES @@ -824,6 +836,7 @@ with_gtk enable_gtklogouthelper enable_apt enable_localinstall +enable_gcov ' ac_precious_vars='build_alias host_alias @@ -1482,6 +1495,7 @@ Optional Features: --disable-apt disable APT support --enable-localinstall install all of the files localy instead of system directories (for distcheck) + --enable-gcov enable coverage testing with gcov Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -2774,7 +2788,7 @@ fi # Define the identity of the package. PACKAGE=indicator-session - VERSION=0.3.95 + VERSION=0.3.96 cat >>confdefs.h <<_ACEOF @@ -14758,6 +14772,279 @@ $as_echo "$LINGUAS" >&6; } ########################### +# 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 + + + + +########################### # Files ########################### @@ -14922,6 +15209,18 @@ if test -z "${BUILD_APT_TRUE}" && test -z "${BUILD_APT_FALSE}"; then as_fn_error $? "conditional \"BUILD_APT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +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 if test -z "${HAS_GUDEV_TRUE}" && test -z "${HAS_GUDEV_FALSE}"; then as_fn_error $? "conditional \"HAS_GUDEV\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -17224,19 +17523,21 @@ fi SUS Indicator Configuration: - Prefix: $prefix - Indicator Dir: $INDICATORDIR - Indicator GTK: $with_gtk - Logout Helper: $have_gtklogouthelper - APT support: $enable_apt + Prefix: $prefix + Indicator Dir: $INDICATORDIR + Indicator GTK: $with_gtk + Logout Helper: $have_gtklogouthelper + APT support: $enable_apt + Coverage reporting: $use_gcov " >&5 $as_echo "$as_me: SUS Indicator Configuration: - Prefix: $prefix - Indicator Dir: $INDICATORDIR - Indicator GTK: $with_gtk - Logout Helper: $have_gtklogouthelper - APT support: $enable_apt + Prefix: $prefix + Indicator Dir: $INDICATORDIR + Indicator GTK: $with_gtk + Logout Helper: $have_gtklogouthelper + APT support: $enable_apt + Coverage reporting: $use_gcov " >&6;} diff --git a/configure.ac b/configure.ac index 1230e8b..1ef7d50 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT(src/indicator-session.c) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-session, 0.3.95) +AM_INIT_AUTOMAKE(indicator-session, 0.3.96) AM_MAINTAINER_MODE @@ -198,6 +198,18 @@ AC_DEFINE_PATH(GNOMELOCALEDIR, "${datadir}/locale", [locale directory]) AM_GLIB_GNU_GETTEXT ########################### +# 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) + +########################### # Files ########################### @@ -237,9 +249,10 @@ AC_MSG_NOTICE([ SUS Indicator Configuration: - Prefix: $prefix - Indicator Dir: $INDICATORDIR - Indicator GTK: $with_gtk - Logout Helper: $have_gtklogouthelper - APT support: $enable_apt + Prefix: $prefix + Indicator Dir: $INDICATORDIR + Indicator GTK: $with_gtk + Logout Helper: $have_gtklogouthelper + APT support: $enable_apt + Coverage reporting: $use_gcov ]) diff --git a/data/Makefile.am b/data/Makefile.am index 3b8de1f..27b5ea2 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -25,30 +25,3 @@ EXTRA_DIST = \ CLEANFILES = \ $(dbus_services_DATA) \ $(gsettings_SCHEMAS) - -if BUILD_GTKLOGOUTHELPER -@INTLTOOL_DESKTOP_RULE@ - -%.desktop.in: %.desktop.in.in - sed \ - -e "s|\@libexecdir\@|$(libexecdir)|" \ - -e "s|\@bindir\@|$(bindir)|" \ - $< > $@ - -logout_helper_desktop_in_in_files = \ - indicator-session-lock-screen.desktop.in.in \ - indicator-session-logout.desktop.in.in \ - indicator-session-restart.desktop.in.in \ - indicator-session-shutdown.desktop.in.in - -logout_helperdir = $(datadir)/applications -logout_helper_desktop_files = \ - $(logout_helper_desktop_in_in_files:.desktop.in.in=.desktop) -logout_helper_DATA = $(logout_helper_desktop_files) - -EXTRA_DIST += \ - $(logout_helper_desktop_in_in_files) - -CLEANFILES += \ - $(logout_helper_desktop_files) -endif diff --git a/data/Makefile.in b/data/Makefile.in index faef96e..cea83a7 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -34,12 +34,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@BUILD_GTKLOGOUTHELPER_TRUE@am__append_1 = \ -@BUILD_GTKLOGOUTHELPER_TRUE@ $(logout_helper_desktop_in_in_files) - -@BUILD_GTKLOGOUTHELPER_TRUE@am__append_2 = \ -@BUILD_GTKLOGOUTHELPER_TRUE@ $(logout_helper_desktop_files) - subdir = data DIST_COMMON = $(dist_convert_DATA) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in @@ -47,7 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(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 @@ -97,9 +92,8 @@ am__uninstall_files_from_dir = { \ $(am__cd) "$$dir" && rm -f $$files; }; \ } am__installdirs = "$(DESTDIR)$(dbus_servicesdir)" \ - "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(logout_helperdir)" -DATA = $(dbus_services_DATA) $(dist_convert_DATA) \ - $(logout_helper_DATA) + "$(DESTDIR)$(convertdir)" +DATA = $(dbus_services_DATA) $(dist_convert_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -150,6 +144,8 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -166,6 +162,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOVR = @GCOVR@ +GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ @@ -194,6 +192,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ 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@ @@ -239,6 +238,7 @@ SESSIONSERVICE_CFLAGS = @SESSIONSERVICE_CFLAGS@ SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHTOOL = @SHTOOL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -308,21 +308,14 @@ dbus_services_DATA = $(service_in_files:.service.in=.service) gsettings_SCHEMAS = com.canonical.indicator.session.gschema.xml convertdir = $(datadir)/GConf/gsettings dist_convert_DATA = indicator-session.convert -EXTRA_DIST = $(service_in_files) $(gsettings_SCHEMAS:.xml=.xml.in) \ - $(am__append_1) -CLEANFILES = $(dbus_services_DATA) $(gsettings_SCHEMAS) \ - $(am__append_2) -@BUILD_GTKLOGOUTHELPER_TRUE@logout_helper_desktop_in_in_files = \ -@BUILD_GTKLOGOUTHELPER_TRUE@ indicator-session-lock-screen.desktop.in.in \ -@BUILD_GTKLOGOUTHELPER_TRUE@ indicator-session-logout.desktop.in.in \ -@BUILD_GTKLOGOUTHELPER_TRUE@ indicator-session-restart.desktop.in.in \ -@BUILD_GTKLOGOUTHELPER_TRUE@ indicator-session-shutdown.desktop.in.in - -@BUILD_GTKLOGOUTHELPER_TRUE@logout_helperdir = $(datadir)/applications -@BUILD_GTKLOGOUTHELPER_TRUE@logout_helper_desktop_files = \ -@BUILD_GTKLOGOUTHELPER_TRUE@ $(logout_helper_desktop_in_in_files:.desktop.in.in=.desktop) - -@BUILD_GTKLOGOUTHELPER_TRUE@logout_helper_DATA = $(logout_helper_desktop_files) +EXTRA_DIST = \ + $(service_in_files) \ + $(gsettings_SCHEMAS:.xml=.xml.in) + +CLEANFILES = \ + $(dbus_services_DATA) \ + $(gsettings_SCHEMAS) + all: all-recursive .SUFFIXES: @@ -398,24 +391,6 @@ uninstall-dist_convertDATA: @list='$(dist_convert_DATA)'; test -n "$(convertdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(convertdir)'; $(am__uninstall_files_from_dir) -install-logout_helperDATA: $(logout_helper_DATA) - @$(NORMAL_INSTALL) - test -z "$(logout_helperdir)" || $(MKDIR_P) "$(DESTDIR)$(logout_helperdir)" - @list='$(logout_helper_DATA)'; test -n "$(logout_helperdir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(logout_helperdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(logout_helperdir)" || exit $$?; \ - done - -uninstall-logout_helperDATA: - @$(NORMAL_UNINSTALL) - @list='$(logout_helper_DATA)'; test -n "$(logout_helperdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(logout_helperdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -615,7 +590,7 @@ check: check-recursive all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(dbus_servicesdir)" "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(logout_helperdir)"; do \ + for dir in "$(DESTDIR)$(dbus_servicesdir)" "$(DESTDIR)$(convertdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -669,8 +644,7 @@ info: info-recursive info-am: -install-data-am: install-dbus_servicesDATA install-dist_convertDATA \ - install-logout_helperDATA +install-data-am: install-dbus_servicesDATA install-dist_convertDATA install-dvi: install-dvi-recursive @@ -714,8 +688,7 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-dbus_servicesDATA uninstall-dist_convertDATA \ - uninstall-logout_helperDATA +uninstall-am: uninstall-dbus_servicesDATA uninstall-dist_convertDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -728,14 +701,13 @@ uninstall-am: uninstall-dbus_servicesDATA uninstall-dist_convertDATA \ install-data-am install-dbus_servicesDATA \ install-dist_convertDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-logout_helperDATA \ - 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 uninstall-dbus_servicesDATA \ - uninstall-dist_convertDATA uninstall-logout_helperDATA + 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 \ + uninstall-dbus_servicesDATA uninstall-dist_convertDATA %.service: %.service.in @@ -746,14 +718,6 @@ uninstall-am: uninstall-dbus_servicesDATA uninstall-dist_convertDATA \ @GSETTINGS_RULES@ -@BUILD_GTKLOGOUTHELPER_TRUE@@INTLTOOL_DESKTOP_RULE@ - -@BUILD_GTKLOGOUTHELPER_TRUE@%.desktop.in: %.desktop.in.in -@BUILD_GTKLOGOUTHELPER_TRUE@ sed \ -@BUILD_GTKLOGOUTHELPER_TRUE@ -e "s|\@libexecdir\@|$(libexecdir)|" \ -@BUILD_GTKLOGOUTHELPER_TRUE@ -e "s|\@bindir\@|$(bindir)|" \ -@BUILD_GTKLOGOUTHELPER_TRUE@ $< > $@ - # 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. .NOEXPORT: diff --git a/data/extra-sessions/Makefile.in b/data/extra-sessions/Makefile.in index 7707158..cde10fc 100644 --- a/data/extra-sessions/Makefile.in +++ b/data/extra-sessions/Makefile.in @@ -44,7 +44,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(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 @@ -105,6 +106,8 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -121,6 +124,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOVR = @GCOVR@ +GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ @@ -149,6 +154,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ 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@ @@ -194,6 +200,7 @@ SESSIONSERVICE_CFLAGS = @SESSIONSERVICE_CFLAGS@ SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHTOOL = @SHTOOL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ diff --git a/data/icons/16x16/Makefile.in b/data/icons/16x16/Makefile.in index bc823b3..2ac3c90 100644 --- a/data/icons/16x16/Makefile.in +++ b/data/icons/16x16/Makefile.in @@ -39,7 +39,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(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 @@ -111,6 +112,8 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -127,6 +130,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOVR = @GCOVR@ +GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ @@ -155,6 +160,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ 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@ @@ -200,6 +206,7 @@ SESSIONSERVICE_CFLAGS = @SESSIONSERVICE_CFLAGS@ SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHTOOL = @SHTOOL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ diff --git a/data/icons/16x16/actions/Makefile.in b/data/icons/16x16/actions/Makefile.in index 6d8136f..83a14ac 100644 --- a/data/icons/16x16/actions/Makefile.in +++ b/data/icons/16x16/actions/Makefile.in @@ -40,7 +40,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(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 @@ -101,6 +102,8 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -117,6 +120,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOVR = @GCOVR@ +GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ @@ -145,6 +150,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ 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@ @@ -190,6 +196,7 @@ SESSIONSERVICE_CFLAGS = @SESSIONSERVICE_CFLAGS@ SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHTOOL = @SHTOOL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ diff --git a/data/icons/16x16/status/Makefile.in b/data/icons/16x16/status/Makefile.in index dbfc452..a4863ed 100644 --- a/data/icons/16x16/status/Makefile.in +++ b/data/icons/16x16/status/Makefile.in @@ -40,7 +40,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(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 @@ -101,6 +102,8 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -117,6 +120,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOVR = @GCOVR@ +GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ @@ -145,6 +150,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ 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@ @@ -190,6 +196,7 @@ SESSIONSERVICE_CFLAGS = @SESSIONSERVICE_CFLAGS@ SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHTOOL = @SHTOOL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ diff --git a/data/icons/22x22/Makefile.in b/data/icons/22x22/Makefile.in index 2bf911a..d3c1f55 100644 --- a/data/icons/22x22/Makefile.in +++ b/data/icons/22x22/Makefile.in @@ -39,7 +39,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(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 @@ -111,6 +112,8 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -127,6 +130,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOVR = @GCOVR@ +GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ @@ -155,6 +160,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ 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@ @@ -200,6 +206,7 @@ SESSIONSERVICE_CFLAGS = @SESSIONSERVICE_CFLAGS@ SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHTOOL = @SHTOOL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ diff --git a/data/icons/22x22/actions/Makefile.in b/data/icons/22x22/actions/Makefile.in index 1fd9a32..274e1d9 100644 --- a/data/icons/22x22/actions/Makefile.in +++ b/data/icons/22x22/actions/Makefile.in @@ -40,7 +40,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(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 @@ -101,6 +102,8 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -117,6 +120,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOVR = @GCOVR@ +GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ @@ -145,6 +150,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ 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@ @@ -190,6 +196,7 @@ SESSIONSERVICE_CFLAGS = @SESSIONSERVICE_CFLAGS@ SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHTOOL = @SHTOOL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ diff --git a/data/icons/22x22/status/Makefile.in b/data/icons/22x22/status/Makefile.in index b0c6c6a..3f77b86 100644 --- a/data/icons/22x22/status/Makefile.in +++ b/data/icons/22x22/status/Makefile.in @@ -40,7 +40,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(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 @@ -101,6 +102,8 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -117,6 +120,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOVR = @GCOVR@ +GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ @@ -145,6 +150,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ 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@ @@ -190,6 +196,7 @@ SESSIONSERVICE_CFLAGS = @SESSIONSERVICE_CFLAGS@ SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHTOOL = @SHTOOL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ diff --git a/data/icons/24x24/Makefile.in b/data/icons/24x24/Makefile.in index 4297c28..a8495b1 100644 --- a/data/icons/24x24/Makefile.in +++ b/data/icons/24x24/Makefile.in @@ -39,7 +39,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(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 @@ -111,6 +112,8 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -127,6 +130,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOVR = @GCOVR@ +GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ @@ -155,6 +160,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ 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@ @@ -200,6 +206,7 @@ SESSIONSERVICE_CFLAGS = @SESSIONSERVICE_CFLAGS@ SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHTOOL = @SHTOOL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ diff --git a/data/icons/24x24/actions/Makefile.in b/data/icons/24x24/actions/Makefile.in index 732f6ea..75e79e6 100644 --- a/data/icons/24x24/actions/Makefile.in +++ b/data/icons/24x24/actions/Makefile.in @@ -40,7 +40,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(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 @@ -101,6 +102,8 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -117,6 +120,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOVR = @GCOVR@ +GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ @@ -145,6 +150,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ 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@ @@ -190,6 +196,7 @@ SESSIONSERVICE_CFLAGS = @SESSIONSERVICE_CFLAGS@ SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHTOOL = @SHTOOL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ diff --git a/data/icons/24x24/status/Makefile.in b/data/icons/24x24/status/Makefile.in index 3c9ad5e..8e3bf89 100644 --- a/data/icons/24x24/status/Makefile.in +++ b/data/icons/24x24/status/Makefile.in @@ -40,7 +40,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(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 @@ -101,6 +102,8 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -117,6 +120,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOVR = @GCOVR@ +GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ @@ -145,6 +150,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ 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@ @@ -190,6 +196,7 @@ SESSIONSERVICE_CFLAGS = @SESSIONSERVICE_CFLAGS@ SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHTOOL = @SHTOOL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ diff --git a/data/icons/32x32/Makefile.in b/data/icons/32x32/Makefile.in index c3fd358..fa3ec29 100644 --- a/data/icons/32x32/Makefile.in +++ b/data/icons/32x32/Makefile.in @@ -39,7 +39,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(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 @@ -111,6 +112,8 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -127,6 +130,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOVR = @GCOVR@ +GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ @@ -155,6 +160,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ 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@ @@ -200,6 +206,7 @@ SESSIONSERVICE_CFLAGS = @SESSIONSERVICE_CFLAGS@ SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHTOOL = @SHTOOL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ diff --git a/data/icons/32x32/actions/Makefile.in b/data/icons/32x32/actions/Makefile.in index 808bc63..1f1e3b7 100644 --- a/data/icons/32x32/actions/Makefile.in +++ b/data/icons/32x32/actions/Makefile.in @@ -40,7 +40,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(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 @@ -101,6 +102,8 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -117,6 +120,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOVR = @GCOVR@ +GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ @@ -145,6 +150,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ 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@ @@ -190,6 +196,7 @@ SESSIONSERVICE_CFLAGS = @SESSIONSERVICE_CFLAGS@ SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHTOOL = @SHTOOL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ diff --git a/data/icons/32x32/status/Makefile.in b/data/icons/32x32/status/Makefile.in index f9c3406..bf27534 100644 --- a/data/icons/32x32/status/Makefile.in +++ b/data/icons/32x32/status/Makefile.in @@ -40,7 +40,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(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 @@ -101,6 +102,8 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -117,6 +120,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOVR = @GCOVR@ +GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ @@ -145,6 +150,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ 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@ @@ -190,6 +196,7 @@ SESSIONSERVICE_CFLAGS = @SESSIONSERVICE_CFLAGS@ SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHTOOL = @SHTOOL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in index 5a43dc7..e49ecd3 100644 --- a/data/icons/Makefile.in +++ b/data/icons/Makefile.in @@ -39,7 +39,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(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 @@ -111,6 +112,8 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -127,6 +130,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOVR = @GCOVR@ +GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ @@ -155,6 +160,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ 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@ @@ -200,6 +206,7 @@ SESSIONSERVICE_CFLAGS = @SESSIONSERVICE_CFLAGS@ SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHTOOL = @SHTOOL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ diff --git a/data/icons/scalable/Makefile.in b/data/icons/scalable/Makefile.in index 5078e6b..ea39187 100644 --- a/data/icons/scalable/Makefile.in +++ b/data/icons/scalable/Makefile.in @@ -39,7 +39,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(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 @@ -111,6 +112,8 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -127,6 +130,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOVR = @GCOVR@ +GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ @@ -155,6 +160,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ 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@ @@ -200,6 +206,7 @@ SESSIONSERVICE_CFLAGS = @SESSIONSERVICE_CFLAGS@ SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHTOOL = @SHTOOL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ diff --git a/data/icons/scalable/actions/Makefile.in b/data/icons/scalable/actions/Makefile.in index 0c836b5..8cb05a9 100644 --- a/data/icons/scalable/actions/Makefile.in +++ b/data/icons/scalable/actions/Makefile.in @@ -40,7 +40,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(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 @@ -101,6 +102,8 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -117,6 +120,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOVR = @GCOVR@ +GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ @@ -145,6 +150,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ 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@ @@ -190,6 +196,7 @@ SESSIONSERVICE_CFLAGS = @SESSIONSERVICE_CFLAGS@ SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHTOOL = @SHTOOL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ diff --git a/data/icons/scalable/status/Makefile.in b/data/icons/scalable/status/Makefile.in index f8f082c..c84e227 100644 --- a/data/icons/scalable/status/Makefile.in +++ b/data/icons/scalable/status/Makefile.in @@ -40,7 +40,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(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 @@ -101,6 +102,8 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -117,6 +120,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOVR = @GCOVR@ +GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ @@ -145,6 +150,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ 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@ @@ -190,6 +196,7 @@ SESSIONSERVICE_CFLAGS = @SESSIONSERVICE_CFLAGS@ SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHTOOL = @SHTOOL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ diff --git a/data/indicator-session-lock-screen.desktop.in.in b/data/indicator-session-lock-screen.desktop.in.in deleted file mode 100644 index c414402..0000000 --- a/data/indicator-session-lock-screen.desktop.in.in +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -_Name=Lock Screen -TryExec=@bindir@/xdg-screensaver -Exec=@bindir@/xdg-screensaver lock -Icon=system-lock-screen -Terminal=false -Type=Application -OnlyShowIn=Unity; -Categories=System; -Version=1.0 diff --git a/data/indicator-session-logout.desktop.in.in b/data/indicator-session-logout.desktop.in.in deleted file mode 100644 index 800324e..0000000 --- a/data/indicator-session-logout.desktop.in.in +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -_Name=Log Out -TryExec=@libexecdir@/gtk-logout-helper -Exec=@libexecdir@/gtk-logout-helper --logout -Icon=system-log-out -Terminal=false -Type=Application -OnlyShowIn=Unity; -Categories=System; -Version=1.0 diff --git a/data/indicator-session-restart.desktop.in.in b/data/indicator-session-restart.desktop.in.in deleted file mode 100644 index 51acded..0000000 --- a/data/indicator-session-restart.desktop.in.in +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -_Name=Restart -TryExec=@libexecdir@/gtk-logout-helper -Exec=@libexecdir@/gtk-logout-helper --restart -Icon=system-restart -Terminal=false -Type=Application -OnlyShowIn=Unity; -Categories=System; -Version=1.0 diff --git a/data/indicator-session-shutdown.desktop.in.in b/data/indicator-session-shutdown.desktop.in.in deleted file mode 100644 index 4603fd1..0000000 --- a/data/indicator-session-shutdown.desktop.in.in +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -_Name=Shut Down -TryExec=@libexecdir@/gtk-logout-helper -Exec=@libexecdir@/gtk-logout-helper --shutdown -Icon=system-shutdown -Terminal=false -Type=Application -OnlyShowIn=Unity; -Categories=System; -Version=1.0 diff --git a/debian/changelog b/debian/changelog index 5baedff..fe0c22b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +indicator-session (0.3.96-0ubuntu1) precise; urgency=low + + * New upstream release. + * Remove desktop files so they don't appear in the dash. (LP: #973181) + * Add gcov to the build for coverage statistics + + -- Charles Kerr <charles.kerr@canonical.com> Thu, 05 Apr 2012 12:50:09 -0500 + indicator-session (0.3.95-0ubuntu1) precise; urgency=low * New upstream release. diff --git a/m4/gcov.m4 b/m4/gcov.m4 new file mode 100644 index 0000000..3163584 --- /dev/null +++ b/m4/gcov.m4 @@ -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 diff --git a/po/POTFILES.in b/po/POTFILES.in index 18b5d9b..03a259c 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,10 +1,6 @@ [encoding: UTF-8] data/com.canonical.indicator.session.gschema.xml.in data/extra-sessions/classic-desktop.desktop.in.in -data/indicator-session-lock-screen.desktop.in.in -data/indicator-session-shutdown.desktop.in.in -data/indicator-session-logout.desktop.in.in -data/indicator-session-restart.desktop.in.in src/settings-helper.c src/lock-helper.c src/gtk-logout-helper.c diff --git a/src/Makefile.am b/src/Makefile.am index a1e443e..b29e8d4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -26,10 +26,13 @@ libsession_la_SOURCES = \ accounts-service-user-client.h libsession_la_CFLAGS = \ $(APPLET_CFLAGS) \ + $(COVERAGE_CFLAGS) \ -Wall -Werror \ -DG_LOG_DOMAIN=\"Indicator-Session\" libsession_la_LIBADD = $(APPLET_LIBS) -libsession_la_LDFLAGS = -module -avoid-version +libsession_la_LDFLAGS = \ + $(COVERAGE_LDFLAGS) \ + -module -avoid-version consolekit-manager-client.h: $(srcdir)/org.freedesktop.ConsoleKit.Manager.xml dbus-binding-tool \ @@ -137,11 +140,14 @@ indicator_session_service_CFLAGS = \ -DLIBEXECDIR=\"$(libexecdir)\" \ -Wall -Werror \ -DG_LOG_DOMAIN=\"Indicator-Session\" \ - $(GUDEV_CFLAGS) + $(GUDEV_CFLAGS) \ + $(COVERAGE_CFLAGS) indicator_session_service_LDADD = \ $(SESSIONSERVICE_LIBS) \ $(GCONF_LIBS) \ $(GUDEV_LIBS) +indicator_session_service_LDFLAGS = \ + $(COVERAGE_LDFLAGS) ################# # GTK Logout Stuff @@ -159,6 +165,7 @@ gtk_logout_helper_CFLAGS = \ $(SESSIONSERVICE_CFLAGS) \ $(GTKLOGOUTHELPER_CFLAGS) \ $(GCONF_CFLAGS) \ + $(COVERAGE_CFLAGS) \ -Wall -Werror \ -DINDICATOR_ICONS_DIR="\"$(INDICATORICONSDIR)\"" @@ -166,6 +173,9 @@ gtk_logout_helper_LDADD = \ $(SESSIONSERVICE_LIBS) \ $(GTKLOGOUTHELPER_LIBS) \ $(GCONF_LIBS) + +gtk_logout_helper_LDFLAGS = \ + $(COVERAGE_LDFLAGS) endif diff --git a/src/Makefile.in b/src/Makefile.in index 91d22d4..5e7dfdb 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -61,7 +61,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(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 @@ -122,8 +123,8 @@ gtk_logout_helper_OBJECTS = $(am_gtk_logout_helper_OBJECTS) @BUILD_GTKLOGOUTHELPER_TRUE@ $(am__DEPENDENCIES_1) gtk_logout_helper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(gtk_logout_helper_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ - -o $@ + $(gtk_logout_helper_CFLAGS) $(CFLAGS) \ + $(gtk_logout_helper_LDFLAGS) $(LDFLAGS) -o $@ am__indicator_session_service_SOURCES_DIST = lock-helper.c \ lock-helper.h session-service.c session-dbus.c session-dbus.h \ gen-session-dbus.xml.c dbusmenu-shared.h settings-helper.c \ @@ -149,8 +150,8 @@ indicator_session_service_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) indicator_session_service_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(indicator_session_service_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ + $(indicator_session_service_CFLAGS) $(CFLAGS) \ + $(indicator_session_service_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -201,6 +202,8 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -217,6 +220,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOVR = @GCOVR@ +GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ @@ -245,6 +250,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ 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@ @@ -290,6 +296,7 @@ SESSIONSERVICE_CFLAGS = @SESSIONSERVICE_CFLAGS@ SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHTOOL = @SHTOOL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -373,11 +380,15 @@ libsession_la_SOURCES = \ libsession_la_CFLAGS = \ $(APPLET_CFLAGS) \ + $(COVERAGE_CFLAGS) \ -Wall -Werror \ -DG_LOG_DOMAIN=\"Indicator-Session\" libsession_la_LIBADD = $(APPLET_LIBS) -libsession_la_LDFLAGS = -module -avoid-version +libsession_la_LDFLAGS = \ + $(COVERAGE_LDFLAGS) \ + -module -avoid-version + ################# # Session Stuff @@ -394,13 +405,17 @@ indicator_session_service_CFLAGS = \ -DLIBEXECDIR=\"$(libexecdir)\" \ -Wall -Werror \ -DG_LOG_DOMAIN=\"Indicator-Session\" \ - $(GUDEV_CFLAGS) + $(GUDEV_CFLAGS) \ + $(COVERAGE_CFLAGS) indicator_session_service_LDADD = \ $(SESSIONSERVICE_LIBS) \ $(GCONF_LIBS) \ $(GUDEV_LIBS) +indicator_session_service_LDFLAGS = \ + $(COVERAGE_LDFLAGS) + ################# # GTK Logout Stuff @@ -416,6 +431,7 @@ indicator_session_service_LDADD = \ @BUILD_GTKLOGOUTHELPER_TRUE@ $(SESSIONSERVICE_CFLAGS) \ @BUILD_GTKLOGOUTHELPER_TRUE@ $(GTKLOGOUTHELPER_CFLAGS) \ @BUILD_GTKLOGOUTHELPER_TRUE@ $(GCONF_CFLAGS) \ +@BUILD_GTKLOGOUTHELPER_TRUE@ $(COVERAGE_CFLAGS) \ @BUILD_GTKLOGOUTHELPER_TRUE@ -Wall -Werror \ @BUILD_GTKLOGOUTHELPER_TRUE@ -DINDICATOR_ICONS_DIR="\"$(INDICATORICONSDIR)\"" @@ -424,6 +440,9 @@ indicator_session_service_LDADD = \ @BUILD_GTKLOGOUTHELPER_TRUE@ $(GTKLOGOUTHELPER_LIBS) \ @BUILD_GTKLOGOUTHELPER_TRUE@ $(GCONF_LIBS) +@BUILD_GTKLOGOUTHELPER_TRUE@gtk_logout_helper_LDFLAGS = \ +@BUILD_GTKLOGOUTHELPER_TRUE@ $(COVERAGE_LDFLAGS) + ############### # Other Stuff diff --git a/src/gtk-logout-helper.c b/src/gtk-logout-helper.c index 1975121..f5c11ba 100644 --- a/src/gtk-logout-helper.c +++ b/src/gtk-logout-helper.c @@ -22,6 +22,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <config.h> +#include <locale.h> #include <glib.h> #include <gtk/gtk.h> #include <dbus/dbus-glib.h> diff --git a/src/session-service.c b/src/session-service.c index 6ee18e9..1dd1e14 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -26,6 +26,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <config.h> #include <unistd.h> +#include <locale.h> #include <glib/gi18n.h> #include <gio/gio.h> |