Imported Upstream version 0.6.31upstream/0.6.31upstream

1 files changed, 49 insertions, 49 deletions

diff --git a/avahi-glib/Makefile.in b/avahi-glib/Makefile.in
index 63865a3..2be7372 100644
--- a/avahi-glib/Makefile.in
+++ b/avahi-glib/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -99,6 +99,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(libdir)" \
 	"$(DESTDIR)$(avahiglibincludedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -112,8 +118,8 @@ am__libavahi_glib_la_SOURCES_DIST = glib-watch.c glib-watch.h \
 @HAVE_GLIB_TRUE@	libavahi_glib_la-glib-watch.lo \
 @HAVE_GLIB_TRUE@	libavahi_glib_la-glib-malloc.lo
 libavahi_glib_la_OBJECTS = $(am_libavahi_glib_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 libavahi_glib_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -144,21 +150,21 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libavahi_glib_la_SOURCES) $(glib_watch_test_SOURCES)
 DIST_SOURCES = $(am__libavahi_glib_la_SOURCES_DIST) \
@@ -501,7 +507,7 @@ clean-libLTLIBRARIES:
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libavahi-glib.la: $(libavahi_glib_la_OBJECTS) $(libavahi_glib_la_DEPENDENCIES) 
+libavahi-glib.la: $(libavahi_glib_la_OBJECTS) $(libavahi_glib_la_DEPENDENCIES) $(EXTRA_libavahi_glib_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libavahi_glib_la_LINK) $(am_libavahi_glib_la_rpath) $(libavahi_glib_la_OBJECTS) $(libavahi_glib_la_LIBADD) $(LIBS)
 
 clean-noinstPROGRAMS:
@@ -512,7 +518,7 @@ clean-noinstPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-glib-watch-test$(EXEEXT): $(glib_watch_test_OBJECTS) $(glib_watch_test_DEPENDENCIES) 
+glib-watch-test$(EXEEXT): $(glib_watch_test_OBJECTS) $(glib_watch_test_DEPENDENCIES) $(EXTRA_glib_watch_test_DEPENDENCIES) 
 	@rm -f glib-watch-test$(EXEEXT)
 	$(AM_V_CCLD)$(glib_watch_test_LINK) $(glib_watch_test_OBJECTS) $(glib_watch_test_LDADD) $(LIBS)
 
@@ -530,74 +536,65 @@ distclean-compile:
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 libavahi_glib_la-glib-watch.lo: glib-watch.c
 @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) $(libavahi_glib_la_CFLAGS) $(CFLAGS) -MT libavahi_glib_la-glib-watch.lo -MD -MP -MF $(DEPDIR)/libavahi_glib_la-glib-watch.Tpo -c -o libavahi_glib_la-glib-watch.lo `test -f 'glib-watch.c' || echo '$(srcdir)/'`glib-watch.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libavahi_glib_la-glib-watch.Tpo $(DEPDIR)/libavahi_glib_la-glib-watch.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='glib-watch.c' object='libavahi_glib_la-glib-watch.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='glib-watch.c' object='libavahi_glib_la-glib-watch.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libavahi_glib_la_CFLAGS) $(CFLAGS) -c -o libavahi_glib_la-glib-watch.lo `test -f 'glib-watch.c' || echo '$(srcdir)/'`glib-watch.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libavahi_glib_la_CFLAGS) $(CFLAGS) -c -o libavahi_glib_la-glib-watch.lo `test -f 'glib-watch.c' || echo '$(srcdir)/'`glib-watch.c
 
 libavahi_glib_la-glib-malloc.lo: glib-malloc.c
 @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) $(libavahi_glib_la_CFLAGS) $(CFLAGS) -MT libavahi_glib_la-glib-malloc.lo -MD -MP -MF $(DEPDIR)/libavahi_glib_la-glib-malloc.Tpo -c -o libavahi_glib_la-glib-malloc.lo `test -f 'glib-malloc.c' || echo '$(srcdir)/'`glib-malloc.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libavahi_glib_la-glib-malloc.Tpo $(DEPDIR)/libavahi_glib_la-glib-malloc.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='glib-malloc.c' object='libavahi_glib_la-glib-malloc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='glib-malloc.c' object='libavahi_glib_la-glib-malloc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libavahi_glib_la_CFLAGS) $(CFLAGS) -c -o libavahi_glib_la-glib-malloc.lo `test -f 'glib-malloc.c' || echo '$(srcdir)/'`glib-malloc.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libavahi_glib_la_CFLAGS) $(CFLAGS) -c -o libavahi_glib_la-glib-malloc.lo `test -f 'glib-malloc.c' || echo '$(srcdir)/'`glib-malloc.c
 
 glib_watch_test-glib-watch.o: glib-watch.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glib_watch_test_CFLAGS) $(CFLAGS) -MT glib_watch_test-glib-watch.o -MD -MP -MF $(DEPDIR)/glib_watch_test-glib-watch.Tpo -c -o glib_watch_test-glib-watch.o `test -f 'glib-watch.c' || echo '$(srcdir)/'`glib-watch.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/glib_watch_test-glib-watch.Tpo $(DEPDIR)/glib_watch_test-glib-watch.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='glib-watch.c' object='glib_watch_test-glib-watch.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='glib-watch.c' object='glib_watch_test-glib-watch.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glib_watch_test_CFLAGS) $(CFLAGS) -c -o glib_watch_test-glib-watch.o `test -f 'glib-watch.c' || echo '$(srcdir)/'`glib-watch.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glib_watch_test_CFLAGS) $(CFLAGS) -c -o glib_watch_test-glib-watch.o `test -f 'glib-watch.c' || echo '$(srcdir)/'`glib-watch.c
 
 glib_watch_test-glib-watch.obj: glib-watch.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glib_watch_test_CFLAGS) $(CFLAGS) -MT glib_watch_test-glib-watch.obj -MD -MP -MF $(DEPDIR)/glib_watch_test-glib-watch.Tpo -c -o glib_watch_test-glib-watch.obj `if test -f 'glib-watch.c'; then $(CYGPATH_W) 'glib-watch.c'; else $(CYGPATH_W) '$(srcdir)/glib-watch.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/glib_watch_test-glib-watch.Tpo $(DEPDIR)/glib_watch_test-glib-watch.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='glib-watch.c' object='glib_watch_test-glib-watch.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='glib-watch.c' object='glib_watch_test-glib-watch.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glib_watch_test_CFLAGS) $(CFLAGS) -c -o glib_watch_test-glib-watch.obj `if test -f 'glib-watch.c'; then $(CYGPATH_W) 'glib-watch.c'; else $(CYGPATH_W) '$(srcdir)/glib-watch.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glib_watch_test_CFLAGS) $(CFLAGS) -c -o glib_watch_test-glib-watch.obj `if test -f 'glib-watch.c'; then $(CYGPATH_W) 'glib-watch.c'; else $(CYGPATH_W) '$(srcdir)/glib-watch.c'; fi`
 
 glib_watch_test-glib-watch-test.o: glib-watch-test.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glib_watch_test_CFLAGS) $(CFLAGS) -MT glib_watch_test-glib-watch-test.o -MD -MP -MF $(DEPDIR)/glib_watch_test-glib-watch-test.Tpo -c -o glib_watch_test-glib-watch-test.o `test -f 'glib-watch-test.c' || echo '$(srcdir)/'`glib-watch-test.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/glib_watch_test-glib-watch-test.Tpo $(DEPDIR)/glib_watch_test-glib-watch-test.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='glib-watch-test.c' object='glib_watch_test-glib-watch-test.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='glib-watch-test.c' object='glib_watch_test-glib-watch-test.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glib_watch_test_CFLAGS) $(CFLAGS) -c -o glib_watch_test-glib-watch-test.o `test -f 'glib-watch-test.c' || echo '$(srcdir)/'`glib-watch-test.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glib_watch_test_CFLAGS) $(CFLAGS) -c -o glib_watch_test-glib-watch-test.o `test -f 'glib-watch-test.c' || echo '$(srcdir)/'`glib-watch-test.c
 
 glib_watch_test-glib-watch-test.obj: glib-watch-test.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glib_watch_test_CFLAGS) $(CFLAGS) -MT glib_watch_test-glib-watch-test.obj -MD -MP -MF $(DEPDIR)/glib_watch_test-glib-watch-test.Tpo -c -o glib_watch_test-glib-watch-test.obj `if test -f 'glib-watch-test.c'; then $(CYGPATH_W) 'glib-watch-test.c'; else $(CYGPATH_W) '$(srcdir)/glib-watch-test.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/glib_watch_test-glib-watch-test.Tpo $(DEPDIR)/glib_watch_test-glib-watch-test.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='glib-watch-test.c' object='glib_watch_test-glib-watch-test.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='glib-watch-test.c' object='glib_watch_test-glib-watch-test.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glib_watch_test_CFLAGS) $(CFLAGS) -c -o glib_watch_test-glib-watch-test.obj `if test -f 'glib-watch-test.c'; then $(CYGPATH_W) 'glib-watch-test.c'; else $(CYGPATH_W) '$(srcdir)/glib-watch-test.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glib_watch_test_CFLAGS) $(CFLAGS) -c -o glib_watch_test-glib-watch-test.obj `if test -f 'glib-watch-test.c'; then $(CYGPATH_W) 'glib-watch-test.c'; else $(CYGPATH_W) '$(srcdir)/glib-watch-test.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -621,9 +618,7 @@ uninstall-avahiglibincludeHEADERS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(avahiglibinclude_HEADERS)'; test -n "$(avahiglibincludedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(avahiglibincludedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(avahiglibincludedir)" && rm -f $$files
+	dir='$(DESTDIR)$(avahiglibincludedir)'; $(am__uninstall_files_from_dir)
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -724,10 +719,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic: