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

Proposed by Ted Gould
Status: Merged
Merged at revision: 377
Proposed branch: lp:~indicator-applet-developers/ubuntu/precise/libindicator/upstream
Merge into: lp:~ubuntu-desktop/libindicator/ubuntu
Diff against target: 2859 lines (+881/-515)
22 files modified
AUTHORS (+2/-0)
ChangeLog (+81/-0)
Makefile.in (+58/-36)
aclocal.m4 (+82/-30)
build-aux/compile (+183/-16)
build-aux/depcomp (+66/-8)
build-aux/install-sh (+18/-11)
build-aux/missing (+4/-49)
configure (+48/-16)
configure.ac (+3/-1)
debian/changelog (+15/-0)
debian/control (+3/-1)
debian/patches/debian-changes (+0/-40)
debian/patches/series (+0/-1)
debian/rules (+3/-0)
libindicator/Makefile.in (+72/-85)
libindicator/indicator-desktop-shortcuts.c (+1/-0)
libindicator/indicator-object.c (+31/-15)
tests/Makefile.in (+124/-147)
tests/dummy-indicator-signaler.c (+17/-4)
tests/test-loader.c (+25/-12)
tools/Makefile.in (+45/-43)
To merge this branch: bzr merge lp:~indicator-applet-developers/ubuntu/precise/libindicator/upstream
Reviewer Review Type Date Requested Status
Sebastien Bacher Pending
Review via email: mp+93071@code.launchpad.net

Description of the change

0.4.91

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'AUTHORS'
2--- AUTHORS 2012-01-24 16:07:33 +0000
3+++ AUTHORS 2012-02-14 20:34:19 +0000
4@@ -4,12 +4,14 @@
5 Aurelien Gateau
6 Charles Kerr
7 Cody Russell
8+ Daniel d'Andrada
9 Eitan Isaacson
10 Evgeni Golov
11 György Balló
12 Javier Jardón
13 Karl
14 Ken VanDine
15+ Lars Uebernickel
16 Luke Yelavich
17 Marco Trevisan (Treviño)
18 Martin Pitt
19
20=== modified file 'ChangeLog'
21--- ChangeLog 2012-01-24 16:07:33 +0000
22+++ ChangeLog 2012-02-14 20:34:19 +0000
23@@ -1,5 +1,86 @@
24 # Generated by Makefile. Do not edit.
25
26+2012-02-14 Ted Gould <ted@gould.cx>
27+
28+ 0.4.91
29+
30+2012-02-13 Lars Uebernickel <lars.uebernickel@canonical.com>
31+
32+ indicator_object_set_visible: only emit entry-{added,removed} when visibility actually changed
33+
34+ Emitting those signals is semantically incorrect. It also confused
35+ indicator-loader and the panel, because they are not checking whether an entry
36+ is already present in their entry-added handlers. This led to gtk warnings
37+ ("widget already has a parent") and strange effects, such as the same menu
38+ being added multiple times into the panel.
39+
40+ This patch also makes indicator_object_dispose use indicator_object_set_visible
41+ (it was already doing something similar).
42+
43+2012-02-13 Lars Uebernickel <lars.uebernickel@canonical.com>
44+
45+ indicator_object_dispose: remove unneeded list of entries
46+
47+2012-02-13 Lars Uebernickel <lars.uebernickel@canonical.com>
48+
49+ indicator_object_dispose: use _set_visible instead of reimplementing it
50+
51+2012-02-13 Lars Uebernickel <lars.uebernickel@canonical.com>
52+
53+ indicator_object_set_visible: no need to check for ENTRY_INIT
54+
55+2012-02-12 Lars Uebernickel <lars.uebernickel@canonical.com>
56+
57+ indicator_object_set_visible: only emit entry-{added,removed} when visibility actually changed
58+
59+ Emitting those signals is semantically incorrect. It also confused
60+ indicator-loader and the panel, because they are not checking whether an entry
61+ is already present in their entry-added handlers. This led to gtk warnings
62+ ("widget already has a parent") and strange effects, such as the same menu
63+ being added multiple times into the panel.
64+
65+2012-02-10 Ted Gould <ted@gould.cx>
66+
67+ Free groupname after usage
68+
69+2012-02-09 Daniel d'Andrada <daniel.dandrada@canonical.com>
70+
71+ Plug memory leak in parse_keyfile function.
72+
73+2012-02-03 Ted Gould <ted@gould.cx>
74+
75+ Be more agressive in ensureing the parent_object value is available everywhere.
76+
77+2012-02-03 Marco Trevisan (Treviño) <mail@3v1n0.net>
78+
79+ tests, DummyIndicatorSignaler: free the allocated memory.
80+
81+2012-01-25 Marco Trevisan (Treviño) <mail@3v1n0.net>
82+
83+ Test loader: check also for parent changes
84+
85+2012-01-25 Marco Trevisan (Treviño) <mail@3v1n0.net>
86+
87+ Tests: update dummy signaler to work with real IndicatorObjectEntry
88+
89+ This fixes a crash due to the parent/unparent.
90+
91+2012-01-25 Marco Trevisan (Treviño) <mail@3v1n0.net>
92+
93+ IndicatorObject: update object parent in any case.
94+
95+2012-01-25 Marco Trevisan (Treviño) <mail@3v1n0.net>
96+
97+ Added better parent_object tests.
98+
99+2012-01-25 Marco Trevisan (Treviño) <mail@3v1n0.net>
100+
101+ Indicator-Object: update the parent_object value only if the entry is valid.
102+
103+2012-01-25 Marco Trevisan (Treviño) <mail@3v1n0.net>
104+
105+ IndicatorObject: correctly initialize the parent object.
106+
107 2012-01-24 Ted Gould <ted@gould.cx>
108
109 0.4.90
110
111=== modified file 'Makefile.in'
112--- Makefile.in 2012-01-24 16:10:15 +0000
113+++ Makefile.in 2012-02-14 20:34:19 +0000
114@@ -1,9 +1,9 @@
115-# Makefile.in generated by automake 1.11.1 from Makefile.am.
116+# Makefile.in generated by automake 1.11.3 from Makefile.am.
117 # @configure_input@
118
119 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
120-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
121-# Inc.
122+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
123+# Foundation, Inc.
124 # This Makefile.in is free software; the Free Software Foundation
125 # gives unlimited permission to copy and/or distribute it,
126 # with or without modifications, as long as this notice is preserved.
127@@ -57,11 +57,11 @@
128 CONFIG_HEADER = config.h
129 CONFIG_CLEAN_FILES =
130 CONFIG_CLEAN_VPATH_FILES =
131-AM_V_GEN = $(am__v_GEN_$(V))
132-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
133+AM_V_GEN = $(am__v_GEN_@AM_V@)
134+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
135 am__v_GEN_0 = @echo " GEN " $@;
136-AM_V_at = $(am__v_at_$(V))
137-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
138+AM_V_at = $(am__v_at_@AM_V@)
139+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
140 am__v_at_0 = @
141 SOURCES =
142 DIST_SOURCES =
143@@ -84,9 +84,11 @@
144 distdir = $(PACKAGE)-$(VERSION)
145 top_distdir = $(distdir)
146 am__remove_distdir = \
147- { test ! -d "$(distdir)" \
148- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
149- && rm -fr "$(distdir)"; }; }
150+ if test -d "$(distdir)"; then \
151+ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
152+ && rm -rf "$(distdir)" \
153+ || { sleep 5 && rm -rf "$(distdir)"; }; \
154+ else :; fi
155 am__relativize = \
156 dir0=`pwd`; \
157 sed_first='s,^\([^/]*\)/.*$$,\1,'; \
158@@ -115,6 +117,8 @@
159 DIST_ARCHIVES = $(distdir).tar.gz
160 GZIP_ENV = --best
161 distuninstallcheck_listfiles = find . -type f -print
162+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
163+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
164 distcleancheck_listfiles = find . -type f -print
165 ACLOCAL = @ACLOCAL@
166 AMTAR = @AMTAR@
167@@ -260,7 +264,7 @@
168 $(MAKE) $(AM_MAKEFLAGS) all-recursive
169
170 .SUFFIXES:
171-am--refresh:
172+am--refresh: Makefile
173 @:
174 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
175 @for dep in $?; do \
176@@ -296,10 +300,8 @@
177 $(am__aclocal_m4_deps):
178
179 config.h: stamp-h1
180- @if test ! -f $@; then \
181- rm -f stamp-h1; \
182- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
183- else :; fi
184+ @if test ! -f $@; then rm -f stamp-h1; else :; fi
185+ @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
186
187 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
188 @rm -f stamp-h1
189@@ -531,7 +533,11 @@
190 $(am__remove_distdir)
191
192 dist-bzip2: distdir
193- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
194+ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
195+ $(am__remove_distdir)
196+
197+dist-lzip: distdir
198+ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
199 $(am__remove_distdir)
200
201 dist-lzma: distdir
202@@ -539,7 +545,7 @@
203 $(am__remove_distdir)
204
205 dist-xz: distdir
206- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
207+ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
208 $(am__remove_distdir)
209
210 dist-tarZ: distdir
211@@ -570,6 +576,8 @@
212 bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
213 *.tar.lzma*) \
214 lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
215+ *.tar.lz*) \
216+ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
217 *.tar.xz*) \
218 xz -dc $(distdir).tar.xz | $(am__untar) ;;\
219 *.tar.Z*) \
220@@ -589,6 +597,7 @@
221 && am__cwd=`pwd` \
222 && $(am__cd) $(distdir)/_build \
223 && ../configure --srcdir=.. --prefix="$$dc_install_base" \
224+ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
225 $(DISTCHECK_CONFIGURE_FLAGS) \
226 && $(MAKE) $(AM_MAKEFLAGS) \
227 && $(MAKE) $(AM_MAKEFLAGS) dvi \
228@@ -617,8 +626,16 @@
229 list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
230 sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
231 distuninstallcheck:
232- @$(am__cd) '$(distuninstallcheck_dir)' \
233- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
234+ @test -n '$(distuninstallcheck_dir)' || { \
235+ echo 'ERROR: trying to run $@ with an empty' \
236+ '$$(distuninstallcheck_dir)' >&2; \
237+ exit 1; \
238+ }; \
239+ $(am__cd) '$(distuninstallcheck_dir)' || { \
240+ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
241+ exit 1; \
242+ }; \
243+ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
244 || { echo "ERROR: files left after uninstall:" ; \
245 if test -n "$(DESTDIR)"; then \
246 echo " (check DESTDIR support)"; \
247@@ -649,10 +666,15 @@
248
249 installcheck: installcheck-recursive
250 install-strip:
251- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
252- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
253- `test -z '$(STRIP)' || \
254- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
255+ if test -z '$(STRIP)'; then \
256+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
257+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
258+ install; \
259+ else \
260+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
261+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
262+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
263+ fi
264 mostlyclean-generic:
265
266 clean-generic:
267@@ -741,19 +763,19 @@
268 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
269 all all-am am--refresh check check-am clean clean-generic \
270 clean-libtool clean-local ctags ctags-recursive dist dist-all \
271- dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar dist-tarZ \
272- dist-xz dist-zip distcheck distclean distclean-generic \
273- distclean-hdr distclean-libtool distclean-tags distcleancheck \
274- distdir distuninstallcheck dvi dvi-am html html-am info \
275- info-am install install-am install-data install-data-am \
276- install-dvi install-dvi-am install-exec install-exec-am \
277- install-html install-html-am install-info install-info-am \
278- install-man install-pdf install-pdf-am install-ps \
279- install-ps-am install-strip installcheck installcheck-am \
280- installdirs installdirs-am maintainer-clean \
281- maintainer-clean-generic mostlyclean mostlyclean-generic \
282- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
283- uninstall uninstall-am
284+ dist-bzip2 dist-gzip dist-hook dist-lzip dist-lzma dist-shar \
285+ dist-tarZ dist-xz dist-zip distcheck distclean \
286+ distclean-generic distclean-hdr distclean-libtool \
287+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
288+ dvi-am html html-am info info-am install install-am \
289+ install-data install-data-am install-dvi install-dvi-am \
290+ install-exec install-exec-am install-html install-html-am \
291+ install-info install-info-am install-man install-pdf \
292+ install-pdf-am install-ps install-ps-am install-strip \
293+ installcheck installcheck-am installdirs installdirs-am \
294+ maintainer-clean maintainer-clean-generic mostlyclean \
295+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
296+ tags tags-recursive uninstall uninstall-am
297
298
299 tools: libindicator
300
301=== modified file 'aclocal.m4'
302--- aclocal.m4 2012-01-24 16:10:15 +0000
303+++ aclocal.m4 2012-02-14 20:34:19 +0000
304@@ -1,7 +1,8 @@
305-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
306+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
307
308 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
309-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
310+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
311+# Inc.
312 # This file is free software; the Free Software Foundation
313 # gives unlimited permission to copy and/or distribute it,
314 # with or without modifications, as long as this notice is preserved.
315@@ -179,12 +180,15 @@
316 fi[]dnl
317 ])# PKG_CHECK_MODULES
318
319-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
320+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
321+# Foundation, Inc.
322 #
323 # This file is free software; the Free Software Foundation
324 # gives unlimited permission to copy and/or distribute it,
325 # with or without modifications, as long as this notice is preserved.
326
327+# serial 1
328+
329 # AM_AUTOMAKE_VERSION(VERSION)
330 # ----------------------------
331 # Automake X.Y traces this macro to ensure aclocal.m4 has been
332@@ -194,7 +198,7 @@
333 [am__api_version='1.11'
334 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
335 dnl require some minimum version. Point them to the right macro.
336-m4_if([$1], [1.11.1], [],
337+m4_if([$1], [1.11.3], [],
338 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
339 ])
340
341@@ -210,19 +214,21 @@
342 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
343 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
344 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
345-[AM_AUTOMAKE_VERSION([1.11.1])dnl
346+[AM_AUTOMAKE_VERSION([1.11.3])dnl
347 m4_ifndef([AC_AUTOCONF_VERSION],
348 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
349 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
350
351 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
352
353-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
354+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
355 #
356 # This file is free software; the Free Software Foundation
357 # gives unlimited permission to copy and/or distribute it,
358 # with or without modifications, as long as this notice is preserved.
359
360+# serial 1
361+
362 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
363 # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
364 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
365@@ -304,14 +310,14 @@
366 Usually this means the macro was only invoked conditionally.]])
367 fi])])
368
369-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
370-# Free Software Foundation, Inc.
371+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
372+# 2010, 2011 Free Software Foundation, Inc.
373 #
374 # This file is free software; the Free Software Foundation
375 # gives unlimited permission to copy and/or distribute it,
376 # with or without modifications, as long as this notice is preserved.
377
378-# serial 10
379+# serial 12
380
381 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
382 # written in clear, in which case automake, when reading aclocal.m4,
383@@ -351,6 +357,7 @@
384 # instance it was reported that on HP-UX the gcc test will end up
385 # making a dummy file named `D' -- because `-MD' means `put the output
386 # in D'.
387+ rm -rf conftest.dir
388 mkdir conftest.dir
389 # Copy depcomp to subdir because otherwise we won't find it if we're
390 # using a relative directory.
391@@ -415,7 +422,7 @@
392 break
393 fi
394 ;;
395- msvisualcpp | msvcmsys)
396+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
397 # This compiler won't grok `-c -o', but also, the minuso test has
398 # not run yet. These depmodes are late enough in the game, and
399 # so weak that their functioning should not be impacted.
400@@ -480,10 +487,13 @@
401 if test "x$enable_dependency_tracking" != xno; then
402 am_depcomp="$ac_aux_dir/depcomp"
403 AMDEPBACKSLASH='\'
404+ am__nodep='_no'
405 fi
406 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
407 AC_SUBST([AMDEPBACKSLASH])dnl
408 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
409+AC_SUBST([am__nodep])dnl
410+_AM_SUBST_NOTMAKE([am__nodep])dnl
411 ])
412
413 # Generate code to set up dependency tracking. -*- Autoconf -*-
414@@ -705,12 +715,15 @@
415 done
416 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
417
418-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
419+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
420+# Inc.
421 #
422 # This file is free software; the Free Software Foundation
423 # gives unlimited permission to copy and/or distribute it,
424 # with or without modifications, as long as this notice is preserved.
425
426+# serial 1
427+
428 # AM_PROG_INSTALL_SH
429 # ------------------
430 # Define $install_sh.
431@@ -750,8 +763,8 @@
432 # Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
433 # From Jim Meyering
434
435-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
436-# Free Software Foundation, Inc.
437+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
438+# 2011 Free Software Foundation, Inc.
439 #
440 # This file is free software; the Free Software Foundation
441 # gives unlimited permission to copy and/or distribute it,
442@@ -771,7 +784,7 @@
443 [disable], [m4_define([am_maintainer_other], [enable])],
444 [m4_define([am_maintainer_other], [enable])
445 m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
446-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
447+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
448 dnl maintainer-mode's default is 'disable' unless 'enable' is passed
449 AC_ARG_ENABLE([maintainer-mode],
450 [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
451@@ -917,12 +930,15 @@
452 fi
453 ])
454
455-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
456+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
457+# Inc.
458 #
459 # This file is free software; the Free Software Foundation
460 # gives unlimited permission to copy and/or distribute it,
461 # with or without modifications, as long as this notice is preserved.
462
463+# serial 1
464+
465 # AM_PROG_MKDIR_P
466 # ---------------
467 # Check for `mkdir -p'.
468@@ -945,13 +961,14 @@
469
470 # Helper functions for option handling. -*- Autoconf -*-
471
472-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
473+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
474+# Foundation, Inc.
475 #
476 # This file is free software; the Free Software Foundation
477 # gives unlimited permission to copy and/or distribute it,
478 # with or without modifications, as long as this notice is preserved.
479
480-# serial 4
481+# serial 5
482
483 # _AM_MANGLE_OPTION(NAME)
484 # -----------------------
485@@ -959,13 +976,13 @@
486 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
487
488 # _AM_SET_OPTION(NAME)
489-# ------------------------------
490+# --------------------
491 # Set option NAME. Presently that only means defining a flag for this option.
492 AC_DEFUN([_AM_SET_OPTION],
493 [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
494
495 # _AM_SET_OPTIONS(OPTIONS)
496-# ----------------------------------
497+# ------------------------
498 # OPTIONS is a space-separated list of Automake options.
499 AC_DEFUN([_AM_SET_OPTIONS],
500 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
501@@ -976,12 +993,14 @@
502 AC_DEFUN([_AM_IF_OPTION],
503 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
504
505-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
506+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
507 #
508 # This file is free software; the Free Software Foundation
509 # gives unlimited permission to copy and/or distribute it,
510 # with or without modifications, as long as this notice is preserved.
511
512+# serial 1
513+
514 # AM_RUN_LOG(COMMAND)
515 # -------------------
516 # Run COMMAND, save the exit status in ac_status, and log it.
517@@ -1058,13 +1077,13 @@
518 fi
519 AC_MSG_RESULT(yes)])
520
521-# Copyright (C) 2009 Free Software Foundation, Inc.
522+# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
523 #
524 # This file is free software; the Free Software Foundation
525 # gives unlimited permission to copy and/or distribute it,
526 # with or without modifications, as long as this notice is preserved.
527
528-# serial 1
529+# serial 2
530
531 # AM_SILENT_RULES([DEFAULT])
532 # --------------------------
533@@ -1079,18 +1098,50 @@
534 no) AM_DEFAULT_VERBOSITY=1;;
535 *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
536 esac
537+dnl
538+dnl A few `make' implementations (e.g., NonStop OS and NextStep)
539+dnl do not support nested variable expansions.
540+dnl See automake bug#9928 and bug#10237.
541+am_make=${MAKE-make}
542+AC_CACHE_CHECK([whether $am_make supports nested variables],
543+ [am_cv_make_support_nested_variables],
544+ [if AS_ECHO([['TRUE=$(BAR$(V))
545+BAR0=false
546+BAR1=true
547+V=1
548+am__doit:
549+ @$(TRUE)
550+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
551+ am_cv_make_support_nested_variables=yes
552+else
553+ am_cv_make_support_nested_variables=no
554+fi])
555+if test $am_cv_make_support_nested_variables = yes; then
556+ dnl Using `$V' instead of `$(V)' breaks IRIX make.
557+ AM_V='$(V)'
558+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
559+else
560+ AM_V=$AM_DEFAULT_VERBOSITY
561+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
562+fi
563+AC_SUBST([AM_V])dnl
564+AM_SUBST_NOTMAKE([AM_V])dnl
565+AC_SUBST([AM_DEFAULT_V])dnl
566+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
567 AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
568 AM_BACKSLASH='\'
569 AC_SUBST([AM_BACKSLASH])dnl
570 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
571 ])
572
573-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
574+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
575 #
576 # This file is free software; the Free Software Foundation
577 # gives unlimited permission to copy and/or distribute it,
578 # with or without modifications, as long as this notice is preserved.
579
580+# serial 1
581+
582 # AM_PROG_INSTALL_STRIP
583 # ---------------------
584 # One issue with vendor `install' (even GNU) is that you can't
585@@ -1113,13 +1164,13 @@
586 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
587 AC_SUBST([INSTALL_STRIP_PROGRAM])])
588
589-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
590+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
591 #
592 # This file is free software; the Free Software Foundation
593 # gives unlimited permission to copy and/or distribute it,
594 # with or without modifications, as long as this notice is preserved.
595
596-# serial 2
597+# serial 3
598
599 # _AM_SUBST_NOTMAKE(VARIABLE)
600 # ---------------------------
601@@ -1128,13 +1179,13 @@
602 AC_DEFUN([_AM_SUBST_NOTMAKE])
603
604 # AM_SUBST_NOTMAKE(VARIABLE)
605-# ---------------------------
606+# --------------------------
607 # Public sister of _AM_SUBST_NOTMAKE.
608 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
609
610 # Check how to create a tarball. -*- Autoconf -*-
611
612-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
613+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
614 #
615 # This file is free software; the Free Software Foundation
616 # gives unlimited permission to copy and/or distribute it,
617@@ -1156,10 +1207,11 @@
618 # a tarball read from stdin.
619 # $(am__untar) < result.tar
620 AC_DEFUN([_AM_PROG_TAR],
621-[# Always define AMTAR for backward compatibility.
622-AM_MISSING_PROG([AMTAR], [tar])
623+[# Always define AMTAR for backward compatibility. Yes, it's still used
624+# in the wild :-( We should find a proper way to deprecate it ...
625+AC_SUBST([AMTAR], ['$${TAR-tar}'])
626 m4_if([$1], [v7],
627- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
628+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
629 [m4_case([$1], [ustar],, [pax],,
630 [m4_fatal([Unknown tar format])])
631 AC_MSG_CHECKING([how to create a $1 tar archive])
632
633=== modified file 'build-aux/compile'
634--- build-aux/compile 2011-07-07 05:28:26 +0000
635+++ build-aux/compile 2012-02-14 20:34:19 +0000
636@@ -1,10 +1,10 @@
637 #! /bin/sh
638-# Wrapper for compilers which do not understand `-c -o'.
639-
640-scriptversion=2009-10-06.20; # UTC
641-
642-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software
643-# Foundation, Inc.
644+# Wrapper for compilers which do not understand '-c -o'.
645+
646+scriptversion=2012-01-04.17; # UTC
647+
648+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
649+# Software Foundation, Inc.
650 # Written by Tom Tromey <tromey@cygnus.com>.
651 #
652 # This program is free software; you can redistribute it and/or modify
653@@ -29,21 +29,186 @@
654 # bugs to <bug-automake@gnu.org> or send patches to
655 # <automake-patches@gnu.org>.
656
657+nl='
658+'
659+
660+# We need space, tab and new line, in precisely that order. Quoting is
661+# there to prevent tools from complaining about whitespace usage.
662+IFS=" "" $nl"
663+
664+file_conv=
665+
666+# func_file_conv build_file lazy
667+# Convert a $build file to $host form and store it in $file
668+# Currently only supports Windows hosts. If the determined conversion
669+# type is listed in (the comma separated) LAZY, no conversion will
670+# take place.
671+func_file_conv ()
672+{
673+ file=$1
674+ case $file in
675+ / | /[!/]*) # absolute file, and not a UNC file
676+ if test -z "$file_conv"; then
677+ # lazily determine how to convert abs files
678+ case `uname -s` in
679+ MINGW*)
680+ file_conv=mingw
681+ ;;
682+ CYGWIN*)
683+ file_conv=cygwin
684+ ;;
685+ *)
686+ file_conv=wine
687+ ;;
688+ esac
689+ fi
690+ case $file_conv/,$2, in
691+ *,$file_conv,*)
692+ ;;
693+ mingw/*)
694+ file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
695+ ;;
696+ cygwin/*)
697+ file=`cygpath -m "$file" || echo "$file"`
698+ ;;
699+ wine/*)
700+ file=`winepath -w "$file" || echo "$file"`
701+ ;;
702+ esac
703+ ;;
704+ esac
705+}
706+
707+# func_cl_wrapper cl arg...
708+# Adjust compile command to suit cl
709+func_cl_wrapper ()
710+{
711+ # Assume a capable shell
712+ lib_path=
713+ shared=:
714+ linker_opts=
715+ for arg
716+ do
717+ if test -n "$eat"; then
718+ eat=
719+ else
720+ case $1 in
721+ -o)
722+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
723+ eat=1
724+ case $2 in
725+ *.o | *.[oO][bB][jJ])
726+ func_file_conv "$2"
727+ set x "$@" -Fo"$file"
728+ shift
729+ ;;
730+ *)
731+ func_file_conv "$2"
732+ set x "$@" -Fe"$file"
733+ shift
734+ ;;
735+ esac
736+ ;;
737+ -I*)
738+ func_file_conv "${1#-I}" mingw
739+ set x "$@" -I"$file"
740+ shift
741+ ;;
742+ -l*)
743+ lib=${1#-l}
744+ found=no
745+ save_IFS=$IFS
746+ IFS=';'
747+ for dir in $lib_path $LIB
748+ do
749+ IFS=$save_IFS
750+ if $shared && test -f "$dir/$lib.dll.lib"; then
751+ found=yes
752+ set x "$@" "$dir/$lib.dll.lib"
753+ break
754+ fi
755+ if test -f "$dir/$lib.lib"; then
756+ found=yes
757+ set x "$@" "$dir/$lib.lib"
758+ break
759+ fi
760+ done
761+ IFS=$save_IFS
762+
763+ test "$found" != yes && set x "$@" "$lib.lib"
764+ shift
765+ ;;
766+ -L*)
767+ func_file_conv "${1#-L}"
768+ if test -z "$lib_path"; then
769+ lib_path=$file
770+ else
771+ lib_path="$lib_path;$file"
772+ fi
773+ linker_opts="$linker_opts -LIBPATH:$file"
774+ ;;
775+ -static)
776+ shared=false
777+ ;;
778+ -Wl,*)
779+ arg=${1#-Wl,}
780+ save_ifs="$IFS"; IFS=','
781+ for flag in $arg; do
782+ IFS="$save_ifs"
783+ linker_opts="$linker_opts $flag"
784+ done
785+ IFS="$save_ifs"
786+ ;;
787+ -Xlinker)
788+ eat=1
789+ linker_opts="$linker_opts $2"
790+ ;;
791+ -*)
792+ set x "$@" "$1"
793+ shift
794+ ;;
795+ *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
796+ func_file_conv "$1"
797+ set x "$@" -Tp"$file"
798+ shift
799+ ;;
800+ *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
801+ func_file_conv "$1" mingw
802+ set x "$@" "$file"
803+ shift
804+ ;;
805+ *)
806+ set x "$@" "$1"
807+ shift
808+ ;;
809+ esac
810+ fi
811+ shift
812+ done
813+ if test -n "$linker_opts"; then
814+ linker_opts="-link$linker_opts"
815+ fi
816+ exec "$@" $linker_opts
817+ exit 1
818+}
819+
820+eat=
821+
822 case $1 in
823 '')
824- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
825+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
826 exit 1;
827 ;;
828 -h | --h*)
829 cat <<\EOF
830 Usage: compile [--help] [--version] PROGRAM [ARGS]
831
832-Wrapper for compilers which do not understand `-c -o'.
833-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
834+Wrapper for compilers which do not understand '-c -o'.
835+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
836 arguments, and rename the output as expected.
837
838 If you are trying to build a whole package this is not the
839-right script to run: please start by reading the file `INSTALL'.
840+right script to run: please start by reading the file 'INSTALL'.
841
842 Report bugs to <bug-automake@gnu.org>.
843 EOF
844@@ -53,11 +218,13 @@
845 echo "compile $scriptversion"
846 exit $?
847 ;;
848+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
849+ func_cl_wrapper "$@" # Doesn't return...
850+ ;;
851 esac
852
853 ofile=
854 cfile=
855-eat=
856
857 for arg
858 do
859@@ -66,8 +233,8 @@
860 else
861 case $1 in
862 -o)
863- # configure might choose to run compile as `compile cc -o foo foo.c'.
864- # So we strip `-o arg' only if arg is an object.
865+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
866+ # So we strip '-o arg' only if arg is an object.
867 eat=1
868 case $2 in
869 *.o | *.obj)
870@@ -94,10 +261,10 @@
871 done
872
873 if test -z "$ofile" || test -z "$cfile"; then
874- # If no `-o' option was seen then we might have been invoked from a
875+ # If no '-o' option was seen then we might have been invoked from a
876 # pattern rule where we don't need one. That is ok -- this is a
877 # normal compilation that the losing compiler can handle. If no
878- # `.c' file was seen then we are probably linking. That is also
879+ # '.c' file was seen then we are probably linking. That is also
880 # ok.
881 exec "$@"
882 fi
883@@ -106,7 +273,7 @@
884 cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
885
886 # Create the lock directory.
887-# Note: use `[/\\:.-]' here to ensure that we don't use the same name
888+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
889 # that we are using for the .o file. Also, base the name on the expected
890 # object file name, since that is what matters with a parallel build.
891 lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
892
893=== modified file 'build-aux/depcomp'
894--- build-aux/depcomp 2011-07-07 05:28:26 +0000
895+++ build-aux/depcomp 2012-02-14 20:34:19 +0000
896@@ -1,10 +1,10 @@
897 #! /bin/sh
898 # depcomp - compile a program generating dependencies as side-effects
899
900-scriptversion=2009-04-28.21; # UTC
901+scriptversion=2011-12-04.11; # UTC
902
903-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
904-# Software Foundation, Inc.
905+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
906+# 2011 Free Software Foundation, Inc.
907
908 # This program is free software; you can redistribute it and/or modify
909 # it under the terms of the GNU General Public License as published by
910@@ -44,7 +44,7 @@
911 object Object file output by `PROGRAMS ARGS'.
912 DEPDIR directory where to store dependencies.
913 depfile Dependency file to output.
914- tmpdepfile Temporary file to use when outputing dependencies.
915+ tmpdepfile Temporary file to use when outputting dependencies.
916 libtool Whether libtool is used (yes/no).
917
918 Report bugs to <bug-automake@gnu.org>.
919@@ -90,10 +90,18 @@
920 # This is just like msvisualcpp but w/o cygpath translation.
921 # Just convert the backslash-escaped backslashes to single forward
922 # slashes to satisfy depend.m4
923- cygpath_u="sed s,\\\\\\\\,/,g"
924+ cygpath_u='sed s,\\\\,/,g'
925 depmode=msvisualcpp
926 fi
927
928+if test "$depmode" = msvc7msys; then
929+ # This is just like msvc7 but w/o cygpath translation.
930+ # Just convert the backslash-escaped backslashes to single forward
931+ # slashes to satisfy depend.m4
932+ cygpath_u='sed s,\\\\,/,g'
933+ depmode=msvc7
934+fi
935+
936 case "$depmode" in
937 gcc3)
938 ## gcc 3 implements dependency tracking that does exactly what
939@@ -158,10 +166,12 @@
940 ' < "$tmpdepfile" |
941 ## Some versions of gcc put a space before the `:'. On the theory
942 ## that the space means something, we add a space to the output as
943-## well.
944+## well. hp depmode also adds that space, but also prefixes the VPATH
945+## to the object. Take care to not repeat it in the output.
946 ## Some versions of the HPUX 10.20 sed can't process this invocation
947 ## correctly. Breaking it into two sed invocations is a workaround.
948- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
949+ sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
950+ | sed -e 's/$/ :/' >> "$depfile"
951 rm -f "$tmpdepfile"
952 ;;
953
954@@ -405,6 +415,52 @@
955 rm -f "$tmpdepfile"
956 ;;
957
958+msvc7)
959+ if test "$libtool" = yes; then
960+ showIncludes=-Wc,-showIncludes
961+ else
962+ showIncludes=-showIncludes
963+ fi
964+ "$@" $showIncludes > "$tmpdepfile"
965+ stat=$?
966+ grep -v '^Note: including file: ' "$tmpdepfile"
967+ if test "$stat" = 0; then :
968+ else
969+ rm -f "$tmpdepfile"
970+ exit $stat
971+ fi
972+ rm -f "$depfile"
973+ echo "$object : \\" > "$depfile"
974+ # The first sed program below extracts the file names and escapes
975+ # backslashes for cygpath. The second sed program outputs the file
976+ # name when reading, but also accumulates all include files in the
977+ # hold buffer in order to output them again at the end. This only
978+ # works with sed implementations that can handle large buffers.
979+ sed < "$tmpdepfile" -n '
980+/^Note: including file: *\(.*\)/ {
981+ s//\1/
982+ s/\\/\\\\/g
983+ p
984+}' | $cygpath_u | sort -u | sed -n '
985+s/ /\\ /g
986+s/\(.*\)/ \1 \\/p
987+s/.\(.*\) \\/\1:/
988+H
989+$ {
990+ s/.*/ /
991+ G
992+ p
993+}' >> "$depfile"
994+ rm -f "$tmpdepfile"
995+ ;;
996+
997+msvc7msys)
998+ # This case exists only to let depend.m4 do its work. It works by
999+ # looking at the text of this script. This case will never be run,
1000+ # since it is checked for above.
1001+ exit 1
1002+ ;;
1003+
1004 #nosideeffect)
1005 # This comment above is used by automake to tell side-effect
1006 # dependency tracking mechanisms from slower ones.
1007@@ -503,7 +559,9 @@
1008 touch "$tmpdepfile"
1009 ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
1010 rm -f "$depfile"
1011- cat < "$tmpdepfile" > "$depfile"
1012+ # makedepend may prepend the VPATH from the source file name to the object.
1013+ # No need to regex-escape $object, excess matching of '.' is harmless.
1014+ sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
1015 sed '1,2d' "$tmpdepfile" | tr ' ' '
1016 ' | \
1017 ## Some versions of the HPUX 10.20 sed can't process this invocation
1018
1019=== modified file 'build-aux/install-sh'
1020--- build-aux/install-sh 2011-07-07 05:28:26 +0000
1021+++ build-aux/install-sh 2012-02-14 20:34:19 +0000
1022@@ -1,7 +1,7 @@
1023 #!/bin/sh
1024 # install - install a program, script, or datafile
1025
1026-scriptversion=2009-04-28.21; # UTC
1027+scriptversion=2011-01-19.21; # UTC
1028
1029 # This originates from X11R5 (mit/util/scripts/install.sh), which was
1030 # later released in X11R6 (xc/config/util/install.sh) with the
1031@@ -156,6 +156,10 @@
1032 -s) stripcmd=$stripprog;;
1033
1034 -t) dst_arg=$2
1035+ # Protect names problematic for `test' and other utilities.
1036+ case $dst_arg in
1037+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
1038+ esac
1039 shift;;
1040
1041 -T) no_target_directory=true;;
1042@@ -186,6 +190,10 @@
1043 fi
1044 shift # arg
1045 dst_arg=$arg
1046+ # Protect names problematic for `test' and other utilities.
1047+ case $dst_arg in
1048+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
1049+ esac
1050 done
1051 fi
1052
1053@@ -200,7 +208,11 @@
1054 fi
1055
1056 if test -z "$dir_arg"; then
1057- trap '(exit $?); exit' 1 2 13 15
1058+ do_exit='(exit $ret); exit $ret'
1059+ trap "ret=129; $do_exit" 1
1060+ trap "ret=130; $do_exit" 2
1061+ trap "ret=141; $do_exit" 13
1062+ trap "ret=143; $do_exit" 15
1063
1064 # Set umask so as not to create temps with too-generous modes.
1065 # However, 'strip' requires both read and write access to temps.
1066@@ -228,9 +240,9 @@
1067
1068 for src
1069 do
1070- # Protect names starting with `-'.
1071+ # Protect names problematic for `test' and other utilities.
1072 case $src in
1073- -*) src=./$src;;
1074+ -* | [=\(\)!]) src=./$src;;
1075 esac
1076
1077 if test -n "$dir_arg"; then
1078@@ -252,12 +264,7 @@
1079 echo "$0: no destination specified." >&2
1080 exit 1
1081 fi
1082-
1083 dst=$dst_arg
1084- # Protect names starting with `-'.
1085- case $dst in
1086- -*) dst=./$dst;;
1087- esac
1088
1089 # If destination is a directory, append the input filename; won't work
1090 # if double slashes aren't ignored.
1091@@ -385,7 +392,7 @@
1092
1093 case $dstdir in
1094 /*) prefix='/';;
1095- -*) prefix='./';;
1096+ [-=\(\)!]*) prefix='./';;
1097 *) prefix='';;
1098 esac
1099
1100@@ -403,7 +410,7 @@
1101
1102 for d
1103 do
1104- test -z "$d" && continue
1105+ test X"$d" = X && continue
1106
1107 prefix=$prefix$d
1108 if test -d "$prefix"; then
1109
1110=== modified file 'build-aux/missing'
1111--- build-aux/missing 2011-07-07 05:28:26 +0000
1112+++ build-aux/missing 2012-02-14 20:34:19 +0000
1113@@ -1,10 +1,10 @@
1114 #! /bin/sh
1115 # Common stub for a few missing GNU programs while installing.
1116
1117-scriptversion=2009-04-28.21; # UTC
1118+scriptversion=2012-01-06.13; # UTC
1119
1120 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
1121-# 2008, 2009 Free Software Foundation, Inc.
1122+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
1123 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
1124
1125 # This program is free software; you can redistribute it and/or modify
1126@@ -84,7 +84,6 @@
1127 help2man touch the output file
1128 lex create \`lex.yy.c', if possible, from existing .c
1129 makeinfo touch the output file
1130- tar try tar, gnutar, gtar, then tar without non-portable flags
1131 yacc create \`y.tab.[ch]', if possible, from existing .[ch]
1132
1133 Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
1134@@ -122,15 +121,6 @@
1135 # Not GNU programs, they don't have --version.
1136 ;;
1137
1138- tar*)
1139- if test -n "$run"; then
1140- echo 1>&2 "ERROR: \`tar' requires --run"
1141- exit 1
1142- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
1143- exit 1
1144- fi
1145- ;;
1146-
1147 *)
1148 if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
1149 # We have it, but it failed.
1150@@ -226,7 +216,7 @@
1151 \`Bison' from any GNU archive site."
1152 rm -f y.tab.c y.tab.h
1153 if test $# -ne 1; then
1154- eval LASTARG="\${$#}"
1155+ eval LASTARG=\${$#}
1156 case $LASTARG in
1157 *.y)
1158 SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
1159@@ -256,7 +246,7 @@
1160 \`Flex' from any GNU archive site."
1161 rm -f lex.yy.c
1162 if test $# -ne 1; then
1163- eval LASTARG="\${$#}"
1164+ eval LASTARG=\${$#}
1165 case $LASTARG in
1166 *.l)
1167 SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
1168@@ -318,41 +308,6 @@
1169 touch $file
1170 ;;
1171
1172- tar*)
1173- shift
1174-
1175- # We have already tried tar in the generic part.
1176- # Look for gnutar/gtar before invocation to avoid ugly error
1177- # messages.
1178- if (gnutar --version > /dev/null 2>&1); then
1179- gnutar "$@" && exit 0
1180- fi
1181- if (gtar --version > /dev/null 2>&1); then
1182- gtar "$@" && exit 0
1183- fi
1184- firstarg="$1"
1185- if shift; then
1186- case $firstarg in
1187- *o*)
1188- firstarg=`echo "$firstarg" | sed s/o//`
1189- tar "$firstarg" "$@" && exit 0
1190- ;;
1191- esac
1192- case $firstarg in
1193- *h*)
1194- firstarg=`echo "$firstarg" | sed s/h//`
1195- tar "$firstarg" "$@" && exit 0
1196- ;;
1197- esac
1198- fi
1199-
1200- echo 1>&2 "\
1201-WARNING: I can't seem to be able to run \`tar' with the given arguments.
1202- You may want to install GNU tar or Free paxutils, or check the
1203- command line arguments."
1204- exit 1
1205- ;;
1206-
1207 *)
1208 echo 1>&2 "\
1209 WARNING: \`$1' is needed, and is $msg.
1210
1211=== modified file 'configure'
1212--- configure 2012-01-24 16:10:15 +0000
1213+++ configure 2012-02-14 20:34:19 +0000
1214@@ -1,6 +1,6 @@
1215 #! /bin/sh
1216 # Guess values for system-dependent variables and create Makefiles.
1217-# Generated by GNU Autoconf 2.68 for libindicator 0.4.90.
1218+# Generated by GNU Autoconf 2.68 for libindicator 0.4.91.
1219 #
1220 # Report bugs to <http://bugs.launchpad.net/libindicator>.
1221 #
1222@@ -570,8 +570,8 @@
1223 # Identity of this package.
1224 PACKAGE_NAME='libindicator'
1225 PACKAGE_TARNAME='libindicator'
1226-PACKAGE_VERSION='0.4.90'
1227-PACKAGE_STRING='libindicator 0.4.90'
1228+PACKAGE_VERSION='0.4.91'
1229+PACKAGE_STRING='libindicator 0.4.91'
1230 PACKAGE_BUGREPORT='http://bugs.launchpad.net/libindicator'
1231 PACKAGE_URL='http://launchpad.net/libindicator'
1232
1233@@ -673,6 +673,7 @@
1234 am__fastdepCC_FALSE
1235 am__fastdepCC_TRUE
1236 CCDEPMODE
1237+am__nodep
1238 AMDEPBACKSLASH
1239 AMDEP_FALSE
1240 AMDEP_TRUE
1241@@ -688,6 +689,8 @@
1242 CC
1243 AM_BACKSLASH
1244 AM_DEFAULT_VERBOSITY
1245+AM_DEFAULT_V
1246+AM_V
1247 MAINT
1248 MAINTAINER_MODE_FALSE
1249 MAINTAINER_MODE_TRUE
1250@@ -1327,7 +1330,7 @@
1251 # Omit some internal or obsolete options to make the list less imposing.
1252 # This message is too long to be a string in the A/UX 3.1 sh.
1253 cat <<_ACEOF
1254-\`configure' configures libindicator 0.4.90 to adapt to many kinds of systems.
1255+\`configure' configures libindicator 0.4.91 to adapt to many kinds of systems.
1256
1257 Usage: $0 [OPTION]... [VAR=VALUE]...
1258
1259@@ -1397,7 +1400,7 @@
1260
1261 if test -n "$ac_init_help"; then
1262 case $ac_init_help in
1263- short | recursive ) echo "Configuration of libindicator 0.4.90:";;
1264+ short | recursive ) echo "Configuration of libindicator 0.4.91:";;
1265 esac
1266 cat <<\_ACEOF
1267
1268@@ -1517,7 +1520,7 @@
1269 test -n "$ac_init_help" && exit $ac_status
1270 if $ac_init_version; then
1271 cat <<\_ACEOF
1272-libindicator configure 0.4.90
1273+libindicator configure 0.4.91
1274 generated by GNU Autoconf 2.68
1275
1276 Copyright (C) 2010 Free Software Foundation, Inc.
1277@@ -1795,7 +1798,7 @@
1278 This file contains any messages produced by compilers while
1279 running configure, to aid debugging if configure makes a mistake.
1280
1281-It was created by libindicator $as_me 0.4.90, which was
1282+It was created by libindicator $as_me 0.4.91, which was
1283 generated by GNU Autoconf 2.68. Invocation command line was
1284
1285 $ $0 $@
1286@@ -2617,7 +2620,7 @@
1287
1288 # Define the identity of the package.
1289 PACKAGE='libindicator'
1290- VERSION='0.4.90'
1291+ VERSION='0.4.91'
1292
1293
1294 cat >>confdefs.h <<_ACEOF
1295@@ -2647,9 +2650,9 @@
1296
1297 # We need awk for the "check" target. The system "awk" is bad on
1298 # some platforms.
1299-# Always define AMTAR for backward compatibility.
1300-
1301-AMTAR=${AMTAR-"${am_missing_run}tar"}
1302+# Always define AMTAR for backward compatibility. Yes, it's still used
1303+# in the wild :-( We should find a proper way to deprecate it ...
1304+AMTAR='$${TAR-tar}'
1305
1306
1307 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a pax tar archive" >&5
1308@@ -2740,8 +2743,8 @@
1309
1310
1311
1312-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to disable maintainer-specific portions of Makefiles" >&5
1313-$as_echo_n "checking whether to disable maintainer-specific portions of Makefiles... " >&6; }
1314+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
1315+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
1316 # Check whether --enable-maintainer-mode was given.
1317 if test "${enable_maintainer_mode+set}" = set; then :
1318 enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
1319@@ -2773,6 +2776,33 @@
1320 no) AM_DEFAULT_VERBOSITY=1;;
1321 *) AM_DEFAULT_VERBOSITY=0;;
1322 esac
1323+am_make=${MAKE-make}
1324+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
1325+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
1326+if ${am_cv_make_support_nested_variables+:} false; then :
1327+ $as_echo_n "(cached) " >&6
1328+else
1329+ if $as_echo 'TRUE=$(BAR$(V))
1330+BAR0=false
1331+BAR1=true
1332+V=1
1333+am__doit:
1334+ @$(TRUE)
1335+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
1336+ am_cv_make_support_nested_variables=yes
1337+else
1338+ am_cv_make_support_nested_variables=no
1339+fi
1340+fi
1341+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
1342+$as_echo "$am_cv_make_support_nested_variables" >&6; }
1343+if test $am_cv_make_support_nested_variables = yes; then
1344+ AM_V='$(V)'
1345+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
1346+else
1347+ AM_V=$AM_DEFAULT_VERBOSITY
1348+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
1349+fi
1350 AM_BACKSLASH='\'
1351 ]
1352
1353@@ -3618,6 +3648,7 @@
1354 if test "x$enable_dependency_tracking" != xno; then
1355 am_depcomp="$ac_aux_dir/depcomp"
1356 AMDEPBACKSLASH='\'
1357+ am__nodep='_no'
1358 fi
1359 if test "x$enable_dependency_tracking" != xno; then
1360 AMDEP_TRUE=
1361@@ -3642,6 +3673,7 @@
1362 # instance it was reported that on HP-UX the gcc test will end up
1363 # making a dummy file named `D' -- because `-MD' means `put the output
1364 # in D'.
1365+ rm -rf conftest.dir
1366 mkdir conftest.dir
1367 # Copy depcomp to subdir because otherwise we won't find it if we're
1368 # using a relative directory.
1369@@ -3701,7 +3733,7 @@
1370 break
1371 fi
1372 ;;
1373- msvisualcpp | msvcmsys)
1374+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
1375 # This compiler won't grok `-c -o', but also, the minuso test has
1376 # not run yet. These depmodes are late enough in the game, and
1377 # so weak that their functioning should not be impacted.
1378@@ -12990,7 +13022,7 @@
1379 # report actual input values of CONFIG_FILES etc. instead of their
1380 # values after options handling.
1381 ac_log="
1382-This file was extended by libindicator $as_me 0.4.90, which was
1383+This file was extended by libindicator $as_me 0.4.91, which was
1384 generated by GNU Autoconf 2.68. Invocation command line was
1385
1386 CONFIG_FILES = $CONFIG_FILES
1387@@ -13057,7 +13089,7 @@
1388 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1389 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1390 ac_cs_version="\\
1391-libindicator config.status 0.4.90
1392+libindicator config.status 0.4.91
1393 configured by $0, generated by GNU Autoconf 2.68,
1394 with options \\"\$ac_cs_config\\"
1395
1396
1397=== modified file 'configure.ac'
1398--- configure.ac 2012-01-24 16:10:15 +0000
1399+++ configure.ac 2012-02-14 20:34:19 +0000
1400@@ -1,5 +1,5 @@
1401 AC_INIT([libindicator],
1402- [0.4.90],
1403+ [0.4.91],
1404 [http://bugs.launchpad.net/libindicator],
1405 [libindicator],
1406 [http://launchpad.net/libindicator])
1407@@ -52,10 +52,12 @@
1408 [with_gtk=3])
1409 AS_IF([test "x$with_gtk" = x3],
1410 [PKG_CHECK_MODULES(LIBINDICATOR, gtk+-3.0 >= $GTK3_REQUIRED_VERSION
1411+ gmodule-2.0
1412 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION)
1413 ],
1414 [test "x$with_gtk" = x2],
1415 [PKG_CHECK_MODULES(LIBINDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION
1416+ gmodule-2.0
1417 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION)
1418 ],
1419 [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
1420
1421=== modified file 'debian/changelog'
1422--- debian/changelog 2012-01-26 05:37:14 +0000
1423+++ debian/changelog 2012-02-14 20:34:19 +0000
1424@@ -1,3 +1,18 @@
1425+libindicator (0.4.91-0ubuntu1~ppa1) precise; urgency=low
1426+
1427+ * New upstream release.
1428+ * Visibility fixes for indicators using that functionality
1429+ * Ensure that parent_object is more aggressively set
1430+ * Fix memory leak on groups of items in desktop files
1431+ * Dropping debian/patches
1432+ * Upstream Merge
1433+ * Explicitly add in gmodule as a required library
1434+ * debian/control, debian/rules:
1435+ * Adding in autoreconf support
1436+ * Adding a check rule and requiring new build deps
1437+
1438+ -- Ted Gould <ted@ubuntu.com> Tue, 14 Feb 2012 14:29:51 -0600
1439+
1440 libindicator (0.4.90-0ubuntu4) precise; urgency=low
1441
1442 * libindicator/indicator-object.c
1443
1444=== modified file 'debian/control'
1445--- debian/control 2012-01-25 02:50:55 +0000
1446+++ debian/control 2012-02-14 20:34:19 +0000
1447@@ -5,6 +5,7 @@
1448 XSBC-Original-Maintainer: The Ayatana Packagers <pkg-ayatana-devel@lists.alioth.debian.org>
1449 Uploaders: Evgeni Golov <evgeni@debian.org>, Kartik Mistry <kartik@debian.org>
1450 Build-Depends: debhelper (>= 5.0),
1451+ dh-autoreconf,
1452 cdbs (>= 0.4.41),
1453 libglib2.0-dev (>= 2.22),
1454 libgtk2.0-dev (>= 2.18),
1455@@ -12,7 +13,8 @@
1456 libtool,
1457 intltool,
1458 gtk-doc-tools,
1459- dh-autoreconf
1460+ dbus-test-runner,
1461+ xvfb
1462 Standards-Version: 3.9.2
1463 Homepage: https://launchpad.net/libindicator
1464 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu
1465
1466=== removed directory 'debian/patches'
1467=== removed file 'debian/patches/debian-changes'
1468--- debian/patches/debian-changes 2011-11-22 19:37:23 +0000
1469+++ debian/patches/debian-changes 1970-01-01 00:00:00 +0000
1470@@ -1,40 +0,0 @@
1471-Description: <short summary of the patch>
1472- TODO: Put a short summary on the line above and replace this paragraph
1473- with a longer explanation of this change. Complete the meta-information
1474- with other relevant fields (see below for details). To make it easier, the
1475- information below has been extracted from the changelog. Adjust it or drop
1476- it.
1477- .
1478- libindicator (0.4.1-1) experimental; urgency=low
1479- .
1480- * Merge from Ubuntu.
1481- + Re-enable GTK3 packages.
1482- + Link to libm to prevent FTBFS.
1483- Closes: #640459
1484- * Set single-debian-patch in debian/source/options.
1485-Author: Evgeni Golov <evgeni@debian.org>
1486-Bug-Debian: http://bugs.debian.org/640459
1487-
1488----
1489-The information above should follow the Patch Tagging Guidelines, please
1490-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
1491-are templates for supplementary fields that you might want to add:
1492-
1493-Origin: <vendor|upstream|other>, <url of original patch>
1494-Bug: <url in upstream bugtracker>
1495-Bug-Debian: http://bugs.debian.org/<bugnumber>
1496-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
1497-Forwarded: <no|not-needed|url proving that it has been forwarded>
1498-Reviewed-By: <name and email of someone who approved the patch>
1499-Last-Update: <YYYY-MM-DD>
1500-
1501---- libindicator-0.4.1.orig/tools/Makefile.am
1502-+++ libindicator-0.4.1/tools/Makefile.am
1503-@@ -19,6 +19,7 @@ indicator_loader_SOURCES = \
1504- indicator_loader_CFLAGS = \
1505- -Wall -Werror \
1506- $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \
1507-+ -Wall -Werror \
1508- -DBUILD_DIR="\"$(builddir)\""
1509-
1510- indicator_loader_LDADD = \
1511
1512=== removed file 'debian/patches/series'
1513--- debian/patches/series 2011-11-22 19:37:23 +0000
1514+++ debian/patches/series 1970-01-01 00:00:00 +0000
1515@@ -1,1 +0,0 @@
1516-debian-changes
1517
1518=== modified file 'debian/rules'
1519--- debian/rules 2012-01-25 00:30:08 +0000
1520+++ debian/rules 2012-02-14 20:34:19 +0000
1521@@ -5,6 +5,7 @@
1522
1523 include /usr/share/cdbs/1/rules/debhelper.mk
1524 include /usr/share/cdbs/1/class/gnome.mk
1525+include /usr/share/cdbs/1/rules/autoreconf.mk
1526
1527 DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@
1528 DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/
1529@@ -12,6 +13,8 @@
1530 DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2
1531 DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3
1532
1533+DEB_MAKE_CHECK_TARGET := check
1534+
1535 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
1536
1537 DEB_DH_MAKESHLIBS_ARGS_libindicator7 += -V 'libindicator7 (>= 0.4.90)'
1538
1539=== modified file 'libindicator/Makefile.in'
1540--- libindicator/Makefile.in 2012-01-24 16:10:15 +0000
1541+++ libindicator/Makefile.in 2012-02-14 20:34:19 +0000
1542@@ -1,9 +1,9 @@
1543-# Makefile.in generated by automake 1.11.1 from Makefile.am.
1544+# Makefile.in generated by automake 1.11.3 from Makefile.am.
1545 # @configure_input@
1546
1547 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1548-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
1549-# Inc.
1550+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
1551+# Foundation, Inc.
1552 # This Makefile.in is free software; the Free Software Foundation
1553 # gives unlimited permission to copy and/or distribute it,
1554 # with or without modifications, as long as this notice is preserved.
1555@@ -90,6 +90,12 @@
1556 am__base_list = \
1557 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
1558 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
1559+am__uninstall_files_from_dir = { \
1560+ test -z "$$files" \
1561+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
1562+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
1563+ $(am__cd) "$$dir" && rm -f $$files; }; \
1564+ }
1565 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
1566 "$(DESTDIR)$(libindicator3includedir)" \
1567 "$(DESTDIR)$(libindicatorincludedir)"
1568@@ -107,8 +113,8 @@
1569 libindicator_la-indicator-service.lo \
1570 libindicator_la-indicator-service-manager.lo
1571 libindicator_la_OBJECTS = $(am_libindicator_la_OBJECTS)
1572-AM_V_lt = $(am__v_lt_$(V))
1573-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
1574+AM_V_lt = $(am__v_lt_@AM_V@)
1575+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
1576 am__v_lt_0 = --silent
1577 libindicator_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
1578 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
1579@@ -143,21 +149,21 @@
1580 $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
1581 $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
1582 $(AM_CFLAGS) $(CFLAGS)
1583-AM_V_CC = $(am__v_CC_$(V))
1584-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
1585+AM_V_CC = $(am__v_CC_@AM_V@)
1586+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
1587 am__v_CC_0 = @echo " CC " $@;
1588-AM_V_at = $(am__v_at_$(V))
1589-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
1590+AM_V_at = $(am__v_at_@AM_V@)
1591+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
1592 am__v_at_0 = @
1593 CCLD = $(CC)
1594 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
1595 $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
1596 $(AM_LDFLAGS) $(LDFLAGS) -o $@
1597-AM_V_CCLD = $(am__v_CCLD_$(V))
1598-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
1599+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
1600+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
1601 am__v_CCLD_0 = @echo " CCLD " $@;
1602-AM_V_GEN = $(am__v_GEN_$(V))
1603-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
1604+AM_V_GEN = $(am__v_GEN_@AM_V@)
1605+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
1606 am__v_GEN_0 = @echo " GEN " $@;
1607 SOURCES = $(libindicator_la_SOURCES) $(libindicator3_la_SOURCES)
1608 DIST_SOURCES = $(libindicator_la_SOURCES) $(libindicator3_la_SOURCES)
1609@@ -410,6 +416,7 @@
1610 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
1611 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
1612 esac;
1613+$(top_srcdir)/Makefile.am.marshal:
1614
1615 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
1616 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
1617@@ -454,9 +461,9 @@
1618 echo "rm -f \"$${dir}/so_locations\""; \
1619 rm -f "$${dir}/so_locations"; \
1620 done
1621-libindicator.la: $(libindicator_la_OBJECTS) $(libindicator_la_DEPENDENCIES)
1622+libindicator.la: $(libindicator_la_OBJECTS) $(libindicator_la_DEPENDENCIES) $(EXTRA_libindicator_la_DEPENDENCIES)
1623 $(AM_V_CCLD)$(libindicator_la_LINK) $(am_libindicator_la_rpath) $(libindicator_la_OBJECTS) $(libindicator_la_LIBADD) $(LIBS)
1624-libindicator3.la: $(libindicator3_la_OBJECTS) $(libindicator3_la_DEPENDENCIES)
1625+libindicator3.la: $(libindicator3_la_OBJECTS) $(libindicator3_la_DEPENDENCIES) $(EXTRA_libindicator3_la_DEPENDENCIES)
1626 $(AM_V_CCLD)$(libindicator3_la_LINK) $(am_libindicator3_la_rpath) $(libindicator3_la_OBJECTS) $(libindicator3_la_LIBADD) $(LIBS)
1627
1628 mostlyclean-compile:
1629@@ -485,154 +492,135 @@
1630 .c.o:
1631 @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
1632 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
1633-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
1634-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
1635+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
1636 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1637-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
1638+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
1639
1640 .c.obj:
1641 @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
1642 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
1643-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
1644-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
1645+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
1646 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1647-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
1648+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
1649
1650 .c.lo:
1651 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
1652 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
1653-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
1654-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
1655+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
1656 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1657-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
1658+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
1659
1660 libindicator_la-gen-indicator-service.xml.lo: gen-indicator-service.xml.c
1661 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_la_CFLAGS) $(CFLAGS) -MT libindicator_la-gen-indicator-service.xml.lo -MD -MP -MF $(DEPDIR)/libindicator_la-gen-indicator-service.xml.Tpo -c -o libindicator_la-gen-indicator-service.xml.lo `test -f 'gen-indicator-service.xml.c' || echo '$(srcdir)/'`gen-indicator-service.xml.c
1662 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator_la-gen-indicator-service.xml.Tpo $(DEPDIR)/libindicator_la-gen-indicator-service.xml.Plo
1663-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
1664-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gen-indicator-service.xml.c' object='libindicator_la-gen-indicator-service.xml.lo' libtool=yes @AMDEPBACKSLASH@
1665+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gen-indicator-service.xml.c' object='libindicator_la-gen-indicator-service.xml.lo' libtool=yes @AMDEPBACKSLASH@
1666 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1667-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_la_CFLAGS) $(CFLAGS) -c -o libindicator_la-gen-indicator-service.xml.lo `test -f 'gen-indicator-service.xml.c' || echo '$(srcdir)/'`gen-indicator-service.xml.c
1668+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_la_CFLAGS) $(CFLAGS) -c -o libindicator_la-gen-indicator-service.xml.lo `test -f 'gen-indicator-service.xml.c' || echo '$(srcdir)/'`gen-indicator-service.xml.c
1669
1670 libindicator_la-indicator-object.lo: indicator-object.c
1671 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_la_CFLAGS) $(CFLAGS) -MT libindicator_la-indicator-object.lo -MD -MP -MF $(DEPDIR)/libindicator_la-indicator-object.Tpo -c -o libindicator_la-indicator-object.lo `test -f 'indicator-object.c' || echo '$(srcdir)/'`indicator-object.c
1672 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator_la-indicator-object.Tpo $(DEPDIR)/libindicator_la-indicator-object.Plo
1673-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
1674-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-object.c' object='libindicator_la-indicator-object.lo' libtool=yes @AMDEPBACKSLASH@
1675+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-object.c' object='libindicator_la-indicator-object.lo' libtool=yes @AMDEPBACKSLASH@
1676 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1677-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_la_CFLAGS) $(CFLAGS) -c -o libindicator_la-indicator-object.lo `test -f 'indicator-object.c' || echo '$(srcdir)/'`indicator-object.c
1678+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_la_CFLAGS) $(CFLAGS) -c -o libindicator_la-indicator-object.lo `test -f 'indicator-object.c' || echo '$(srcdir)/'`indicator-object.c
1679
1680 libindicator_la-indicator-object-enum-types.lo: indicator-object-enum-types.c
1681 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_la_CFLAGS) $(CFLAGS) -MT libindicator_la-indicator-object-enum-types.lo -MD -MP -MF $(DEPDIR)/libindicator_la-indicator-object-enum-types.Tpo -c -o libindicator_la-indicator-object-enum-types.lo `test -f 'indicator-object-enum-types.c' || echo '$(srcdir)/'`indicator-object-enum-types.c
1682 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator_la-indicator-object-enum-types.Tpo $(DEPDIR)/libindicator_la-indicator-object-enum-types.Plo
1683-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
1684-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-object-enum-types.c' object='libindicator_la-indicator-object-enum-types.lo' libtool=yes @AMDEPBACKSLASH@
1685+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-object-enum-types.c' object='libindicator_la-indicator-object-enum-types.lo' libtool=yes @AMDEPBACKSLASH@
1686 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1687-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_la_CFLAGS) $(CFLAGS) -c -o libindicator_la-indicator-object-enum-types.lo `test -f 'indicator-object-enum-types.c' || echo '$(srcdir)/'`indicator-object-enum-types.c
1688+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_la_CFLAGS) $(CFLAGS) -c -o libindicator_la-indicator-object-enum-types.lo `test -f 'indicator-object-enum-types.c' || echo '$(srcdir)/'`indicator-object-enum-types.c
1689
1690 libindicator_la-indicator-desktop-shortcuts.lo: indicator-desktop-shortcuts.c
1691 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_la_CFLAGS) $(CFLAGS) -MT libindicator_la-indicator-desktop-shortcuts.lo -MD -MP -MF $(DEPDIR)/libindicator_la-indicator-desktop-shortcuts.Tpo -c -o libindicator_la-indicator-desktop-shortcuts.lo `test -f 'indicator-desktop-shortcuts.c' || echo '$(srcdir)/'`indicator-desktop-shortcuts.c
1692 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator_la-indicator-desktop-shortcuts.Tpo $(DEPDIR)/libindicator_la-indicator-desktop-shortcuts.Plo
1693-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
1694-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-desktop-shortcuts.c' object='libindicator_la-indicator-desktop-shortcuts.lo' libtool=yes @AMDEPBACKSLASH@
1695+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-desktop-shortcuts.c' object='libindicator_la-indicator-desktop-shortcuts.lo' libtool=yes @AMDEPBACKSLASH@
1696 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1697-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_la_CFLAGS) $(CFLAGS) -c -o libindicator_la-indicator-desktop-shortcuts.lo `test -f 'indicator-desktop-shortcuts.c' || echo '$(srcdir)/'`indicator-desktop-shortcuts.c
1698+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_la_CFLAGS) $(CFLAGS) -c -o libindicator_la-indicator-desktop-shortcuts.lo `test -f 'indicator-desktop-shortcuts.c' || echo '$(srcdir)/'`indicator-desktop-shortcuts.c
1699
1700 libindicator_la-indicator-image-helper.lo: indicator-image-helper.c
1701 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_la_CFLAGS) $(CFLAGS) -MT libindicator_la-indicator-image-helper.lo -MD -MP -MF $(DEPDIR)/libindicator_la-indicator-image-helper.Tpo -c -o libindicator_la-indicator-image-helper.lo `test -f 'indicator-image-helper.c' || echo '$(srcdir)/'`indicator-image-helper.c
1702 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator_la-indicator-image-helper.Tpo $(DEPDIR)/libindicator_la-indicator-image-helper.Plo
1703-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
1704-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-image-helper.c' object='libindicator_la-indicator-image-helper.lo' libtool=yes @AMDEPBACKSLASH@
1705+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-image-helper.c' object='libindicator_la-indicator-image-helper.lo' libtool=yes @AMDEPBACKSLASH@
1706 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1707-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_la_CFLAGS) $(CFLAGS) -c -o libindicator_la-indicator-image-helper.lo `test -f 'indicator-image-helper.c' || echo '$(srcdir)/'`indicator-image-helper.c
1708+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_la_CFLAGS) $(CFLAGS) -c -o libindicator_la-indicator-image-helper.lo `test -f 'indicator-image-helper.c' || echo '$(srcdir)/'`indicator-image-helper.c
1709
1710 libindicator_la-indicator-object-marshal.lo: indicator-object-marshal.c
1711 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_la_CFLAGS) $(CFLAGS) -MT libindicator_la-indicator-object-marshal.lo -MD -MP -MF $(DEPDIR)/libindicator_la-indicator-object-marshal.Tpo -c -o libindicator_la-indicator-object-marshal.lo `test -f 'indicator-object-marshal.c' || echo '$(srcdir)/'`indicator-object-marshal.c
1712 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator_la-indicator-object-marshal.Tpo $(DEPDIR)/libindicator_la-indicator-object-marshal.Plo
1713-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
1714-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-object-marshal.c' object='libindicator_la-indicator-object-marshal.lo' libtool=yes @AMDEPBACKSLASH@
1715+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-object-marshal.c' object='libindicator_la-indicator-object-marshal.lo' libtool=yes @AMDEPBACKSLASH@
1716 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1717-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_la_CFLAGS) $(CFLAGS) -c -o libindicator_la-indicator-object-marshal.lo `test -f 'indicator-object-marshal.c' || echo '$(srcdir)/'`indicator-object-marshal.c
1718+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_la_CFLAGS) $(CFLAGS) -c -o libindicator_la-indicator-object-marshal.lo `test -f 'indicator-object-marshal.c' || echo '$(srcdir)/'`indicator-object-marshal.c
1719
1720 libindicator_la-indicator-service.lo: indicator-service.c
1721 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_la_CFLAGS) $(CFLAGS) -MT libindicator_la-indicator-service.lo -MD -MP -MF $(DEPDIR)/libindicator_la-indicator-service.Tpo -c -o libindicator_la-indicator-service.lo `test -f 'indicator-service.c' || echo '$(srcdir)/'`indicator-service.c
1722 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator_la-indicator-service.Tpo $(DEPDIR)/libindicator_la-indicator-service.Plo
1723-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
1724-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-service.c' object='libindicator_la-indicator-service.lo' libtool=yes @AMDEPBACKSLASH@
1725+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-service.c' object='libindicator_la-indicator-service.lo' libtool=yes @AMDEPBACKSLASH@
1726 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1727-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_la_CFLAGS) $(CFLAGS) -c -o libindicator_la-indicator-service.lo `test -f 'indicator-service.c' || echo '$(srcdir)/'`indicator-service.c
1728+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_la_CFLAGS) $(CFLAGS) -c -o libindicator_la-indicator-service.lo `test -f 'indicator-service.c' || echo '$(srcdir)/'`indicator-service.c
1729
1730 libindicator_la-indicator-service-manager.lo: indicator-service-manager.c
1731 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_la_CFLAGS) $(CFLAGS) -MT libindicator_la-indicator-service-manager.lo -MD -MP -MF $(DEPDIR)/libindicator_la-indicator-service-manager.Tpo -c -o libindicator_la-indicator-service-manager.lo `test -f 'indicator-service-manager.c' || echo '$(srcdir)/'`indicator-service-manager.c
1732 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator_la-indicator-service-manager.Tpo $(DEPDIR)/libindicator_la-indicator-service-manager.Plo
1733-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
1734-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-service-manager.c' object='libindicator_la-indicator-service-manager.lo' libtool=yes @AMDEPBACKSLASH@
1735+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-service-manager.c' object='libindicator_la-indicator-service-manager.lo' libtool=yes @AMDEPBACKSLASH@
1736 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1737-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_la_CFLAGS) $(CFLAGS) -c -o libindicator_la-indicator-service-manager.lo `test -f 'indicator-service-manager.c' || echo '$(srcdir)/'`indicator-service-manager.c
1738+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_la_CFLAGS) $(CFLAGS) -c -o libindicator_la-indicator-service-manager.lo `test -f 'indicator-service-manager.c' || echo '$(srcdir)/'`indicator-service-manager.c
1739
1740 libindicator3_la-gen-indicator-service.xml.lo: gen-indicator-service.xml.c
1741 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -MT libindicator3_la-gen-indicator-service.xml.lo -MD -MP -MF $(DEPDIR)/libindicator3_la-gen-indicator-service.xml.Tpo -c -o libindicator3_la-gen-indicator-service.xml.lo `test -f 'gen-indicator-service.xml.c' || echo '$(srcdir)/'`gen-indicator-service.xml.c
1742 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator3_la-gen-indicator-service.xml.Tpo $(DEPDIR)/libindicator3_la-gen-indicator-service.xml.Plo
1743-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
1744-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gen-indicator-service.xml.c' object='libindicator3_la-gen-indicator-service.xml.lo' libtool=yes @AMDEPBACKSLASH@
1745+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gen-indicator-service.xml.c' object='libindicator3_la-gen-indicator-service.xml.lo' libtool=yes @AMDEPBACKSLASH@
1746 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1747-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -c -o libindicator3_la-gen-indicator-service.xml.lo `test -f 'gen-indicator-service.xml.c' || echo '$(srcdir)/'`gen-indicator-service.xml.c
1748+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -c -o libindicator3_la-gen-indicator-service.xml.lo `test -f 'gen-indicator-service.xml.c' || echo '$(srcdir)/'`gen-indicator-service.xml.c
1749
1750 libindicator3_la-indicator-object.lo: indicator-object.c
1751 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -MT libindicator3_la-indicator-object.lo -MD -MP -MF $(DEPDIR)/libindicator3_la-indicator-object.Tpo -c -o libindicator3_la-indicator-object.lo `test -f 'indicator-object.c' || echo '$(srcdir)/'`indicator-object.c
1752 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator3_la-indicator-object.Tpo $(DEPDIR)/libindicator3_la-indicator-object.Plo
1753-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
1754-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-object.c' object='libindicator3_la-indicator-object.lo' libtool=yes @AMDEPBACKSLASH@
1755+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-object.c' object='libindicator3_la-indicator-object.lo' libtool=yes @AMDEPBACKSLASH@
1756 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1757-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -c -o libindicator3_la-indicator-object.lo `test -f 'indicator-object.c' || echo '$(srcdir)/'`indicator-object.c
1758+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -c -o libindicator3_la-indicator-object.lo `test -f 'indicator-object.c' || echo '$(srcdir)/'`indicator-object.c
1759
1760 libindicator3_la-indicator-object-enum-types.lo: indicator-object-enum-types.c
1761 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -MT libindicator3_la-indicator-object-enum-types.lo -MD -MP -MF $(DEPDIR)/libindicator3_la-indicator-object-enum-types.Tpo -c -o libindicator3_la-indicator-object-enum-types.lo `test -f 'indicator-object-enum-types.c' || echo '$(srcdir)/'`indicator-object-enum-types.c
1762 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator3_la-indicator-object-enum-types.Tpo $(DEPDIR)/libindicator3_la-indicator-object-enum-types.Plo
1763-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
1764-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-object-enum-types.c' object='libindicator3_la-indicator-object-enum-types.lo' libtool=yes @AMDEPBACKSLASH@
1765+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-object-enum-types.c' object='libindicator3_la-indicator-object-enum-types.lo' libtool=yes @AMDEPBACKSLASH@
1766 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1767-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -c -o libindicator3_la-indicator-object-enum-types.lo `test -f 'indicator-object-enum-types.c' || echo '$(srcdir)/'`indicator-object-enum-types.c
1768+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -c -o libindicator3_la-indicator-object-enum-types.lo `test -f 'indicator-object-enum-types.c' || echo '$(srcdir)/'`indicator-object-enum-types.c
1769
1770 libindicator3_la-indicator-desktop-shortcuts.lo: indicator-desktop-shortcuts.c
1771 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -MT libindicator3_la-indicator-desktop-shortcuts.lo -MD -MP -MF $(DEPDIR)/libindicator3_la-indicator-desktop-shortcuts.Tpo -c -o libindicator3_la-indicator-desktop-shortcuts.lo `test -f 'indicator-desktop-shortcuts.c' || echo '$(srcdir)/'`indicator-desktop-shortcuts.c
1772 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator3_la-indicator-desktop-shortcuts.Tpo $(DEPDIR)/libindicator3_la-indicator-desktop-shortcuts.Plo
1773-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
1774-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-desktop-shortcuts.c' object='libindicator3_la-indicator-desktop-shortcuts.lo' libtool=yes @AMDEPBACKSLASH@
1775+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-desktop-shortcuts.c' object='libindicator3_la-indicator-desktop-shortcuts.lo' libtool=yes @AMDEPBACKSLASH@
1776 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1777-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -c -o libindicator3_la-indicator-desktop-shortcuts.lo `test -f 'indicator-desktop-shortcuts.c' || echo '$(srcdir)/'`indicator-desktop-shortcuts.c
1778+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -c -o libindicator3_la-indicator-desktop-shortcuts.lo `test -f 'indicator-desktop-shortcuts.c' || echo '$(srcdir)/'`indicator-desktop-shortcuts.c
1779
1780 libindicator3_la-indicator-image-helper.lo: indicator-image-helper.c
1781 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -MT libindicator3_la-indicator-image-helper.lo -MD -MP -MF $(DEPDIR)/libindicator3_la-indicator-image-helper.Tpo -c -o libindicator3_la-indicator-image-helper.lo `test -f 'indicator-image-helper.c' || echo '$(srcdir)/'`indicator-image-helper.c
1782 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator3_la-indicator-image-helper.Tpo $(DEPDIR)/libindicator3_la-indicator-image-helper.Plo
1783-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
1784-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-image-helper.c' object='libindicator3_la-indicator-image-helper.lo' libtool=yes @AMDEPBACKSLASH@
1785+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-image-helper.c' object='libindicator3_la-indicator-image-helper.lo' libtool=yes @AMDEPBACKSLASH@
1786 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1787-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -c -o libindicator3_la-indicator-image-helper.lo `test -f 'indicator-image-helper.c' || echo '$(srcdir)/'`indicator-image-helper.c
1788+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -c -o libindicator3_la-indicator-image-helper.lo `test -f 'indicator-image-helper.c' || echo '$(srcdir)/'`indicator-image-helper.c
1789
1790 libindicator3_la-indicator-object-marshal.lo: indicator-object-marshal.c
1791 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -MT libindicator3_la-indicator-object-marshal.lo -MD -MP -MF $(DEPDIR)/libindicator3_la-indicator-object-marshal.Tpo -c -o libindicator3_la-indicator-object-marshal.lo `test -f 'indicator-object-marshal.c' || echo '$(srcdir)/'`indicator-object-marshal.c
1792 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator3_la-indicator-object-marshal.Tpo $(DEPDIR)/libindicator3_la-indicator-object-marshal.Plo
1793-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
1794-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-object-marshal.c' object='libindicator3_la-indicator-object-marshal.lo' libtool=yes @AMDEPBACKSLASH@
1795+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-object-marshal.c' object='libindicator3_la-indicator-object-marshal.lo' libtool=yes @AMDEPBACKSLASH@
1796 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1797-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -c -o libindicator3_la-indicator-object-marshal.lo `test -f 'indicator-object-marshal.c' || echo '$(srcdir)/'`indicator-object-marshal.c
1798+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -c -o libindicator3_la-indicator-object-marshal.lo `test -f 'indicator-object-marshal.c' || echo '$(srcdir)/'`indicator-object-marshal.c
1799
1800 libindicator3_la-indicator-service.lo: indicator-service.c
1801 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -MT libindicator3_la-indicator-service.lo -MD -MP -MF $(DEPDIR)/libindicator3_la-indicator-service.Tpo -c -o libindicator3_la-indicator-service.lo `test -f 'indicator-service.c' || echo '$(srcdir)/'`indicator-service.c
1802 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator3_la-indicator-service.Tpo $(DEPDIR)/libindicator3_la-indicator-service.Plo
1803-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
1804-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-service.c' object='libindicator3_la-indicator-service.lo' libtool=yes @AMDEPBACKSLASH@
1805+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-service.c' object='libindicator3_la-indicator-service.lo' libtool=yes @AMDEPBACKSLASH@
1806 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1807-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -c -o libindicator3_la-indicator-service.lo `test -f 'indicator-service.c' || echo '$(srcdir)/'`indicator-service.c
1808+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -c -o libindicator3_la-indicator-service.lo `test -f 'indicator-service.c' || echo '$(srcdir)/'`indicator-service.c
1809
1810 libindicator3_la-indicator-service-manager.lo: indicator-service-manager.c
1811 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -MT libindicator3_la-indicator-service-manager.lo -MD -MP -MF $(DEPDIR)/libindicator3_la-indicator-service-manager.Tpo -c -o libindicator3_la-indicator-service-manager.lo `test -f 'indicator-service-manager.c' || echo '$(srcdir)/'`indicator-service-manager.c
1812 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator3_la-indicator-service-manager.Tpo $(DEPDIR)/libindicator3_la-indicator-service-manager.Plo
1813-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
1814-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-service-manager.c' object='libindicator3_la-indicator-service-manager.lo' libtool=yes @AMDEPBACKSLASH@
1815+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-service-manager.c' object='libindicator3_la-indicator-service-manager.lo' libtool=yes @AMDEPBACKSLASH@
1816 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1817-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -c -o libindicator3_la-indicator-service-manager.lo `test -f 'indicator-service-manager.c' || echo '$(srcdir)/'`indicator-service-manager.c
1818+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -c -o libindicator3_la-indicator-service-manager.lo `test -f 'indicator-service-manager.c' || echo '$(srcdir)/'`indicator-service-manager.c
1819
1820 mostlyclean-libtool:
1821 -rm -f *.lo
1822@@ -656,9 +644,7 @@
1823 @$(NORMAL_UNINSTALL)
1824 @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
1825 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
1826- test -n "$$files" || exit 0; \
1827- echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
1828- cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
1829+ dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
1830 install-libindicator3includeHEADERS: $(libindicator3include_HEADERS)
1831 @$(NORMAL_INSTALL)
1832 test -z "$(libindicator3includedir)" || $(MKDIR_P) "$(DESTDIR)$(libindicator3includedir)"
1833@@ -676,9 +662,7 @@
1834 @$(NORMAL_UNINSTALL)
1835 @list='$(libindicator3include_HEADERS)'; test -n "$(libindicator3includedir)" || list=; \
1836 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
1837- test -n "$$files" || exit 0; \
1838- echo " ( cd '$(DESTDIR)$(libindicator3includedir)' && rm -f" $$files ")"; \
1839- cd "$(DESTDIR)$(libindicator3includedir)" && rm -f $$files
1840+ dir='$(DESTDIR)$(libindicator3includedir)'; $(am__uninstall_files_from_dir)
1841 install-libindicatorincludeHEADERS: $(libindicatorinclude_HEADERS)
1842 @$(NORMAL_INSTALL)
1843 test -z "$(libindicatorincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libindicatorincludedir)"
1844@@ -696,9 +680,7 @@
1845 @$(NORMAL_UNINSTALL)
1846 @list='$(libindicatorinclude_HEADERS)'; test -n "$(libindicatorincludedir)" || list=; \
1847 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
1848- test -n "$$files" || exit 0; \
1849- echo " ( cd '$(DESTDIR)$(libindicatorincludedir)' && rm -f" $$files ")"; \
1850- cd "$(DESTDIR)$(libindicatorincludedir)" && rm -f $$files
1851+ dir='$(DESTDIR)$(libindicatorincludedir)'; $(am__uninstall_files_from_dir)
1852
1853 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
1854 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
1855@@ -801,10 +783,15 @@
1856
1857 installcheck: installcheck-am
1858 install-strip:
1859- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
1860- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
1861- `test -z '$(STRIP)' || \
1862- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
1863+ if test -z '$(STRIP)'; then \
1864+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
1865+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
1866+ install; \
1867+ else \
1868+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
1869+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
1870+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
1871+ fi
1872 mostlyclean-generic:
1873
1874 clean-generic:
1875
1876=== modified file 'libindicator/indicator-desktop-shortcuts.c'
1877--- libindicator/indicator-desktop-shortcuts.c 2012-01-12 13:51:30 +0000
1878+++ libindicator/indicator-desktop-shortcuts.c 2012-02-14 20:34:19 +0000
1879@@ -281,6 +281,7 @@
1880
1881 gchar * nickalloc = g_strdup(nicks[i]);
1882 g_array_append_val(priv->nicks, nickalloc);
1883+ g_free(groupname);
1884 }
1885
1886 if (nicks != NULL) {
1887
1888=== modified file 'libindicator/indicator-object.c'
1889--- libindicator/indicator-object.c 2012-01-26 05:37:14 +0000
1890+++ libindicator/indicator-object.c 2012-02-14 20:34:19 +0000
1891@@ -336,20 +336,9 @@
1892 static void
1893 indicator_object_dispose (GObject *object)
1894 {
1895- IndicatorObject * io = INDICATOR_OBJECT(object);
1896-
1897 /* Ensure that hidden entries are re-added so their widgetry will
1898 be cleaned up properly by the client */
1899- GList * l;
1900- GList * entries = get_all_entries (io);
1901- const GQuark detail = (GQuark)0;
1902- for (l=entries; l!=NULL; l=l->next) {
1903- IndicatorObjectEntry * entry = l->data;
1904- if (entry_get_private(io, entry)->visibility == ENTRY_INVISIBLE) {
1905- g_signal_emit(io, signals[ENTRY_ADDED], detail, entry);
1906- }
1907- }
1908- g_list_free (entries);
1909+ indicator_object_set_visible (INDICATOR_OBJECT (object), TRUE);
1910
1911 G_OBJECT_CLASS (indicator_object_parent_class)->dispose (object);
1912 }
1913@@ -507,6 +496,8 @@
1914 if (!priv->gotten_entries) {
1915 IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io);
1916
1917+ priv->entry.parent_object = io;
1918+
1919 if (class->get_label) {
1920 priv->entry.label = class->get_label(io);
1921 }
1922@@ -551,7 +542,7 @@
1923 static GList*
1924 get_all_entries (IndicatorObject * io)
1925 {
1926- GList * all_entries = NULL;
1927+ GList * all_entries = NULL, *l;
1928
1929 g_return_val_if_fail(INDICATOR_IS_OBJECT(io), NULL);
1930 IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io);
1931@@ -559,8 +550,18 @@
1932 if (class->get_entries == NULL)
1933 g_error("No get_entries function on object. It must have been deleted?!?!");
1934 else
1935+ {
1936 all_entries = class->get_entries(io);
1937
1938+ for (l = all_entries; l; l = l->next)
1939+ {
1940+ IndicatorObjectEntry *entry = l->data;
1941+
1942+ if (entry)
1943+ entry->parent_object = io;
1944+ }
1945+ }
1946+
1947 return all_entries;
1948 }
1949
1950@@ -758,8 +759,13 @@
1951
1952 entry_get_private (io, entry)->visibility = ENTRY_INVISIBLE;
1953
1954+ if (entry)
1955+ entry->parent_object = NULL;
1956+
1957 if (class->entry_being_removed != NULL)
1958+ {
1959 class->entry_being_removed (io, entry);
1960+ }
1961 }
1962
1963 static void
1964@@ -770,8 +776,13 @@
1965
1966 entry_get_private (io, entry)->visibility = ENTRY_VISIBLE;
1967
1968+ if (entry)
1969+ entry->parent_object = io;
1970+
1971 if (class->entry_was_added != NULL)
1972+ {
1973 class->entry_was_added (io, entry);
1974+ }
1975 }
1976
1977 /**
1978@@ -861,9 +872,14 @@
1979 GList * l;
1980 GList * entries = get_all_entries (io);
1981 const guint signal_id = signals[visible ? ENTRY_ADDED : ENTRY_REMOVED];
1982+ EntryVisibility visibility = visible ? ENTRY_VISIBLE : ENTRY_INVISIBLE;
1983 const GQuark detail = (GQuark)0;
1984- for (l=entries; l!=NULL; l=l->next)
1985- g_signal_emit(io, signal_id, detail, l->data);
1986+
1987+ for (l=entries; l!=NULL; l=l->next) {
1988+ IndicatorObjectEntry *entry = l->data;
1989+ if (entry_get_private (io, entry)->visibility != visibility)
1990+ g_signal_emit(io, signal_id, detail, entry);
1991+ }
1992 g_list_free (entries);
1993 }
1994
1995
1996=== modified file 'tests/Makefile.in'
1997--- tests/Makefile.in 2012-01-24 16:10:15 +0000
1998+++ tests/Makefile.in 2012-02-14 20:34:19 +0000
1999@@ -1,9 +1,9 @@
2000-# Makefile.in generated by automake 1.11.1 from Makefile.am.
2001+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2002 # @configure_input@
2003
2004 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
2005-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
2006-# Inc.
2007+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
2008+# Foundation, Inc.
2009 # This Makefile.in is free software; the Free Software Foundation
2010 # gives unlimited permission to copy and/or distribute it,
2011 # with or without modifications, as long as this notice is preserved.
2012@@ -81,6 +81,12 @@
2013 am__base_list = \
2014 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
2015 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
2016+am__uninstall_files_from_dir = { \
2017+ test -z "$$files" \
2018+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
2019+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
2020+ $(am__cd) "$$dir" && rm -f $$files; }; \
2021+ }
2022 am__installdirs = "$(DESTDIR)$(libdir)"
2023 LTLIBRARIES = $(lib_LTLIBRARIES)
2024 am__DEPENDENCIES_1 =
2025@@ -90,8 +96,8 @@
2026 libdummy_indicator_blank_la-dummy-indicator-blank.lo
2027 libdummy_indicator_blank_la_OBJECTS = \
2028 $(am_libdummy_indicator_blank_la_OBJECTS)
2029-AM_V_lt = $(am__v_lt_$(V))
2030-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
2031+AM_V_lt = $(am__v_lt_@AM_V@)
2032+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
2033 am__v_lt_0 = --silent
2034 libdummy_indicator_blank_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
2035 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
2036@@ -273,21 +279,21 @@
2037 $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
2038 $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
2039 $(AM_CFLAGS) $(CFLAGS)
2040-AM_V_CC = $(am__v_CC_$(V))
2041-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
2042+AM_V_CC = $(am__v_CC_@AM_V@)
2043+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
2044 am__v_CC_0 = @echo " CC " $@;
2045-AM_V_at = $(am__v_at_$(V))
2046-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
2047+AM_V_at = $(am__v_at_@AM_V@)
2048+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
2049 am__v_at_0 = @
2050 CCLD = $(CC)
2051 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
2052 $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
2053 $(AM_LDFLAGS) $(LDFLAGS) -o $@
2054-AM_V_CCLD = $(am__v_CCLD_$(V))
2055-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
2056+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
2057+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
2058 am__v_CCLD_0 = @echo " CCLD " $@;
2059-AM_V_GEN = $(am__v_GEN_$(V))
2060-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
2061+AM_V_GEN = $(am__v_GEN_@AM_V@)
2062+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
2063 am__v_GEN_0 = @echo " GEN " $@;
2064 SOURCES = $(libdummy_indicator_blank_la_SOURCES) \
2065 $(libdummy_indicator_entry_func_la_SOURCES) \
2066@@ -850,17 +856,17 @@
2067 echo "rm -f \"$${dir}/so_locations\""; \
2068 rm -f "$${dir}/so_locations"; \
2069 done
2070-libdummy-indicator-blank.la: $(libdummy_indicator_blank_la_OBJECTS) $(libdummy_indicator_blank_la_DEPENDENCIES)
2071+libdummy-indicator-blank.la: $(libdummy_indicator_blank_la_OBJECTS) $(libdummy_indicator_blank_la_DEPENDENCIES) $(EXTRA_libdummy_indicator_blank_la_DEPENDENCIES)
2072 $(AM_V_CCLD)$(libdummy_indicator_blank_la_LINK) -rpath $(libdir) $(libdummy_indicator_blank_la_OBJECTS) $(libdummy_indicator_blank_la_LIBADD) $(LIBS)
2073-libdummy-indicator-entry-func.la: $(libdummy_indicator_entry_func_la_OBJECTS) $(libdummy_indicator_entry_func_la_DEPENDENCIES)
2074+libdummy-indicator-entry-func.la: $(libdummy_indicator_entry_func_la_OBJECTS) $(libdummy_indicator_entry_func_la_DEPENDENCIES) $(EXTRA_libdummy_indicator_entry_func_la_DEPENDENCIES)
2075 $(AM_V_CCLD)$(libdummy_indicator_entry_func_la_LINK) -rpath $(libdir) $(libdummy_indicator_entry_func_la_OBJECTS) $(libdummy_indicator_entry_func_la_LIBADD) $(LIBS)
2076-libdummy-indicator-null.la: $(libdummy_indicator_null_la_OBJECTS) $(libdummy_indicator_null_la_DEPENDENCIES)
2077+libdummy-indicator-null.la: $(libdummy_indicator_null_la_OBJECTS) $(libdummy_indicator_null_la_DEPENDENCIES) $(EXTRA_libdummy_indicator_null_la_DEPENDENCIES)
2078 $(AM_V_CCLD)$(libdummy_indicator_null_la_LINK) -rpath $(libdir) $(libdummy_indicator_null_la_OBJECTS) $(libdummy_indicator_null_la_LIBADD) $(LIBS)
2079-libdummy-indicator-signaler.la: $(libdummy_indicator_signaler_la_OBJECTS) $(libdummy_indicator_signaler_la_DEPENDENCIES)
2080+libdummy-indicator-signaler.la: $(libdummy_indicator_signaler_la_OBJECTS) $(libdummy_indicator_signaler_la_DEPENDENCIES) $(EXTRA_libdummy_indicator_signaler_la_DEPENDENCIES)
2081 $(AM_V_CCLD)$(libdummy_indicator_signaler_la_LINK) -rpath $(libdir) $(libdummy_indicator_signaler_la_OBJECTS) $(libdummy_indicator_signaler_la_LIBADD) $(LIBS)
2082-libdummy-indicator-simple.la: $(libdummy_indicator_simple_la_OBJECTS) $(libdummy_indicator_simple_la_DEPENDENCIES)
2083+libdummy-indicator-simple.la: $(libdummy_indicator_simple_la_OBJECTS) $(libdummy_indicator_simple_la_DEPENDENCIES) $(EXTRA_libdummy_indicator_simple_la_DEPENDENCIES)
2084 $(AM_V_CCLD)$(libdummy_indicator_simple_la_LINK) -rpath $(libdir) $(libdummy_indicator_simple_la_OBJECTS) $(libdummy_indicator_simple_la_LIBADD) $(LIBS)
2085-libdummy-indicator-visible.la: $(libdummy_indicator_visible_la_OBJECTS) $(libdummy_indicator_visible_la_DEPENDENCIES)
2086+libdummy-indicator-visible.la: $(libdummy_indicator_visible_la_OBJECTS) $(libdummy_indicator_visible_la_DEPENDENCIES) $(EXTRA_libdummy_indicator_visible_la_DEPENDENCIES)
2087 $(AM_V_CCLD)$(libdummy_indicator_visible_la_LINK) -rpath $(libdir) $(libdummy_indicator_visible_la_OBJECTS) $(libdummy_indicator_visible_la_LIBADD) $(LIBS)
2088
2089 clean-checkPROGRAMS:
2090@@ -871,43 +877,43 @@
2091 list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
2092 echo " rm -f" $$list; \
2093 rm -f $$list
2094-service-manager-connect$(EXEEXT): $(service_manager_connect_OBJECTS) $(service_manager_connect_DEPENDENCIES)
2095+service-manager-connect$(EXEEXT): $(service_manager_connect_OBJECTS) $(service_manager_connect_DEPENDENCIES) $(EXTRA_service_manager_connect_DEPENDENCIES)
2096 @rm -f service-manager-connect$(EXEEXT)
2097 $(AM_V_CCLD)$(service_manager_connect_LINK) $(service_manager_connect_OBJECTS) $(service_manager_connect_LDADD) $(LIBS)
2098-service-manager-connect-service$(EXEEXT): $(service_manager_connect_service_OBJECTS) $(service_manager_connect_service_DEPENDENCIES)
2099+service-manager-connect-service$(EXEEXT): $(service_manager_connect_service_OBJECTS) $(service_manager_connect_service_DEPENDENCIES) $(EXTRA_service_manager_connect_service_DEPENDENCIES)
2100 @rm -f service-manager-connect-service$(EXEEXT)
2101 $(AM_V_CCLD)$(service_manager_connect_service_LINK) $(service_manager_connect_service_OBJECTS) $(service_manager_connect_service_LDADD) $(LIBS)
2102-service-manager-no-connect$(EXEEXT): $(service_manager_no_connect_OBJECTS) $(service_manager_no_connect_DEPENDENCIES)
2103+service-manager-no-connect$(EXEEXT): $(service_manager_no_connect_OBJECTS) $(service_manager_no_connect_DEPENDENCIES) $(EXTRA_service_manager_no_connect_DEPENDENCIES)
2104 @rm -f service-manager-no-connect$(EXEEXT)
2105 $(AM_V_CCLD)$(service_manager_no_connect_LINK) $(service_manager_no_connect_OBJECTS) $(service_manager_no_connect_LDADD) $(LIBS)
2106-service-manager-nostart-connect$(EXEEXT): $(service_manager_nostart_connect_OBJECTS) $(service_manager_nostart_connect_DEPENDENCIES)
2107+service-manager-nostart-connect$(EXEEXT): $(service_manager_nostart_connect_OBJECTS) $(service_manager_nostart_connect_DEPENDENCIES) $(EXTRA_service_manager_nostart_connect_DEPENDENCIES)
2108 @rm -f service-manager-nostart-connect$(EXEEXT)
2109 $(AM_V_CCLD)$(service_manager_nostart_connect_LINK) $(service_manager_nostart_connect_OBJECTS) $(service_manager_nostart_connect_LDADD) $(LIBS)
2110-service-shutdown-timeout$(EXEEXT): $(service_shutdown_timeout_OBJECTS) $(service_shutdown_timeout_DEPENDENCIES)
2111+service-shutdown-timeout$(EXEEXT): $(service_shutdown_timeout_OBJECTS) $(service_shutdown_timeout_DEPENDENCIES) $(EXTRA_service_shutdown_timeout_DEPENDENCIES)
2112 @rm -f service-shutdown-timeout$(EXEEXT)
2113 $(AM_V_CCLD)$(service_shutdown_timeout_LINK) $(service_shutdown_timeout_OBJECTS) $(service_shutdown_timeout_LDADD) $(LIBS)
2114-service-version-bad-service$(EXEEXT): $(service_version_bad_service_OBJECTS) $(service_version_bad_service_DEPENDENCIES)
2115+service-version-bad-service$(EXEEXT): $(service_version_bad_service_OBJECTS) $(service_version_bad_service_DEPENDENCIES) $(EXTRA_service_version_bad_service_DEPENDENCIES)
2116 @rm -f service-version-bad-service$(EXEEXT)
2117 $(AM_V_CCLD)$(service_version_bad_service_LINK) $(service_version_bad_service_OBJECTS) $(service_version_bad_service_LDADD) $(LIBS)
2118-service-version-good-service$(EXEEXT): $(service_version_good_service_OBJECTS) $(service_version_good_service_DEPENDENCIES)
2119+service-version-good-service$(EXEEXT): $(service_version_good_service_OBJECTS) $(service_version_good_service_DEPENDENCIES) $(EXTRA_service_version_good_service_DEPENDENCIES)
2120 @rm -f service-version-good-service$(EXEEXT)
2121 $(AM_V_CCLD)$(service_version_good_service_LINK) $(service_version_good_service_OBJECTS) $(service_version_good_service_LDADD) $(LIBS)
2122-service-version-manager$(EXEEXT): $(service_version_manager_OBJECTS) $(service_version_manager_DEPENDENCIES)
2123+service-version-manager$(EXEEXT): $(service_version_manager_OBJECTS) $(service_version_manager_DEPENDENCIES) $(EXTRA_service_version_manager_DEPENDENCIES)
2124 @rm -f service-version-manager$(EXEEXT)
2125 $(AM_V_CCLD)$(service_version_manager_LINK) $(service_version_manager_OBJECTS) $(service_version_manager_LDADD) $(LIBS)
2126-service-version-multiwatch-manager$(EXEEXT): $(service_version_multiwatch_manager_OBJECTS) $(service_version_multiwatch_manager_DEPENDENCIES)
2127+service-version-multiwatch-manager$(EXEEXT): $(service_version_multiwatch_manager_OBJECTS) $(service_version_multiwatch_manager_DEPENDENCIES) $(EXTRA_service_version_multiwatch_manager_DEPENDENCIES)
2128 @rm -f service-version-multiwatch-manager$(EXEEXT)
2129 $(AM_V_CCLD)$(service_version_multiwatch_manager_LINK) $(service_version_multiwatch_manager_OBJECTS) $(service_version_multiwatch_manager_LDADD) $(LIBS)
2130-service-version-multiwatch-manager-impolite$(EXEEXT): $(service_version_multiwatch_manager_impolite_OBJECTS) $(service_version_multiwatch_manager_impolite_DEPENDENCIES)
2131+service-version-multiwatch-manager-impolite$(EXEEXT): $(service_version_multiwatch_manager_impolite_OBJECTS) $(service_version_multiwatch_manager_impolite_DEPENDENCIES) $(EXTRA_service_version_multiwatch_manager_impolite_DEPENDENCIES)
2132 @rm -f service-version-multiwatch-manager-impolite$(EXEEXT)
2133 $(AM_V_CCLD)$(service_version_multiwatch_manager_impolite_LINK) $(service_version_multiwatch_manager_impolite_OBJECTS) $(service_version_multiwatch_manager_impolite_LDADD) $(LIBS)
2134-service-version-multiwatch-service$(EXEEXT): $(service_version_multiwatch_service_OBJECTS) $(service_version_multiwatch_service_DEPENDENCIES)
2135+service-version-multiwatch-service$(EXEEXT): $(service_version_multiwatch_service_OBJECTS) $(service_version_multiwatch_service_DEPENDENCIES) $(EXTRA_service_version_multiwatch_service_DEPENDENCIES)
2136 @rm -f service-version-multiwatch-service$(EXEEXT)
2137 $(AM_V_CCLD)$(service_version_multiwatch_service_LINK) $(service_version_multiwatch_service_OBJECTS) $(service_version_multiwatch_service_LDADD) $(LIBS)
2138-test-desktop-shortcuts$(EXEEXT): $(test_desktop_shortcuts_OBJECTS) $(test_desktop_shortcuts_DEPENDENCIES)
2139+test-desktop-shortcuts$(EXEEXT): $(test_desktop_shortcuts_OBJECTS) $(test_desktop_shortcuts_DEPENDENCIES) $(EXTRA_test_desktop_shortcuts_DEPENDENCIES)
2140 @rm -f test-desktop-shortcuts$(EXEEXT)
2141 $(AM_V_CCLD)$(test_desktop_shortcuts_LINK) $(test_desktop_shortcuts_OBJECTS) $(test_desktop_shortcuts_LDADD) $(LIBS)
2142-test-loader$(EXEEXT): $(test_loader_OBJECTS) $(test_loader_DEPENDENCIES)
2143+test-loader$(EXEEXT): $(test_loader_OBJECTS) $(test_loader_DEPENDENCIES) $(EXTRA_test_loader_DEPENDENCIES)
2144 @rm -f test-loader$(EXEEXT)
2145 $(AM_V_CCLD)$(test_loader_LINK) $(test_loader_OBJECTS) $(test_loader_LDADD) $(LIBS)
2146
2147@@ -940,282 +946,247 @@
2148 .c.o:
2149 @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
2150 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
2151-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2152-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
2153+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
2154 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2155-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
2156+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
2157
2158 .c.obj:
2159 @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
2160 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
2161-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2162-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
2163+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
2164 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2165-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
2166+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
2167
2168 .c.lo:
2169 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
2170 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
2171-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2172-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
2173+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
2174 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2175-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
2176+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
2177
2178 libdummy_indicator_blank_la-dummy-indicator-blank.lo: dummy-indicator-blank.c
2179 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdummy_indicator_blank_la_CFLAGS) $(CFLAGS) -MT libdummy_indicator_blank_la-dummy-indicator-blank.lo -MD -MP -MF $(DEPDIR)/libdummy_indicator_blank_la-dummy-indicator-blank.Tpo -c -o libdummy_indicator_blank_la-dummy-indicator-blank.lo `test -f 'dummy-indicator-blank.c' || echo '$(srcdir)/'`dummy-indicator-blank.c
2180 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdummy_indicator_blank_la-dummy-indicator-blank.Tpo $(DEPDIR)/libdummy_indicator_blank_la-dummy-indicator-blank.Plo
2181-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2182-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dummy-indicator-blank.c' object='libdummy_indicator_blank_la-dummy-indicator-blank.lo' libtool=yes @AMDEPBACKSLASH@
2183+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dummy-indicator-blank.c' object='libdummy_indicator_blank_la-dummy-indicator-blank.lo' libtool=yes @AMDEPBACKSLASH@
2184 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2185-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdummy_indicator_blank_la_CFLAGS) $(CFLAGS) -c -o libdummy_indicator_blank_la-dummy-indicator-blank.lo `test -f 'dummy-indicator-blank.c' || echo '$(srcdir)/'`dummy-indicator-blank.c
2186+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdummy_indicator_blank_la_CFLAGS) $(CFLAGS) -c -o libdummy_indicator_blank_la-dummy-indicator-blank.lo `test -f 'dummy-indicator-blank.c' || echo '$(srcdir)/'`dummy-indicator-blank.c
2187
2188 libdummy_indicator_entry_func_la-dummy-indicator-entry-func.lo: dummy-indicator-entry-func.c
2189 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdummy_indicator_entry_func_la_CFLAGS) $(CFLAGS) -MT libdummy_indicator_entry_func_la-dummy-indicator-entry-func.lo -MD -MP -MF $(DEPDIR)/libdummy_indicator_entry_func_la-dummy-indicator-entry-func.Tpo -c -o libdummy_indicator_entry_func_la-dummy-indicator-entry-func.lo `test -f 'dummy-indicator-entry-func.c' || echo '$(srcdir)/'`dummy-indicator-entry-func.c
2190 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdummy_indicator_entry_func_la-dummy-indicator-entry-func.Tpo $(DEPDIR)/libdummy_indicator_entry_func_la-dummy-indicator-entry-func.Plo
2191-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2192-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dummy-indicator-entry-func.c' object='libdummy_indicator_entry_func_la-dummy-indicator-entry-func.lo' libtool=yes @AMDEPBACKSLASH@
2193+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dummy-indicator-entry-func.c' object='libdummy_indicator_entry_func_la-dummy-indicator-entry-func.lo' libtool=yes @AMDEPBACKSLASH@
2194 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2195-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdummy_indicator_entry_func_la_CFLAGS) $(CFLAGS) -c -o libdummy_indicator_entry_func_la-dummy-indicator-entry-func.lo `test -f 'dummy-indicator-entry-func.c' || echo '$(srcdir)/'`dummy-indicator-entry-func.c
2196+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdummy_indicator_entry_func_la_CFLAGS) $(CFLAGS) -c -o libdummy_indicator_entry_func_la-dummy-indicator-entry-func.lo `test -f 'dummy-indicator-entry-func.c' || echo '$(srcdir)/'`dummy-indicator-entry-func.c
2197
2198 libdummy_indicator_null_la-dummy-indicator-null.lo: dummy-indicator-null.c
2199 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdummy_indicator_null_la_CFLAGS) $(CFLAGS) -MT libdummy_indicator_null_la-dummy-indicator-null.lo -MD -MP -MF $(DEPDIR)/libdummy_indicator_null_la-dummy-indicator-null.Tpo -c -o libdummy_indicator_null_la-dummy-indicator-null.lo `test -f 'dummy-indicator-null.c' || echo '$(srcdir)/'`dummy-indicator-null.c
2200 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdummy_indicator_null_la-dummy-indicator-null.Tpo $(DEPDIR)/libdummy_indicator_null_la-dummy-indicator-null.Plo
2201-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2202-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dummy-indicator-null.c' object='libdummy_indicator_null_la-dummy-indicator-null.lo' libtool=yes @AMDEPBACKSLASH@
2203+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dummy-indicator-null.c' object='libdummy_indicator_null_la-dummy-indicator-null.lo' libtool=yes @AMDEPBACKSLASH@
2204 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2205-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdummy_indicator_null_la_CFLAGS) $(CFLAGS) -c -o libdummy_indicator_null_la-dummy-indicator-null.lo `test -f 'dummy-indicator-null.c' || echo '$(srcdir)/'`dummy-indicator-null.c
2206+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdummy_indicator_null_la_CFLAGS) $(CFLAGS) -c -o libdummy_indicator_null_la-dummy-indicator-null.lo `test -f 'dummy-indicator-null.c' || echo '$(srcdir)/'`dummy-indicator-null.c
2207
2208 libdummy_indicator_signaler_la-dummy-indicator-signaler.lo: dummy-indicator-signaler.c
2209 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdummy_indicator_signaler_la_CFLAGS) $(CFLAGS) -MT libdummy_indicator_signaler_la-dummy-indicator-signaler.lo -MD -MP -MF $(DEPDIR)/libdummy_indicator_signaler_la-dummy-indicator-signaler.Tpo -c -o libdummy_indicator_signaler_la-dummy-indicator-signaler.lo `test -f 'dummy-indicator-signaler.c' || echo '$(srcdir)/'`dummy-indicator-signaler.c
2210 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdummy_indicator_signaler_la-dummy-indicator-signaler.Tpo $(DEPDIR)/libdummy_indicator_signaler_la-dummy-indicator-signaler.Plo
2211-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2212-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dummy-indicator-signaler.c' object='libdummy_indicator_signaler_la-dummy-indicator-signaler.lo' libtool=yes @AMDEPBACKSLASH@
2213+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dummy-indicator-signaler.c' object='libdummy_indicator_signaler_la-dummy-indicator-signaler.lo' libtool=yes @AMDEPBACKSLASH@
2214 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2215-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdummy_indicator_signaler_la_CFLAGS) $(CFLAGS) -c -o libdummy_indicator_signaler_la-dummy-indicator-signaler.lo `test -f 'dummy-indicator-signaler.c' || echo '$(srcdir)/'`dummy-indicator-signaler.c
2216+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdummy_indicator_signaler_la_CFLAGS) $(CFLAGS) -c -o libdummy_indicator_signaler_la-dummy-indicator-signaler.lo `test -f 'dummy-indicator-signaler.c' || echo '$(srcdir)/'`dummy-indicator-signaler.c
2217
2218 libdummy_indicator_simple_la-dummy-indicator-simple.lo: dummy-indicator-simple.c
2219 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdummy_indicator_simple_la_CFLAGS) $(CFLAGS) -MT libdummy_indicator_simple_la-dummy-indicator-simple.lo -MD -MP -MF $(DEPDIR)/libdummy_indicator_simple_la-dummy-indicator-simple.Tpo -c -o libdummy_indicator_simple_la-dummy-indicator-simple.lo `test -f 'dummy-indicator-simple.c' || echo '$(srcdir)/'`dummy-indicator-simple.c
2220 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdummy_indicator_simple_la-dummy-indicator-simple.Tpo $(DEPDIR)/libdummy_indicator_simple_la-dummy-indicator-simple.Plo
2221-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2222-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dummy-indicator-simple.c' object='libdummy_indicator_simple_la-dummy-indicator-simple.lo' libtool=yes @AMDEPBACKSLASH@
2223+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dummy-indicator-simple.c' object='libdummy_indicator_simple_la-dummy-indicator-simple.lo' libtool=yes @AMDEPBACKSLASH@
2224 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2225-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdummy_indicator_simple_la_CFLAGS) $(CFLAGS) -c -o libdummy_indicator_simple_la-dummy-indicator-simple.lo `test -f 'dummy-indicator-simple.c' || echo '$(srcdir)/'`dummy-indicator-simple.c
2226+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdummy_indicator_simple_la_CFLAGS) $(CFLAGS) -c -o libdummy_indicator_simple_la-dummy-indicator-simple.lo `test -f 'dummy-indicator-simple.c' || echo '$(srcdir)/'`dummy-indicator-simple.c
2227
2228 libdummy_indicator_visible_la-dummy-indicator-visible.lo: dummy-indicator-visible.c
2229 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdummy_indicator_visible_la_CFLAGS) $(CFLAGS) -MT libdummy_indicator_visible_la-dummy-indicator-visible.lo -MD -MP -MF $(DEPDIR)/libdummy_indicator_visible_la-dummy-indicator-visible.Tpo -c -o libdummy_indicator_visible_la-dummy-indicator-visible.lo `test -f 'dummy-indicator-visible.c' || echo '$(srcdir)/'`dummy-indicator-visible.c
2230 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdummy_indicator_visible_la-dummy-indicator-visible.Tpo $(DEPDIR)/libdummy_indicator_visible_la-dummy-indicator-visible.Plo
2231-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2232-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dummy-indicator-visible.c' object='libdummy_indicator_visible_la-dummy-indicator-visible.lo' libtool=yes @AMDEPBACKSLASH@
2233+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dummy-indicator-visible.c' object='libdummy_indicator_visible_la-dummy-indicator-visible.lo' libtool=yes @AMDEPBACKSLASH@
2234 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2235-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdummy_indicator_visible_la_CFLAGS) $(CFLAGS) -c -o libdummy_indicator_visible_la-dummy-indicator-visible.lo `test -f 'dummy-indicator-visible.c' || echo '$(srcdir)/'`dummy-indicator-visible.c
2236+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdummy_indicator_visible_la_CFLAGS) $(CFLAGS) -c -o libdummy_indicator_visible_la-dummy-indicator-visible.lo `test -f 'dummy-indicator-visible.c' || echo '$(srcdir)/'`dummy-indicator-visible.c
2237
2238 service_manager_connect-service-manager-connect.o: service-manager-connect.c
2239 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_manager_connect_CFLAGS) $(CFLAGS) -MT service_manager_connect-service-manager-connect.o -MD -MP -MF $(DEPDIR)/service_manager_connect-service-manager-connect.Tpo -c -o service_manager_connect-service-manager-connect.o `test -f 'service-manager-connect.c' || echo '$(srcdir)/'`service-manager-connect.c
2240 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/service_manager_connect-service-manager-connect.Tpo $(DEPDIR)/service_manager_connect-service-manager-connect.Po
2241-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2242-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='service-manager-connect.c' object='service_manager_connect-service-manager-connect.o' libtool=no @AMDEPBACKSLASH@
2243+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='service-manager-connect.c' object='service_manager_connect-service-manager-connect.o' libtool=no @AMDEPBACKSLASH@
2244 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2245-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_manager_connect_CFLAGS) $(CFLAGS) -c -o service_manager_connect-service-manager-connect.o `test -f 'service-manager-connect.c' || echo '$(srcdir)/'`service-manager-connect.c
2246+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_manager_connect_CFLAGS) $(CFLAGS) -c -o service_manager_connect-service-manager-connect.o `test -f 'service-manager-connect.c' || echo '$(srcdir)/'`service-manager-connect.c
2247
2248 service_manager_connect-service-manager-connect.obj: service-manager-connect.c
2249 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_manager_connect_CFLAGS) $(CFLAGS) -MT service_manager_connect-service-manager-connect.obj -MD -MP -MF $(DEPDIR)/service_manager_connect-service-manager-connect.Tpo -c -o service_manager_connect-service-manager-connect.obj `if test -f 'service-manager-connect.c'; then $(CYGPATH_W) 'service-manager-connect.c'; else $(CYGPATH_W) '$(srcdir)/service-manager-connect.c'; fi`
2250 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/service_manager_connect-service-manager-connect.Tpo $(DEPDIR)/service_manager_connect-service-manager-connect.Po
2251-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2252-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='service-manager-connect.c' object='service_manager_connect-service-manager-connect.obj' libtool=no @AMDEPBACKSLASH@
2253+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='service-manager-connect.c' object='service_manager_connect-service-manager-connect.obj' libtool=no @AMDEPBACKSLASH@
2254 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2255-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_manager_connect_CFLAGS) $(CFLAGS) -c -o service_manager_connect-service-manager-connect.obj `if test -f 'service-manager-connect.c'; then $(CYGPATH_W) 'service-manager-connect.c'; else $(CYGPATH_W) '$(srcdir)/service-manager-connect.c'; fi`
2256+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_manager_connect_CFLAGS) $(CFLAGS) -c -o service_manager_connect-service-manager-connect.obj `if test -f 'service-manager-connect.c'; then $(CYGPATH_W) 'service-manager-connect.c'; else $(CYGPATH_W) '$(srcdir)/service-manager-connect.c'; fi`
2257
2258 service_manager_connect_service-service-manager-connect-service.o: service-manager-connect-service.c
2259 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_manager_connect_service_CFLAGS) $(CFLAGS) -MT service_manager_connect_service-service-manager-connect-service.o -MD -MP -MF $(DEPDIR)/service_manager_connect_service-service-manager-connect-service.Tpo -c -o service_manager_connect_service-service-manager-connect-service.o `test -f 'service-manager-connect-service.c' || echo '$(srcdir)/'`service-manager-connect-service.c
2260 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/service_manager_connect_service-service-manager-connect-service.Tpo $(DEPDIR)/service_manager_connect_service-service-manager-connect-service.Po
2261-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2262-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='service-manager-connect-service.c' object='service_manager_connect_service-service-manager-connect-service.o' libtool=no @AMDEPBACKSLASH@
2263+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='service-manager-connect-service.c' object='service_manager_connect_service-service-manager-connect-service.o' libtool=no @AMDEPBACKSLASH@
2264 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2265-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_manager_connect_service_CFLAGS) $(CFLAGS) -c -o service_manager_connect_service-service-manager-connect-service.o `test -f 'service-manager-connect-service.c' || echo '$(srcdir)/'`service-manager-connect-service.c
2266+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_manager_connect_service_CFLAGS) $(CFLAGS) -c -o service_manager_connect_service-service-manager-connect-service.o `test -f 'service-manager-connect-service.c' || echo '$(srcdir)/'`service-manager-connect-service.c
2267
2268 service_manager_connect_service-service-manager-connect-service.obj: service-manager-connect-service.c
2269 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_manager_connect_service_CFLAGS) $(CFLAGS) -MT service_manager_connect_service-service-manager-connect-service.obj -MD -MP -MF $(DEPDIR)/service_manager_connect_service-service-manager-connect-service.Tpo -c -o service_manager_connect_service-service-manager-connect-service.obj `if test -f 'service-manager-connect-service.c'; then $(CYGPATH_W) 'service-manager-connect-service.c'; else $(CYGPATH_W) '$(srcdir)/service-manager-connect-service.c'; fi`
2270 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/service_manager_connect_service-service-manager-connect-service.Tpo $(DEPDIR)/service_manager_connect_service-service-manager-connect-service.Po
2271-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2272-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='service-manager-connect-service.c' object='service_manager_connect_service-service-manager-connect-service.obj' libtool=no @AMDEPBACKSLASH@
2273+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='service-manager-connect-service.c' object='service_manager_connect_service-service-manager-connect-service.obj' libtool=no @AMDEPBACKSLASH@
2274 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2275-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_manager_connect_service_CFLAGS) $(CFLAGS) -c -o service_manager_connect_service-service-manager-connect-service.obj `if test -f 'service-manager-connect-service.c'; then $(CYGPATH_W) 'service-manager-connect-service.c'; else $(CYGPATH_W) '$(srcdir)/service-manager-connect-service.c'; fi`
2276+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_manager_connect_service_CFLAGS) $(CFLAGS) -c -o service_manager_connect_service-service-manager-connect-service.obj `if test -f 'service-manager-connect-service.c'; then $(CYGPATH_W) 'service-manager-connect-service.c'; else $(CYGPATH_W) '$(srcdir)/service-manager-connect-service.c'; fi`
2277
2278 service_manager_no_connect-service-manager-no-connect.o: service-manager-no-connect.c
2279 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_manager_no_connect_CFLAGS) $(CFLAGS) -MT service_manager_no_connect-service-manager-no-connect.o -MD -MP -MF $(DEPDIR)/service_manager_no_connect-service-manager-no-connect.Tpo -c -o service_manager_no_connect-service-manager-no-connect.o `test -f 'service-manager-no-connect.c' || echo '$(srcdir)/'`service-manager-no-connect.c
2280 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/service_manager_no_connect-service-manager-no-connect.Tpo $(DEPDIR)/service_manager_no_connect-service-manager-no-connect.Po
2281-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2282-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='service-manager-no-connect.c' object='service_manager_no_connect-service-manager-no-connect.o' libtool=no @AMDEPBACKSLASH@
2283+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='service-manager-no-connect.c' object='service_manager_no_connect-service-manager-no-connect.o' libtool=no @AMDEPBACKSLASH@
2284 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2285-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_manager_no_connect_CFLAGS) $(CFLAGS) -c -o service_manager_no_connect-service-manager-no-connect.o `test -f 'service-manager-no-connect.c' || echo '$(srcdir)/'`service-manager-no-connect.c
2286+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_manager_no_connect_CFLAGS) $(CFLAGS) -c -o service_manager_no_connect-service-manager-no-connect.o `test -f 'service-manager-no-connect.c' || echo '$(srcdir)/'`service-manager-no-connect.c
2287
2288 service_manager_no_connect-service-manager-no-connect.obj: service-manager-no-connect.c
2289 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_manager_no_connect_CFLAGS) $(CFLAGS) -MT service_manager_no_connect-service-manager-no-connect.obj -MD -MP -MF $(DEPDIR)/service_manager_no_connect-service-manager-no-connect.Tpo -c -o service_manager_no_connect-service-manager-no-connect.obj `if test -f 'service-manager-no-connect.c'; then $(CYGPATH_W) 'service-manager-no-connect.c'; else $(CYGPATH_W) '$(srcdir)/service-manager-no-connect.c'; fi`
2290 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/service_manager_no_connect-service-manager-no-connect.Tpo $(DEPDIR)/service_manager_no_connect-service-manager-no-connect.Po
2291-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2292-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='service-manager-no-connect.c' object='service_manager_no_connect-service-manager-no-connect.obj' libtool=no @AMDEPBACKSLASH@
2293+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='service-manager-no-connect.c' object='service_manager_no_connect-service-manager-no-connect.obj' libtool=no @AMDEPBACKSLASH@
2294 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2295-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_manager_no_connect_CFLAGS) $(CFLAGS) -c -o service_manager_no_connect-service-manager-no-connect.obj `if test -f 'service-manager-no-connect.c'; then $(CYGPATH_W) 'service-manager-no-connect.c'; else $(CYGPATH_W) '$(srcdir)/service-manager-no-connect.c'; fi`
2296+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_manager_no_connect_CFLAGS) $(CFLAGS) -c -o service_manager_no_connect-service-manager-no-connect.obj `if test -f 'service-manager-no-connect.c'; then $(CYGPATH_W) 'service-manager-no-connect.c'; else $(CYGPATH_W) '$(srcdir)/service-manager-no-connect.c'; fi`
2297
2298 service_manager_nostart_connect-service-manager-nostart-connect.o: service-manager-nostart-connect.c
2299 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_manager_nostart_connect_CFLAGS) $(CFLAGS) -MT service_manager_nostart_connect-service-manager-nostart-connect.o -MD -MP -MF $(DEPDIR)/service_manager_nostart_connect-service-manager-nostart-connect.Tpo -c -o service_manager_nostart_connect-service-manager-nostart-connect.o `test -f 'service-manager-nostart-connect.c' || echo '$(srcdir)/'`service-manager-nostart-connect.c
2300 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/service_manager_nostart_connect-service-manager-nostart-connect.Tpo $(DEPDIR)/service_manager_nostart_connect-service-manager-nostart-connect.Po
2301-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2302-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='service-manager-nostart-connect.c' object='service_manager_nostart_connect-service-manager-nostart-connect.o' libtool=no @AMDEPBACKSLASH@
2303+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='service-manager-nostart-connect.c' object='service_manager_nostart_connect-service-manager-nostart-connect.o' libtool=no @AMDEPBACKSLASH@
2304 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2305-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_manager_nostart_connect_CFLAGS) $(CFLAGS) -c -o service_manager_nostart_connect-service-manager-nostart-connect.o `test -f 'service-manager-nostart-connect.c' || echo '$(srcdir)/'`service-manager-nostart-connect.c
2306+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_manager_nostart_connect_CFLAGS) $(CFLAGS) -c -o service_manager_nostart_connect-service-manager-nostart-connect.o `test -f 'service-manager-nostart-connect.c' || echo '$(srcdir)/'`service-manager-nostart-connect.c
2307
2308 service_manager_nostart_connect-service-manager-nostart-connect.obj: service-manager-nostart-connect.c
2309 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_manager_nostart_connect_CFLAGS) $(CFLAGS) -MT service_manager_nostart_connect-service-manager-nostart-connect.obj -MD -MP -MF $(DEPDIR)/service_manager_nostart_connect-service-manager-nostart-connect.Tpo -c -o service_manager_nostart_connect-service-manager-nostart-connect.obj `if test -f 'service-manager-nostart-connect.c'; then $(CYGPATH_W) 'service-manager-nostart-connect.c'; else $(CYGPATH_W) '$(srcdir)/service-manager-nostart-connect.c'; fi`
2310 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/service_manager_nostart_connect-service-manager-nostart-connect.Tpo $(DEPDIR)/service_manager_nostart_connect-service-manager-nostart-connect.Po
2311-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2312-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='service-manager-nostart-connect.c' object='service_manager_nostart_connect-service-manager-nostart-connect.obj' libtool=no @AMDEPBACKSLASH@
2313+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='service-manager-nostart-connect.c' object='service_manager_nostart_connect-service-manager-nostart-connect.obj' libtool=no @AMDEPBACKSLASH@
2314 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2315-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_manager_nostart_connect_CFLAGS) $(CFLAGS) -c -o service_manager_nostart_connect-service-manager-nostart-connect.obj `if test -f 'service-manager-nostart-connect.c'; then $(CYGPATH_W) 'service-manager-nostart-connect.c'; else $(CYGPATH_W) '$(srcdir)/service-manager-nostart-connect.c'; fi`
2316+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_manager_nostart_connect_CFLAGS) $(CFLAGS) -c -o service_manager_nostart_connect-service-manager-nostart-connect.obj `if test -f 'service-manager-nostart-connect.c'; then $(CYGPATH_W) 'service-manager-nostart-connect.c'; else $(CYGPATH_W) '$(srcdir)/service-manager-nostart-connect.c'; fi`
2317
2318 service_shutdown_timeout-service-shutdown-timeout.o: service-shutdown-timeout.c
2319 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_shutdown_timeout_CFLAGS) $(CFLAGS) -MT service_shutdown_timeout-service-shutdown-timeout.o -MD -MP -MF $(DEPDIR)/service_shutdown_timeout-service-shutdown-timeout.Tpo -c -o service_shutdown_timeout-service-shutdown-timeout.o `test -f 'service-shutdown-timeout.c' || echo '$(srcdir)/'`service-shutdown-timeout.c
2320 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/service_shutdown_timeout-service-shutdown-timeout.Tpo $(DEPDIR)/service_shutdown_timeout-service-shutdown-timeout.Po
2321-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2322-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='service-shutdown-timeout.c' object='service_shutdown_timeout-service-shutdown-timeout.o' libtool=no @AMDEPBACKSLASH@
2323+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='service-shutdown-timeout.c' object='service_shutdown_timeout-service-shutdown-timeout.o' libtool=no @AMDEPBACKSLASH@
2324 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2325-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_shutdown_timeout_CFLAGS) $(CFLAGS) -c -o service_shutdown_timeout-service-shutdown-timeout.o `test -f 'service-shutdown-timeout.c' || echo '$(srcdir)/'`service-shutdown-timeout.c
2326+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_shutdown_timeout_CFLAGS) $(CFLAGS) -c -o service_shutdown_timeout-service-shutdown-timeout.o `test -f 'service-shutdown-timeout.c' || echo '$(srcdir)/'`service-shutdown-timeout.c
2327
2328 service_shutdown_timeout-service-shutdown-timeout.obj: service-shutdown-timeout.c
2329 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_shutdown_timeout_CFLAGS) $(CFLAGS) -MT service_shutdown_timeout-service-shutdown-timeout.obj -MD -MP -MF $(DEPDIR)/service_shutdown_timeout-service-shutdown-timeout.Tpo -c -o service_shutdown_timeout-service-shutdown-timeout.obj `if test -f 'service-shutdown-timeout.c'; then $(CYGPATH_W) 'service-shutdown-timeout.c'; else $(CYGPATH_W) '$(srcdir)/service-shutdown-timeout.c'; fi`
2330 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/service_shutdown_timeout-service-shutdown-timeout.Tpo $(DEPDIR)/service_shutdown_timeout-service-shutdown-timeout.Po
2331-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2332-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='service-shutdown-timeout.c' object='service_shutdown_timeout-service-shutdown-timeout.obj' libtool=no @AMDEPBACKSLASH@
2333+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='service-shutdown-timeout.c' object='service_shutdown_timeout-service-shutdown-timeout.obj' libtool=no @AMDEPBACKSLASH@
2334 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2335-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_shutdown_timeout_CFLAGS) $(CFLAGS) -c -o service_shutdown_timeout-service-shutdown-timeout.obj `if test -f 'service-shutdown-timeout.c'; then $(CYGPATH_W) 'service-shutdown-timeout.c'; else $(CYGPATH_W) '$(srcdir)/service-shutdown-timeout.c'; fi`
2336+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_shutdown_timeout_CFLAGS) $(CFLAGS) -c -o service_shutdown_timeout-service-shutdown-timeout.obj `if test -f 'service-shutdown-timeout.c'; then $(CYGPATH_W) 'service-shutdown-timeout.c'; else $(CYGPATH_W) '$(srcdir)/service-shutdown-timeout.c'; fi`
2337
2338 service_version_bad_service-service-version-bad-service.o: service-version-bad-service.c
2339 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_bad_service_CFLAGS) $(CFLAGS) -MT service_version_bad_service-service-version-bad-service.o -MD -MP -MF $(DEPDIR)/service_version_bad_service-service-version-bad-service.Tpo -c -o service_version_bad_service-service-version-bad-service.o `test -f 'service-version-bad-service.c' || echo '$(srcdir)/'`service-version-bad-service.c
2340 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/service_version_bad_service-service-version-bad-service.Tpo $(DEPDIR)/service_version_bad_service-service-version-bad-service.Po
2341-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2342-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='service-version-bad-service.c' object='service_version_bad_service-service-version-bad-service.o' libtool=no @AMDEPBACKSLASH@
2343+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='service-version-bad-service.c' object='service_version_bad_service-service-version-bad-service.o' libtool=no @AMDEPBACKSLASH@
2344 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2345-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_bad_service_CFLAGS) $(CFLAGS) -c -o service_version_bad_service-service-version-bad-service.o `test -f 'service-version-bad-service.c' || echo '$(srcdir)/'`service-version-bad-service.c
2346+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_bad_service_CFLAGS) $(CFLAGS) -c -o service_version_bad_service-service-version-bad-service.o `test -f 'service-version-bad-service.c' || echo '$(srcdir)/'`service-version-bad-service.c
2347
2348 service_version_bad_service-service-version-bad-service.obj: service-version-bad-service.c
2349 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_bad_service_CFLAGS) $(CFLAGS) -MT service_version_bad_service-service-version-bad-service.obj -MD -MP -MF $(DEPDIR)/service_version_bad_service-service-version-bad-service.Tpo -c -o service_version_bad_service-service-version-bad-service.obj `if test -f 'service-version-bad-service.c'; then $(CYGPATH_W) 'service-version-bad-service.c'; else $(CYGPATH_W) '$(srcdir)/service-version-bad-service.c'; fi`
2350 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/service_version_bad_service-service-version-bad-service.Tpo $(DEPDIR)/service_version_bad_service-service-version-bad-service.Po
2351-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2352-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='service-version-bad-service.c' object='service_version_bad_service-service-version-bad-service.obj' libtool=no @AMDEPBACKSLASH@
2353+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='service-version-bad-service.c' object='service_version_bad_service-service-version-bad-service.obj' libtool=no @AMDEPBACKSLASH@
2354 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2355-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_bad_service_CFLAGS) $(CFLAGS) -c -o service_version_bad_service-service-version-bad-service.obj `if test -f 'service-version-bad-service.c'; then $(CYGPATH_W) 'service-version-bad-service.c'; else $(CYGPATH_W) '$(srcdir)/service-version-bad-service.c'; fi`
2356+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_bad_service_CFLAGS) $(CFLAGS) -c -o service_version_bad_service-service-version-bad-service.obj `if test -f 'service-version-bad-service.c'; then $(CYGPATH_W) 'service-version-bad-service.c'; else $(CYGPATH_W) '$(srcdir)/service-version-bad-service.c'; fi`
2357
2358 service_version_good_service-service-version-good-service.o: service-version-good-service.c
2359 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_good_service_CFLAGS) $(CFLAGS) -MT service_version_good_service-service-version-good-service.o -MD -MP -MF $(DEPDIR)/service_version_good_service-service-version-good-service.Tpo -c -o service_version_good_service-service-version-good-service.o `test -f 'service-version-good-service.c' || echo '$(srcdir)/'`service-version-good-service.c
2360 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/service_version_good_service-service-version-good-service.Tpo $(DEPDIR)/service_version_good_service-service-version-good-service.Po
2361-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2362-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='service-version-good-service.c' object='service_version_good_service-service-version-good-service.o' libtool=no @AMDEPBACKSLASH@
2363+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='service-version-good-service.c' object='service_version_good_service-service-version-good-service.o' libtool=no @AMDEPBACKSLASH@
2364 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2365-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_good_service_CFLAGS) $(CFLAGS) -c -o service_version_good_service-service-version-good-service.o `test -f 'service-version-good-service.c' || echo '$(srcdir)/'`service-version-good-service.c
2366+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_good_service_CFLAGS) $(CFLAGS) -c -o service_version_good_service-service-version-good-service.o `test -f 'service-version-good-service.c' || echo '$(srcdir)/'`service-version-good-service.c
2367
2368 service_version_good_service-service-version-good-service.obj: service-version-good-service.c
2369 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_good_service_CFLAGS) $(CFLAGS) -MT service_version_good_service-service-version-good-service.obj -MD -MP -MF $(DEPDIR)/service_version_good_service-service-version-good-service.Tpo -c -o service_version_good_service-service-version-good-service.obj `if test -f 'service-version-good-service.c'; then $(CYGPATH_W) 'service-version-good-service.c'; else $(CYGPATH_W) '$(srcdir)/service-version-good-service.c'; fi`
2370 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/service_version_good_service-service-version-good-service.Tpo $(DEPDIR)/service_version_good_service-service-version-good-service.Po
2371-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2372-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='service-version-good-service.c' object='service_version_good_service-service-version-good-service.obj' libtool=no @AMDEPBACKSLASH@
2373+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='service-version-good-service.c' object='service_version_good_service-service-version-good-service.obj' libtool=no @AMDEPBACKSLASH@
2374 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2375-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_good_service_CFLAGS) $(CFLAGS) -c -o service_version_good_service-service-version-good-service.obj `if test -f 'service-version-good-service.c'; then $(CYGPATH_W) 'service-version-good-service.c'; else $(CYGPATH_W) '$(srcdir)/service-version-good-service.c'; fi`
2376+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_good_service_CFLAGS) $(CFLAGS) -c -o service_version_good_service-service-version-good-service.obj `if test -f 'service-version-good-service.c'; then $(CYGPATH_W) 'service-version-good-service.c'; else $(CYGPATH_W) '$(srcdir)/service-version-good-service.c'; fi`
2377
2378 service_version_manager-service-version-multiwatch-manager.o: service-version-multiwatch-manager.c
2379 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_manager_CFLAGS) $(CFLAGS) -MT service_version_manager-service-version-multiwatch-manager.o -MD -MP -MF $(DEPDIR)/service_version_manager-service-version-multiwatch-manager.Tpo -c -o service_version_manager-service-version-multiwatch-manager.o `test -f 'service-version-multiwatch-manager.c' || echo '$(srcdir)/'`service-version-multiwatch-manager.c
2380 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/service_version_manager-service-version-multiwatch-manager.Tpo $(DEPDIR)/service_version_manager-service-version-multiwatch-manager.Po
2381-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2382-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='service-version-multiwatch-manager.c' object='service_version_manager-service-version-multiwatch-manager.o' libtool=no @AMDEPBACKSLASH@
2383+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='service-version-multiwatch-manager.c' object='service_version_manager-service-version-multiwatch-manager.o' libtool=no @AMDEPBACKSLASH@
2384 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2385-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_manager_CFLAGS) $(CFLAGS) -c -o service_version_manager-service-version-multiwatch-manager.o `test -f 'service-version-multiwatch-manager.c' || echo '$(srcdir)/'`service-version-multiwatch-manager.c
2386+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_manager_CFLAGS) $(CFLAGS) -c -o service_version_manager-service-version-multiwatch-manager.o `test -f 'service-version-multiwatch-manager.c' || echo '$(srcdir)/'`service-version-multiwatch-manager.c
2387
2388 service_version_manager-service-version-multiwatch-manager.obj: service-version-multiwatch-manager.c
2389 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_manager_CFLAGS) $(CFLAGS) -MT service_version_manager-service-version-multiwatch-manager.obj -MD -MP -MF $(DEPDIR)/service_version_manager-service-version-multiwatch-manager.Tpo -c -o service_version_manager-service-version-multiwatch-manager.obj `if test -f 'service-version-multiwatch-manager.c'; then $(CYGPATH_W) 'service-version-multiwatch-manager.c'; else $(CYGPATH_W) '$(srcdir)/service-version-multiwatch-manager.c'; fi`
2390 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/service_version_manager-service-version-multiwatch-manager.Tpo $(DEPDIR)/service_version_manager-service-version-multiwatch-manager.Po
2391-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2392-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='service-version-multiwatch-manager.c' object='service_version_manager-service-version-multiwatch-manager.obj' libtool=no @AMDEPBACKSLASH@
2393+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='service-version-multiwatch-manager.c' object='service_version_manager-service-version-multiwatch-manager.obj' libtool=no @AMDEPBACKSLASH@
2394 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2395-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_manager_CFLAGS) $(CFLAGS) -c -o service_version_manager-service-version-multiwatch-manager.obj `if test -f 'service-version-multiwatch-manager.c'; then $(CYGPATH_W) 'service-version-multiwatch-manager.c'; else $(CYGPATH_W) '$(srcdir)/service-version-multiwatch-manager.c'; fi`
2396+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_manager_CFLAGS) $(CFLAGS) -c -o service_version_manager-service-version-multiwatch-manager.obj `if test -f 'service-version-multiwatch-manager.c'; then $(CYGPATH_W) 'service-version-multiwatch-manager.c'; else $(CYGPATH_W) '$(srcdir)/service-version-multiwatch-manager.c'; fi`
2397
2398 service_version_multiwatch_manager-service-version-multiwatch-manager.o: service-version-multiwatch-manager.c
2399 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_multiwatch_manager_CFLAGS) $(CFLAGS) -MT service_version_multiwatch_manager-service-version-multiwatch-manager.o -MD -MP -MF $(DEPDIR)/service_version_multiwatch_manager-service-version-multiwatch-manager.Tpo -c -o service_version_multiwatch_manager-service-version-multiwatch-manager.o `test -f 'service-version-multiwatch-manager.c' || echo '$(srcdir)/'`service-version-multiwatch-manager.c
2400 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/service_version_multiwatch_manager-service-version-multiwatch-manager.Tpo $(DEPDIR)/service_version_multiwatch_manager-service-version-multiwatch-manager.Po
2401-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2402-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='service-version-multiwatch-manager.c' object='service_version_multiwatch_manager-service-version-multiwatch-manager.o' libtool=no @AMDEPBACKSLASH@
2403+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='service-version-multiwatch-manager.c' object='service_version_multiwatch_manager-service-version-multiwatch-manager.o' libtool=no @AMDEPBACKSLASH@
2404 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2405-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_multiwatch_manager_CFLAGS) $(CFLAGS) -c -o service_version_multiwatch_manager-service-version-multiwatch-manager.o `test -f 'service-version-multiwatch-manager.c' || echo '$(srcdir)/'`service-version-multiwatch-manager.c
2406+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_multiwatch_manager_CFLAGS) $(CFLAGS) -c -o service_version_multiwatch_manager-service-version-multiwatch-manager.o `test -f 'service-version-multiwatch-manager.c' || echo '$(srcdir)/'`service-version-multiwatch-manager.c
2407
2408 service_version_multiwatch_manager-service-version-multiwatch-manager.obj: service-version-multiwatch-manager.c
2409 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_multiwatch_manager_CFLAGS) $(CFLAGS) -MT service_version_multiwatch_manager-service-version-multiwatch-manager.obj -MD -MP -MF $(DEPDIR)/service_version_multiwatch_manager-service-version-multiwatch-manager.Tpo -c -o service_version_multiwatch_manager-service-version-multiwatch-manager.obj `if test -f 'service-version-multiwatch-manager.c'; then $(CYGPATH_W) 'service-version-multiwatch-manager.c'; else $(CYGPATH_W) '$(srcdir)/service-version-multiwatch-manager.c'; fi`
2410 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/service_version_multiwatch_manager-service-version-multiwatch-manager.Tpo $(DEPDIR)/service_version_multiwatch_manager-service-version-multiwatch-manager.Po
2411-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2412-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='service-version-multiwatch-manager.c' object='service_version_multiwatch_manager-service-version-multiwatch-manager.obj' libtool=no @AMDEPBACKSLASH@
2413+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='service-version-multiwatch-manager.c' object='service_version_multiwatch_manager-service-version-multiwatch-manager.obj' libtool=no @AMDEPBACKSLASH@
2414 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2415-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_multiwatch_manager_CFLAGS) $(CFLAGS) -c -o service_version_multiwatch_manager-service-version-multiwatch-manager.obj `if test -f 'service-version-multiwatch-manager.c'; then $(CYGPATH_W) 'service-version-multiwatch-manager.c'; else $(CYGPATH_W) '$(srcdir)/service-version-multiwatch-manager.c'; fi`
2416+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_multiwatch_manager_CFLAGS) $(CFLAGS) -c -o service_version_multiwatch_manager-service-version-multiwatch-manager.obj `if test -f 'service-version-multiwatch-manager.c'; then $(CYGPATH_W) 'service-version-multiwatch-manager.c'; else $(CYGPATH_W) '$(srcdir)/service-version-multiwatch-manager.c'; fi`
2417
2418 service_version_multiwatch_manager_impolite-service-version-multiwatch-manager-impolite.o: service-version-multiwatch-manager-impolite.c
2419 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_multiwatch_manager_impolite_CFLAGS) $(CFLAGS) -MT service_version_multiwatch_manager_impolite-service-version-multiwatch-manager-impolite.o -MD -MP -MF $(DEPDIR)/service_version_multiwatch_manager_impolite-service-version-multiwatch-manager-impolite.Tpo -c -o service_version_multiwatch_manager_impolite-service-version-multiwatch-manager-impolite.o `test -f 'service-version-multiwatch-manager-impolite.c' || echo '$(srcdir)/'`service-version-multiwatch-manager-impolite.c
2420 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/service_version_multiwatch_manager_impolite-service-version-multiwatch-manager-impolite.Tpo $(DEPDIR)/service_version_multiwatch_manager_impolite-service-version-multiwatch-manager-impolite.Po
2421-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2422-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='service-version-multiwatch-manager-impolite.c' object='service_version_multiwatch_manager_impolite-service-version-multiwatch-manager-impolite.o' libtool=no @AMDEPBACKSLASH@
2423+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='service-version-multiwatch-manager-impolite.c' object='service_version_multiwatch_manager_impolite-service-version-multiwatch-manager-impolite.o' libtool=no @AMDEPBACKSLASH@
2424 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2425-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_multiwatch_manager_impolite_CFLAGS) $(CFLAGS) -c -o service_version_multiwatch_manager_impolite-service-version-multiwatch-manager-impolite.o `test -f 'service-version-multiwatch-manager-impolite.c' || echo '$(srcdir)/'`service-version-multiwatch-manager-impolite.c
2426+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_multiwatch_manager_impolite_CFLAGS) $(CFLAGS) -c -o service_version_multiwatch_manager_impolite-service-version-multiwatch-manager-impolite.o `test -f 'service-version-multiwatch-manager-impolite.c' || echo '$(srcdir)/'`service-version-multiwatch-manager-impolite.c
2427
2428 service_version_multiwatch_manager_impolite-service-version-multiwatch-manager-impolite.obj: service-version-multiwatch-manager-impolite.c
2429 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_multiwatch_manager_impolite_CFLAGS) $(CFLAGS) -MT service_version_multiwatch_manager_impolite-service-version-multiwatch-manager-impolite.obj -MD -MP -MF $(DEPDIR)/service_version_multiwatch_manager_impolite-service-version-multiwatch-manager-impolite.Tpo -c -o service_version_multiwatch_manager_impolite-service-version-multiwatch-manager-impolite.obj `if test -f 'service-version-multiwatch-manager-impolite.c'; then $(CYGPATH_W) 'service-version-multiwatch-manager-impolite.c'; else $(CYGPATH_W) '$(srcdir)/service-version-multiwatch-manager-impolite.c'; fi`
2430 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/service_version_multiwatch_manager_impolite-service-version-multiwatch-manager-impolite.Tpo $(DEPDIR)/service_version_multiwatch_manager_impolite-service-version-multiwatch-manager-impolite.Po
2431-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2432-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='service-version-multiwatch-manager-impolite.c' object='service_version_multiwatch_manager_impolite-service-version-multiwatch-manager-impolite.obj' libtool=no @AMDEPBACKSLASH@
2433+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='service-version-multiwatch-manager-impolite.c' object='service_version_multiwatch_manager_impolite-service-version-multiwatch-manager-impolite.obj' libtool=no @AMDEPBACKSLASH@
2434 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2435-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_multiwatch_manager_impolite_CFLAGS) $(CFLAGS) -c -o service_version_multiwatch_manager_impolite-service-version-multiwatch-manager-impolite.obj `if test -f 'service-version-multiwatch-manager-impolite.c'; then $(CYGPATH_W) 'service-version-multiwatch-manager-impolite.c'; else $(CYGPATH_W) '$(srcdir)/service-version-multiwatch-manager-impolite.c'; fi`
2436+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_multiwatch_manager_impolite_CFLAGS) $(CFLAGS) -c -o service_version_multiwatch_manager_impolite-service-version-multiwatch-manager-impolite.obj `if test -f 'service-version-multiwatch-manager-impolite.c'; then $(CYGPATH_W) 'service-version-multiwatch-manager-impolite.c'; else $(CYGPATH_W) '$(srcdir)/service-version-multiwatch-manager-impolite.c'; fi`
2437
2438 service_version_multiwatch_service-service-version-multiwatch-service.o: service-version-multiwatch-service.c
2439 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_multiwatch_service_CFLAGS) $(CFLAGS) -MT service_version_multiwatch_service-service-version-multiwatch-service.o -MD -MP -MF $(DEPDIR)/service_version_multiwatch_service-service-version-multiwatch-service.Tpo -c -o service_version_multiwatch_service-service-version-multiwatch-service.o `test -f 'service-version-multiwatch-service.c' || echo '$(srcdir)/'`service-version-multiwatch-service.c
2440 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/service_version_multiwatch_service-service-version-multiwatch-service.Tpo $(DEPDIR)/service_version_multiwatch_service-service-version-multiwatch-service.Po
2441-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2442-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='service-version-multiwatch-service.c' object='service_version_multiwatch_service-service-version-multiwatch-service.o' libtool=no @AMDEPBACKSLASH@
2443+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='service-version-multiwatch-service.c' object='service_version_multiwatch_service-service-version-multiwatch-service.o' libtool=no @AMDEPBACKSLASH@
2444 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2445-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_multiwatch_service_CFLAGS) $(CFLAGS) -c -o service_version_multiwatch_service-service-version-multiwatch-service.o `test -f 'service-version-multiwatch-service.c' || echo '$(srcdir)/'`service-version-multiwatch-service.c
2446+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_multiwatch_service_CFLAGS) $(CFLAGS) -c -o service_version_multiwatch_service-service-version-multiwatch-service.o `test -f 'service-version-multiwatch-service.c' || echo '$(srcdir)/'`service-version-multiwatch-service.c
2447
2448 service_version_multiwatch_service-service-version-multiwatch-service.obj: service-version-multiwatch-service.c
2449 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_multiwatch_service_CFLAGS) $(CFLAGS) -MT service_version_multiwatch_service-service-version-multiwatch-service.obj -MD -MP -MF $(DEPDIR)/service_version_multiwatch_service-service-version-multiwatch-service.Tpo -c -o service_version_multiwatch_service-service-version-multiwatch-service.obj `if test -f 'service-version-multiwatch-service.c'; then $(CYGPATH_W) 'service-version-multiwatch-service.c'; else $(CYGPATH_W) '$(srcdir)/service-version-multiwatch-service.c'; fi`
2450 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/service_version_multiwatch_service-service-version-multiwatch-service.Tpo $(DEPDIR)/service_version_multiwatch_service-service-version-multiwatch-service.Po
2451-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2452-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='service-version-multiwatch-service.c' object='service_version_multiwatch_service-service-version-multiwatch-service.obj' libtool=no @AMDEPBACKSLASH@
2453+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='service-version-multiwatch-service.c' object='service_version_multiwatch_service-service-version-multiwatch-service.obj' libtool=no @AMDEPBACKSLASH@
2454 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2455-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_multiwatch_service_CFLAGS) $(CFLAGS) -c -o service_version_multiwatch_service-service-version-multiwatch-service.obj `if test -f 'service-version-multiwatch-service.c'; then $(CYGPATH_W) 'service-version-multiwatch-service.c'; else $(CYGPATH_W) '$(srcdir)/service-version-multiwatch-service.c'; fi`
2456+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(service_version_multiwatch_service_CFLAGS) $(CFLAGS) -c -o service_version_multiwatch_service-service-version-multiwatch-service.obj `if test -f 'service-version-multiwatch-service.c'; then $(CYGPATH_W) 'service-version-multiwatch-service.c'; else $(CYGPATH_W) '$(srcdir)/service-version-multiwatch-service.c'; fi`
2457
2458 test_desktop_shortcuts-test-desktop-shortcuts.o: test-desktop-shortcuts.c
2459 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_desktop_shortcuts_CFLAGS) $(CFLAGS) -MT test_desktop_shortcuts-test-desktop-shortcuts.o -MD -MP -MF $(DEPDIR)/test_desktop_shortcuts-test-desktop-shortcuts.Tpo -c -o test_desktop_shortcuts-test-desktop-shortcuts.o `test -f 'test-desktop-shortcuts.c' || echo '$(srcdir)/'`test-desktop-shortcuts.c
2460 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_desktop_shortcuts-test-desktop-shortcuts.Tpo $(DEPDIR)/test_desktop_shortcuts-test-desktop-shortcuts.Po
2461-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2462-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-desktop-shortcuts.c' object='test_desktop_shortcuts-test-desktop-shortcuts.o' libtool=no @AMDEPBACKSLASH@
2463+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test-desktop-shortcuts.c' object='test_desktop_shortcuts-test-desktop-shortcuts.o' libtool=no @AMDEPBACKSLASH@
2464 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2465-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_desktop_shortcuts_CFLAGS) $(CFLAGS) -c -o test_desktop_shortcuts-test-desktop-shortcuts.o `test -f 'test-desktop-shortcuts.c' || echo '$(srcdir)/'`test-desktop-shortcuts.c
2466+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_desktop_shortcuts_CFLAGS) $(CFLAGS) -c -o test_desktop_shortcuts-test-desktop-shortcuts.o `test -f 'test-desktop-shortcuts.c' || echo '$(srcdir)/'`test-desktop-shortcuts.c
2467
2468 test_desktop_shortcuts-test-desktop-shortcuts.obj: test-desktop-shortcuts.c
2469 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_desktop_shortcuts_CFLAGS) $(CFLAGS) -MT test_desktop_shortcuts-test-desktop-shortcuts.obj -MD -MP -MF $(DEPDIR)/test_desktop_shortcuts-test-desktop-shortcuts.Tpo -c -o test_desktop_shortcuts-test-desktop-shortcuts.obj `if test -f 'test-desktop-shortcuts.c'; then $(CYGPATH_W) 'test-desktop-shortcuts.c'; else $(CYGPATH_W) '$(srcdir)/test-desktop-shortcuts.c'; fi`
2470 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_desktop_shortcuts-test-desktop-shortcuts.Tpo $(DEPDIR)/test_desktop_shortcuts-test-desktop-shortcuts.Po
2471-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2472-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-desktop-shortcuts.c' object='test_desktop_shortcuts-test-desktop-shortcuts.obj' libtool=no @AMDEPBACKSLASH@
2473+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test-desktop-shortcuts.c' object='test_desktop_shortcuts-test-desktop-shortcuts.obj' libtool=no @AMDEPBACKSLASH@
2474 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2475-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_desktop_shortcuts_CFLAGS) $(CFLAGS) -c -o test_desktop_shortcuts-test-desktop-shortcuts.obj `if test -f 'test-desktop-shortcuts.c'; then $(CYGPATH_W) 'test-desktop-shortcuts.c'; else $(CYGPATH_W) '$(srcdir)/test-desktop-shortcuts.c'; fi`
2476+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_desktop_shortcuts_CFLAGS) $(CFLAGS) -c -o test_desktop_shortcuts-test-desktop-shortcuts.obj `if test -f 'test-desktop-shortcuts.c'; then $(CYGPATH_W) 'test-desktop-shortcuts.c'; else $(CYGPATH_W) '$(srcdir)/test-desktop-shortcuts.c'; fi`
2477
2478 test_loader-test-loader.o: test-loader.c
2479 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_loader_CFLAGS) $(CFLAGS) -MT test_loader-test-loader.o -MD -MP -MF $(DEPDIR)/test_loader-test-loader.Tpo -c -o test_loader-test-loader.o `test -f 'test-loader.c' || echo '$(srcdir)/'`test-loader.c
2480 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_loader-test-loader.Tpo $(DEPDIR)/test_loader-test-loader.Po
2481-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2482-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-loader.c' object='test_loader-test-loader.o' libtool=no @AMDEPBACKSLASH@
2483+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test-loader.c' object='test_loader-test-loader.o' libtool=no @AMDEPBACKSLASH@
2484 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2485-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_loader_CFLAGS) $(CFLAGS) -c -o test_loader-test-loader.o `test -f 'test-loader.c' || echo '$(srcdir)/'`test-loader.c
2486+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_loader_CFLAGS) $(CFLAGS) -c -o test_loader-test-loader.o `test -f 'test-loader.c' || echo '$(srcdir)/'`test-loader.c
2487
2488 test_loader-test-loader.obj: test-loader.c
2489 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_loader_CFLAGS) $(CFLAGS) -MT test_loader-test-loader.obj -MD -MP -MF $(DEPDIR)/test_loader-test-loader.Tpo -c -o test_loader-test-loader.obj `if test -f 'test-loader.c'; then $(CYGPATH_W) 'test-loader.c'; else $(CYGPATH_W) '$(srcdir)/test-loader.c'; fi`
2490 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_loader-test-loader.Tpo $(DEPDIR)/test_loader-test-loader.Po
2491-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2492-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-loader.c' object='test_loader-test-loader.obj' libtool=no @AMDEPBACKSLASH@
2493+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test-loader.c' object='test_loader-test-loader.obj' libtool=no @AMDEPBACKSLASH@
2494 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2495-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_loader_CFLAGS) $(CFLAGS) -c -o test_loader-test-loader.obj `if test -f 'test-loader.c'; then $(CYGPATH_W) 'test-loader.c'; else $(CYGPATH_W) '$(srcdir)/test-loader.c'; fi`
2496+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_loader_CFLAGS) $(CFLAGS) -c -o test_loader-test-loader.obj `if test -f 'test-loader.c'; then $(CYGPATH_W) 'test-loader.c'; else $(CYGPATH_W) '$(srcdir)/test-loader.c'; fi`
2497
2498 mostlyclean-libtool:
2499 -rm -f *.lo
2500@@ -1356,14 +1327,15 @@
2501 fi; \
2502 dashes=`echo "$$dashes" | sed s/./=/g`; \
2503 if test "$$failed" -eq 0; then \
2504- echo "$$grn$$dashes"; \
2505+ col="$$grn"; \
2506 else \
2507- echo "$$red$$dashes"; \
2508+ col="$$red"; \
2509 fi; \
2510- echo "$$banner"; \
2511- test -z "$$skipped" || echo "$$skipped"; \
2512- test -z "$$report" || echo "$$report"; \
2513- echo "$$dashes$$std"; \
2514+ echo "$${col}$$dashes$${std}"; \
2515+ echo "$${col}$$banner$${std}"; \
2516+ test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
2517+ test -z "$$report" || echo "$${col}$$report$${std}"; \
2518+ echo "$${col}$$dashes$${std}"; \
2519 test "$$failed" -eq 0; \
2520 else :; fi
2521
2522@@ -1416,10 +1388,15 @@
2523
2524 installcheck: installcheck-am
2525 install-strip:
2526- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
2527- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
2528- `test -z '$(STRIP)' || \
2529- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
2530+ if test -z '$(STRIP)'; then \
2531+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
2532+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
2533+ install; \
2534+ else \
2535+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
2536+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
2537+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
2538+ fi
2539 mostlyclean-generic:
2540
2541 clean-generic:
2542
2543=== modified file 'tests/dummy-indicator-signaler.c'
2544--- tests/dummy-indicator-signaler.c 2012-01-23 11:39:50 +0000
2545+++ tests/dummy-indicator-signaler.c 2012-02-14 20:34:19 +0000
2546@@ -42,6 +42,7 @@
2547
2548 struct _DummyIndicatorSignaler {
2549 IndicatorObject parent;
2550+ IndicatorObjectEntry *entries;
2551 };
2552
2553 GType dummy_indicator_signaler_get_type (void);
2554@@ -110,9 +111,19 @@
2555 {
2556 DummyIndicatorSignaler * self = DUMMY_INDICATOR_SIGNALER(data);
2557
2558- g_signal_emit(G_OBJECT(self), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED_ID, 0, GUINT_TO_POINTER(5), TRUE);
2559- g_signal_emit(G_OBJECT(self), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED_ID, 0, GUINT_TO_POINTER(5), TRUE);
2560- g_signal_emit(G_OBJECT(self), INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED_ID, 0, GUINT_TO_POINTER(5), 0, 1, TRUE);
2561+ IndicatorObjectEntry *added_entry, *removed_entry, *moved_entry;
2562+
2563+ added_entry = &self->entries[0];
2564+ moved_entry = &self->entries[1];
2565+ removed_entry = &self->entries[2];
2566+
2567+ added_entry->name_hint = "added";
2568+ moved_entry->name_hint = "moved";
2569+ removed_entry->name_hint = "removed";
2570+
2571+ g_signal_emit(G_OBJECT(self), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED_ID, 0, added_entry);
2572+ g_signal_emit(G_OBJECT(self), INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED_ID, 0, moved_entry, 0, 1);
2573+ g_signal_emit(G_OBJECT(self), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED_ID, 0, removed_entry);
2574
2575 return FALSE; /* Don't queue again */
2576 }
2577@@ -120,6 +131,7 @@
2578 static void
2579 dummy_indicator_signaler_init (DummyIndicatorSignaler *self)
2580 {
2581+ self->entries = g_new0(IndicatorObjectEntry, 3);
2582 g_idle_add(idle_signal, self);
2583 return;
2584 }
2585@@ -135,7 +147,8 @@
2586 static void
2587 dummy_indicator_signaler_finalize (GObject *object)
2588 {
2589-
2590+ DummyIndicatorSignaler * self = DUMMY_INDICATOR_SIGNALER(object);
2591+ g_free (self->entries);
2592 G_OBJECT_CLASS (dummy_indicator_signaler_parent_class)->finalize (object);
2593 return;
2594 }
2595
2596=== modified file 'tests/test-loader.c'
2597--- tests/test-loader.c 2012-01-23 23:00:29 +0000
2598+++ tests/test-loader.c 2012-02-14 20:34:19 +0000
2599@@ -100,8 +100,9 @@
2600 void
2601 entry_change_cb (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer data)
2602 {
2603- gpointer * valuestore = (gpointer *)data;
2604- *valuestore = entry;
2605+ IndicatorObjectEntry *other_entry = data;
2606+ other_entry->name_hint = entry->name_hint;
2607+ other_entry->parent_object = entry->parent_object;
2608 return;
2609 }
2610
2611@@ -117,11 +118,16 @@
2612 IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-signaler.so");
2613 g_assert(object != NULL);
2614
2615- gpointer added_value = NULL, removed_value = NULL, moved_value = NULL;
2616-
2617- g_signal_connect(G_OBJECT(object), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED, G_CALLBACK(entry_change_cb), &added_value);
2618- g_signal_connect(G_OBJECT(object), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, G_CALLBACK(entry_change_cb), &removed_value);
2619- g_signal_connect(G_OBJECT(object), INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED, G_CALLBACK(entry_move_cb), &moved_value);
2620+ IndicatorObjectEntry *added_entry, *moved_entry, *removed_entry;
2621+ IndicatorObjectEntry entries[3];
2622+
2623+ added_entry = &entries[0];
2624+ moved_entry = &entries[1];
2625+ removed_entry = &entries[2];
2626+
2627+ g_signal_connect_after(G_OBJECT(object), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED, G_CALLBACK(entry_change_cb), added_entry);
2628+ g_signal_connect_after(G_OBJECT(object), INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED, G_CALLBACK(entry_move_cb), moved_entry);
2629+ g_signal_connect_after(G_OBJECT(object), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, G_CALLBACK(entry_change_cb), removed_entry);
2630
2631 GList * list = indicator_object_get_entries(object);
2632 g_assert(list != NULL);
2633@@ -131,9 +137,12 @@
2634 g_main_context_iteration(NULL, TRUE);
2635 }
2636
2637- g_assert(GPOINTER_TO_UINT(added_value) == 5);
2638- g_assert(GPOINTER_TO_UINT(removed_value) == 5);
2639- g_assert(GPOINTER_TO_UINT(moved_value) == 5);
2640+ g_assert(g_strcmp0(added_entry->name_hint, "added") == 0);
2641+ g_assert(g_strcmp0(removed_entry->name_hint, "removed") == 0);
2642+ g_assert(g_strcmp0(moved_entry->name_hint, "moved") == 0);
2643+
2644+ g_assert(added_entry->parent_object == object);
2645+ g_assert(removed_entry->parent_object == NULL);
2646
2647 g_object_unref(object);
2648
2649@@ -190,6 +199,8 @@
2650 g_assert(entry != NULL);
2651 g_list_free(list);
2652 g_assert(GTK_IS_LABEL(entry->label));
2653+ g_assert(entry->parent_object == object);
2654+ g_assert(INDICATOR_IS_OBJECT(entry->parent_object));
2655 GtkWidget * label = GTK_WIDGET(entry->label);
2656 g_assert(g_object_get_qdata(G_OBJECT(label), is_hidden_quark) == NULL);
2657
2658@@ -239,9 +250,11 @@
2659 g_assert(entries != NULL);
2660 g_assert(g_list_length(entries) == 1);
2661
2662- g_assert(indicator_object_get_location(object, (IndicatorObjectEntry *)entries->data) == 0);
2663+ IndicatorObjectEntry *entry = entries->data;
2664+
2665+ g_assert(indicator_object_get_location(object, entry) == 0);
2666 g_assert(indicator_object_get_location(object, NULL) == 0);
2667- g_assert(((IndicatorObjectEntry *)entries->data)->parent_object != NULL);
2668+ g_assert(entry->parent_object == object);
2669
2670 g_object_unref(object);
2671
2672
2673=== modified file 'tools/Makefile.in'
2674--- tools/Makefile.in 2012-01-24 16:10:15 +0000
2675+++ tools/Makefile.in 2012-02-14 20:34:19 +0000
2676@@ -1,9 +1,9 @@
2677-# Makefile.in generated by automake 1.11.1 from Makefile.am.
2678+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2679 # @configure_input@
2680
2681 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
2682-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
2683-# Inc.
2684+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
2685+# Foundation, Inc.
2686 # This Makefile.in is free software; the Free Software Foundation
2687 # gives unlimited permission to copy and/or distribute it,
2688 # with or without modifications, as long as this notice is preserved.
2689@@ -58,8 +58,8 @@
2690 am__DEPENDENCIES_1 =
2691 indicator_loader_DEPENDENCIES = $(am__DEPENDENCIES_1) \
2692 $(am__DEPENDENCIES_1)
2693-AM_V_lt = $(am__v_lt_$(V))
2694-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
2695+AM_V_lt = $(am__v_lt_@AM_V@)
2696+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
2697 am__v_lt_0 = --silent
2698 indicator_loader_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
2699 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
2700@@ -84,21 +84,21 @@
2701 $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
2702 $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
2703 $(AM_CFLAGS) $(CFLAGS)
2704-AM_V_CC = $(am__v_CC_$(V))
2705-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
2706+AM_V_CC = $(am__v_CC_@AM_V@)
2707+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
2708 am__v_CC_0 = @echo " CC " $@;
2709-AM_V_at = $(am__v_at_$(V))
2710-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
2711+AM_V_at = $(am__v_at_@AM_V@)
2712+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
2713 am__v_at_0 = @
2714 CCLD = $(CC)
2715 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
2716 $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
2717 $(AM_LDFLAGS) $(LDFLAGS) -o $@
2718-AM_V_CCLD = $(am__v_CCLD_$(V))
2719-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
2720+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
2721+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
2722 am__v_CCLD_0 = @echo " CCLD " $@;
2723-AM_V_GEN = $(am__v_GEN_$(V))
2724-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
2725+AM_V_GEN = $(am__v_GEN_@AM_V@)
2726+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
2727 am__v_GEN_0 = @echo " GEN " $@;
2728 SOURCES = $(indicator_loader_SOURCES) $(indicator_loader3_SOURCES)
2729 DIST_SOURCES = $(indicator_loader_SOURCES) \
2730@@ -124,6 +124,12 @@
2731 am__base_list = \
2732 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
2733 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
2734+am__uninstall_files_from_dir = { \
2735+ test -z "$$files" \
2736+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
2737+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
2738+ $(am__cd) "$$dir" && rm -f $$files; }; \
2739+ }
2740 DATA = $(xsession_DATA)
2741 ETAGS = etags
2742 CTAGS = ctags
2743@@ -371,10 +377,10 @@
2744 list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
2745 echo " rm -f" $$list; \
2746 rm -f $$list
2747-indicator-loader$(EXEEXT): $(indicator_loader_OBJECTS) $(indicator_loader_DEPENDENCIES)
2748+indicator-loader$(EXEEXT): $(indicator_loader_OBJECTS) $(indicator_loader_DEPENDENCIES) $(EXTRA_indicator_loader_DEPENDENCIES)
2749 @rm -f indicator-loader$(EXEEXT)
2750 $(AM_V_CCLD)$(indicator_loader_LINK) $(indicator_loader_OBJECTS) $(indicator_loader_LDADD) $(LIBS)
2751-indicator-loader3$(EXEEXT): $(indicator_loader3_OBJECTS) $(indicator_loader3_DEPENDENCIES)
2752+indicator-loader3$(EXEEXT): $(indicator_loader3_OBJECTS) $(indicator_loader3_DEPENDENCIES) $(EXTRA_indicator_loader3_DEPENDENCIES)
2753 @rm -f indicator-loader3$(EXEEXT)
2754 $(AM_V_CCLD)$(indicator_loader3_LINK) $(indicator_loader3_OBJECTS) $(indicator_loader3_LDADD) $(LIBS)
2755
2756@@ -390,58 +396,51 @@
2757 .c.o:
2758 @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
2759 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
2760-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2761-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
2762+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
2763 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2764-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
2765+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
2766
2767 .c.obj:
2768 @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
2769 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
2770-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2771-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
2772+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
2773 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2774-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
2775+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
2776
2777 .c.lo:
2778 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
2779 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
2780-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2781-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
2782+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
2783 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2784-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
2785+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
2786
2787 indicator_loader-indicator-loader.o: indicator-loader.c
2788 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_loader_CFLAGS) $(CFLAGS) -MT indicator_loader-indicator-loader.o -MD -MP -MF $(DEPDIR)/indicator_loader-indicator-loader.Tpo -c -o indicator_loader-indicator-loader.o `test -f 'indicator-loader.c' || echo '$(srcdir)/'`indicator-loader.c
2789 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_loader-indicator-loader.Tpo $(DEPDIR)/indicator_loader-indicator-loader.Po
2790-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2791-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-loader.c' object='indicator_loader-indicator-loader.o' libtool=no @AMDEPBACKSLASH@
2792+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-loader.c' object='indicator_loader-indicator-loader.o' libtool=no @AMDEPBACKSLASH@
2793 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2794-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_loader_CFLAGS) $(CFLAGS) -c -o indicator_loader-indicator-loader.o `test -f 'indicator-loader.c' || echo '$(srcdir)/'`indicator-loader.c
2795+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_loader_CFLAGS) $(CFLAGS) -c -o indicator_loader-indicator-loader.o `test -f 'indicator-loader.c' || echo '$(srcdir)/'`indicator-loader.c
2796
2797 indicator_loader-indicator-loader.obj: indicator-loader.c
2798 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_loader_CFLAGS) $(CFLAGS) -MT indicator_loader-indicator-loader.obj -MD -MP -MF $(DEPDIR)/indicator_loader-indicator-loader.Tpo -c -o indicator_loader-indicator-loader.obj `if test -f 'indicator-loader.c'; then $(CYGPATH_W) 'indicator-loader.c'; else $(CYGPATH_W) '$(srcdir)/indicator-loader.c'; fi`
2799 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_loader-indicator-loader.Tpo $(DEPDIR)/indicator_loader-indicator-loader.Po
2800-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2801-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-loader.c' object='indicator_loader-indicator-loader.obj' libtool=no @AMDEPBACKSLASH@
2802+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-loader.c' object='indicator_loader-indicator-loader.obj' libtool=no @AMDEPBACKSLASH@
2803 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2804-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_loader_CFLAGS) $(CFLAGS) -c -o indicator_loader-indicator-loader.obj `if test -f 'indicator-loader.c'; then $(CYGPATH_W) 'indicator-loader.c'; else $(CYGPATH_W) '$(srcdir)/indicator-loader.c'; fi`
2805+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_loader_CFLAGS) $(CFLAGS) -c -o indicator_loader-indicator-loader.obj `if test -f 'indicator-loader.c'; then $(CYGPATH_W) 'indicator-loader.c'; else $(CYGPATH_W) '$(srcdir)/indicator-loader.c'; fi`
2806
2807 indicator_loader3-indicator-loader.o: indicator-loader.c
2808 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_loader3_CFLAGS) $(CFLAGS) -MT indicator_loader3-indicator-loader.o -MD -MP -MF $(DEPDIR)/indicator_loader3-indicator-loader.Tpo -c -o indicator_loader3-indicator-loader.o `test -f 'indicator-loader.c' || echo '$(srcdir)/'`indicator-loader.c
2809 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_loader3-indicator-loader.Tpo $(DEPDIR)/indicator_loader3-indicator-loader.Po
2810-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2811-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-loader.c' object='indicator_loader3-indicator-loader.o' libtool=no @AMDEPBACKSLASH@
2812+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-loader.c' object='indicator_loader3-indicator-loader.o' libtool=no @AMDEPBACKSLASH@
2813 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2814-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_loader3_CFLAGS) $(CFLAGS) -c -o indicator_loader3-indicator-loader.o `test -f 'indicator-loader.c' || echo '$(srcdir)/'`indicator-loader.c
2815+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_loader3_CFLAGS) $(CFLAGS) -c -o indicator_loader3-indicator-loader.o `test -f 'indicator-loader.c' || echo '$(srcdir)/'`indicator-loader.c
2816
2817 indicator_loader3-indicator-loader.obj: indicator-loader.c
2818 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_loader3_CFLAGS) $(CFLAGS) -MT indicator_loader3-indicator-loader.obj -MD -MP -MF $(DEPDIR)/indicator_loader3-indicator-loader.Tpo -c -o indicator_loader3-indicator-loader.obj `if test -f 'indicator-loader.c'; then $(CYGPATH_W) 'indicator-loader.c'; else $(CYGPATH_W) '$(srcdir)/indicator-loader.c'; fi`
2819 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_loader3-indicator-loader.Tpo $(DEPDIR)/indicator_loader3-indicator-loader.Po
2820-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
2821-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-loader.c' object='indicator_loader3-indicator-loader.obj' libtool=no @AMDEPBACKSLASH@
2822+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-loader.c' object='indicator_loader3-indicator-loader.obj' libtool=no @AMDEPBACKSLASH@
2823 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2824-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_loader3_CFLAGS) $(CFLAGS) -c -o indicator_loader3-indicator-loader.obj `if test -f 'indicator-loader.c'; then $(CYGPATH_W) 'indicator-loader.c'; else $(CYGPATH_W) '$(srcdir)/indicator-loader.c'; fi`
2825+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_loader3_CFLAGS) $(CFLAGS) -c -o indicator_loader3-indicator-loader.obj `if test -f 'indicator-loader.c'; then $(CYGPATH_W) 'indicator-loader.c'; else $(CYGPATH_W) '$(srcdir)/indicator-loader.c'; fi`
2826
2827 mostlyclean-libtool:
2828 -rm -f *.lo
2829@@ -465,9 +464,7 @@
2830 @$(NORMAL_UNINSTALL)
2831 @list='$(xsession_DATA)'; test -n "$(xsessiondir)" || list=; \
2832 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
2833- test -n "$$files" || exit 0; \
2834- echo " ( cd '$(DESTDIR)$(xsessiondir)' && rm -f" $$files ")"; \
2835- cd "$(DESTDIR)$(xsessiondir)" && rm -f $$files
2836+ dir='$(DESTDIR)$(xsessiondir)'; $(am__uninstall_files_from_dir)
2837
2838 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
2839 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
2840@@ -568,10 +565,15 @@
2841
2842 installcheck: installcheck-am
2843 install-strip:
2844- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
2845- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
2846- `test -z '$(STRIP)' || \
2847- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
2848+ if test -z '$(STRIP)'; then \
2849+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
2850+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
2851+ install; \
2852+ else \
2853+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
2854+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
2855+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
2856+ fi
2857 mostlyclean-generic:
2858
2859 clean-generic:

Subscribers

People subscribed via source and target branches