Revert "Uprev libmtp to 1.1.12"

patches/09_do_not_build_udev_and_examples.patch

-diff --git a/Makefile.am b/Makefile.am
-index 7b7e06b..ba8f69a 100644
---- a/Makefile.am
-+++ b/Makefile.am
+Index: Makefile.am
+===================================================================
+--- Makefile.am (revision 148712)
++++ Makefile.am (working copy)
 @@ -1,4 +1,4 @@
 -SUBDIRS=src examples util doc
 +SUBDIRS=src util doc
  ACLOCAL_AMFLAGS=-I m4
  
  pkgconfigdir=$(libdir)/pkgconfig
-@@ -8,24 +8,24 @@ EXTRA_DIST=libmtp.pc libmtp.sh COPYING README.windows.txt
+@@ -8,17 +8,17 @@
  
  # This stuff only makes sense on Linux so only
  # build and ship it on Linux.
 -if USE_LINUX
 -udevrulesdir=@UDEV@/rules.d
--hwdbdir=@UDEV@/hwdb.d
 -udevrules_DATA=@UDEV_RULES@
--hwdb_DATA=69-libmtp.hwdb
 -noinst_DATA=libmtp.usermap libmtp.fdi
 -
 -libmtp.usermap: util/mtp-hotplug
 -       util/mtp-hotplug > libmtp.usermap
--
 -@UDEV_RULES@: util/mtp-hotplug
 -       util/mtp-hotplug -u -p"@UDEV@" @UDEV_GROUP@ @UDEV_MODE@ > @UDEV_RULES@
--
 -libmtp.fdi: util/mtp-hotplug
 -       util/mtp-hotplug -H > libmtp.fdi
 -
--$(hwdb_DATA): util/mtp-hotplug
--       util/mtp-hotplug -w > $(hwdb_DATA)
--
--CLEANFILES = libmtp.usermap @UDEV_RULES@ libmtp.fdi libmtp.hwdb
+-CLEANFILES = libmtp.usermap @UDEV_RULES@ libmtp.fdi
 -endif
 +#if USE_LINUX
 +#udevrulesdir=@UDEV@/rules.d
-+#hwdbdir=@UDEV@/hwdb.d
 +#udevrules_DATA=@UDEV_RULES@
-+#hwdb_DATA=69-libmtp.hwdb
 +#noinst_DATA=libmtp.usermap libmtp.fdi
 +#
 +#libmtp.usermap: util/mtp-hotplug
 +#      util/mtp-hotplug > libmtp.usermap
-+#
 +#@UDEV_RULES@: util/mtp-hotplug
 +#      util/mtp-hotplug -u -p"@UDEV@" @UDEV_GROUP@ @UDEV_MODE@ > @UDEV_RULES@
-+#
 +#libmtp.fdi: util/mtp-hotplug
 +#      util/mtp-hotplug -H > libmtp.fdi
 +#
-+#$(hwdb_DATA): util/mtp-hotplug
-+#      util/mtp-hotplug -w > $(hwdb_DATA)
-+#
-+#CLEANFILES = libmtp.usermap @UDEV_RULES@ libmtp.fdi libmtp.hwdb
++#CLEANFILES = libmtp.usermap @UDEV_RULES@ libmtp.fdi
 +#endif
-diff --git a/Makefile.in b/Makefile.in
-index c85503a..4575cba 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -159,9 +159,8 @@ am__uninstall_files_from_dir = { \
+Index: Makefile.in
+===================================================================
+--- Makefile.in (revision 148712)
++++ Makefile.in (working copy)
+@@ -91,9 +91,8 @@
      || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
           $(am__cd) "$$dir" && rm -f $$files; }; \
    }
--am__installdirs = "$(DESTDIR)$(hwdbdir)" "$(DESTDIR)$(pkgconfigdir)" \
+-am__installdirs = "$(DESTDIR)$(pkgconfigdir)" \
 -       "$(DESTDIR)$(udevrulesdir)"
--DATA = $(hwdb_DATA) $(noinst_DATA) $(pkgconfig_DATA) $(udevrules_DATA)
+-DATA = $(noinst_DATA) $(pkgconfig_DATA) $(udevrules_DATA)
 +am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
 +DATA = $(pkgconfig_DATA)
  RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
    distclean-recursive maintainer-clean-recursive
- am__recursive_targets = \
-@@ -370,20 +369,11 @@ target_alias = @target_alias@
+ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+@@ -272,18 +271,11 @@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -SUBDIRS = src examples util doc
 +SUBDIRS = src util doc
  ACLOCAL_AMFLAGS = -I m4
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = libmtp.pc
  EXTRA_DIST = libmtp.pc libmtp.sh COPYING README.windows.txt
 -
 -# This stuff only makes sense on Linux so only
 -# build and ship it on Linux.
 -@USE_LINUX_TRUE@udevrulesdir = @UDEV@/rules.d
--@USE_LINUX_TRUE@hwdbdir = @UDEV@/hwdb.d
 -@USE_LINUX_TRUE@udevrules_DATA = @UDEV_RULES@
--@USE_LINUX_TRUE@hwdb_DATA = 69-libmtp.hwdb
 -@USE_LINUX_TRUE@noinst_DATA = libmtp.usermap libmtp.fdi
--@USE_LINUX_TRUE@CLEANFILES = libmtp.usermap @UDEV_RULES@ libmtp.fdi libmtp.hwdb
+-@USE_LINUX_TRUE@CLEANFILES = libmtp.usermap @UDEV_RULES@ libmtp.fdi
  all: config.h
         $(MAKE) $(AM_MAKEFLAGS) all-recursive
  
-@@ -493,27 +483,6 @@ uninstall-pkgconfigDATA:
+@@ -370,25 +362,7 @@
         @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
         files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
         dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
 -install-udevrulesDATA: $(udevrules_DATA)
 -       @$(NORMAL_INSTALL)
+-       test -z "$(udevrulesdir)" || $(MKDIR_P) "$(DESTDIR)$(udevrulesdir)"
 -       @list='$(udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \
--       if test -n "$$list"; then \
--         echo " $(MKDIR_P) '$(DESTDIR)$(udevrulesdir)'"; \
--         $(MKDIR_P) "$(DESTDIR)$(udevrulesdir)" || exit 1; \
--       fi; \
 -       for p in $$list; do \
 -         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 -         echo "$$d$$p"; \
 -       done | $(am__base_list) | \
 -       while read files; do \
 -         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(udevrulesdir)'"; \
 -         $(INSTALL_DATA) $$files "$(DESTDIR)$(udevrulesdir)" || exit $$?; \
 -       done
--
+ 
 -uninstall-udevrulesDATA:
 -       @$(NORMAL_UNINSTALL)
 -       @list='$(udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \
 -       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 -       dir='$(DESTDIR)$(udevrulesdir)'; $(am__uninstall_files_from_dir)
- 
+-
  # This directory's subdirectories are mostly independent; you can cd
- # into them and run 'make' without going through this Makefile.
-@@ -814,7 +783,7 @@ check: check-recursive
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -719,7 +693,7 @@
  all-am: Makefile $(DATA) config.h
  installdirs: installdirs-recursive
  installdirs-am:
--       for dir in "$(DESTDIR)$(hwdbdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(udevrulesdir)"; do \
+-       for dir in "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(udevrulesdir)"; do \
 +       for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
           test -z "$$dir" || $(MKDIR_P) "$$dir"; \
         done
  install: install-recursive
-@@ -839,7 +808,6 @@ install-strip:
+@@ -744,7 +718,6 @@
  mostlyclean-generic:
  
  clean-generic:
 -       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
  
  distclean-generic:
         -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-@@ -870,8 +838,7 @@ info: info-recursive
+@@ -775,7 +748,7 @@
  
  info-am:
  
--install-data-am: install-hwdbDATA install-pkgconfigDATA \
--       install-udevrulesDATA
+-install-data-am: install-pkgconfigDATA install-udevrulesDATA
 +install-data-am: install-pkgconfigDATA
  
  install-dvi: install-dvi-recursive
  
-@@ -917,8 +884,7 @@ ps: ps-recursive
+@@ -821,7 +794,7 @@
  
  ps-am:
  
--uninstall-am: uninstall-hwdbDATA uninstall-pkgconfigDATA \
--       uninstall-udevrulesDATA
+-uninstall-am: uninstall-pkgconfigDATA uninstall-udevrulesDATA
 +uninstall-am: uninstall-pkgconfigDATA
  
- .MAKE: $(am__recursive_targets) all install-am install-strip
- 
-@@ -931,30 +897,18 @@ uninstall-am: uninstall-hwdbDATA uninstall-pkgconfigDATA \
-        distdir distuninstallcheck dvi dvi-am html html-am info \
-        info-am install install-am install-data install-data-am \
-        install-dvi install-dvi-am install-exec install-exec-am \
--       install-html install-html-am install-hwdbDATA install-info \
-+       install-html install-html-am install-info \
-        install-info-am install-man install-pdf install-pdf-am \
-        install-pkgconfigDATA install-ps install-ps-am install-strip \
--       install-udevrulesDATA installcheck installcheck-am installdirs \
-+       installcheck installcheck-am installdirs \
-        installdirs-am maintainer-clean maintainer-clean-generic \
-        mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-        ps ps-am tags tags-am uninstall uninstall-am \
--       uninstall-hwdbDATA uninstall-pkgconfigDATA \
+ .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+        ctags-recursive install-am install-strip tags-recursive
+@@ -837,20 +810,29 @@
+        install-dvi-am install-exec install-exec-am install-html \
+        install-html-am install-info install-info-am install-man \
+        install-pdf install-pdf-am install-pkgconfigDATA install-ps \
+-       install-ps-am install-strip install-udevrulesDATA installcheck \
+-       installcheck-am installdirs installdirs-am maintainer-clean \
++       install-ps-am install-strip installcheck installcheck-am \
++       installdirs installdirs-am maintainer-clean \
+        maintainer-clean-generic mostlyclean mostlyclean-generic \
+        mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+-       uninstall uninstall-am uninstall-pkgconfigDATA \
 -       uninstall-udevrulesDATA
-+       uninstall-pkgconfigDATA
- 
- .PRECIOUS: Makefile
++       uninstall uninstall-am uninstall-pkgconfigDATA
  
  
 -@USE_LINUX_TRUE@libmtp.usermap: util/mtp-hotplug
 -@USE_LINUX_TRUE@       util/mtp-hotplug > libmtp.usermap
--
 -@USE_LINUX_TRUE@@UDEV_RULES@: util/mtp-hotplug
 -@USE_LINUX_TRUE@       util/mtp-hotplug -u -p"@UDEV@" @UDEV_GROUP@ @UDEV_MODE@ > @UDEV_RULES@
--
 -@USE_LINUX_TRUE@libmtp.fdi: util/mtp-hotplug
 -@USE_LINUX_TRUE@       util/mtp-hotplug -H > libmtp.fdi
--
--@USE_LINUX_TRUE@$(hwdb_DATA): util/mtp-hotplug
--@USE_LINUX_TRUE@       util/mtp-hotplug -w > $(hwdb_DATA)
++# This stuff only makes sense on Linux so only
++# build and ship it on Linux.
++#if USE_LINUX
++#udevrulesdir=@UDEV@/rules.d
++#udevrules_DATA=@UDEV_RULES@
++#noinst_DATA=libmtp.usermap libmtp.fdi
++#
++#libmtp.usermap: util/mtp-hotplug
++#      util/mtp-hotplug > libmtp.usermap
++#@UDEV_RULES@: util/mtp-hotplug
++#      util/mtp-hotplug -u -p"@UDEV@" @UDEV_GROUP@ @UDEV_MODE@ > @UDEV_RULES@
++#libmtp.fdi: util/mtp-hotplug
++#      util/mtp-hotplug -H > libmtp.fdi
++#
++#CLEANFILES = libmtp.usermap @UDEV_RULES@ libmtp.fdi
++#endif
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff --git a/util/Makefile.am b/util/Makefile.am
-index 11f3640..f39c888 100644
---- a/util/Makefile.am
-+++ b/util/Makefile.am
+Index: util/Makefile.am
+===================================================================
+--- util/Makefile.am    (revision 148712)
++++ util/Makefile.am    (working copy)
 @@ -1,11 +1,11 @@
 -if USE_LINUX
 -bin_PROGRAMS=mtp-hotplug
 -mtp_hotplug_SOURCES=mtp-hotplug.c
--
++#if USE_LINUX
++#bin_PROGRAMS=mtp-hotplug
++#mtp_hotplug_SOURCES=mtp-hotplug.c
++#
++#mtp_probedir=@UDEV@
++#mtp_probe_PROGRAMS=mtp-probe
++#mtp_probe_SOURCES=mtp-probe.c
++#endif
+ 
 -mtp_probedir=@UDEV@
 -mtp_probe_PROGRAMS=mtp-probe
 -mtp_probe_SOURCES=mtp-probe.c
 -endif
+-
+ AM_CPPFLAGS=-I$(top_builddir)/src
+ LDADD=../src/libmtp.la
+Index: util/Makefile.in
+===================================================================
+--- util/Makefile.in    (revision 148712)
++++ util/Makefile.in    (working copy)
+@@ -15,6 +15,14 @@
+ 
+ @SET_MAKE@
+ 
 +#if USE_LINUX
 +#bin_PROGRAMS=mtp-hotplug
 +#mtp_hotplug_SOURCES=mtp-hotplug.c
 +#
 +#mtp_probedir=@UDEV@
 +#mtp_probe_PROGRAMS=mtp-probe
 +#mtp_probe_SOURCES=mtp-probe.c
 +#endif
- 
- AM_CPPFLAGS=-I$(top_builddir)/src
- LDADD=../src/libmtp.la
-diff --git a/util/Makefile.in b/util/Makefile.in
-index 5baca52..9b217ed 100644
---- a/util/Makefile.in
-+++ b/util/Makefile.in
-@@ -88,8 +88,6 @@ PRE_UNINSTALL = :
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+@@ -34,8 +42,6 @@
  POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
 -@USE_LINUX_TRUE@bin_PROGRAMS = mtp-hotplug$(EXEEXT)
 -@USE_LINUX_TRUE@mtp_probe_PROGRAMS = mtp-probe$(EXEEXT)
  subdir = util
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/byteorder.m4 \
-@@ -104,83 +102,8 @@ mkinstalldirs = $(install_sh) -d
+@@ -50,36 +56,8 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
 -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(mtp_probedir)"
 -PROGRAMS = $(bin_PROGRAMS) $(mtp_probe_PROGRAMS)
 -am__mtp_hotplug_SOURCES_DIST = mtp-hotplug.c
 -@USE_LINUX_TRUE@am_mtp_hotplug_OBJECTS = mtp-hotplug.$(OBJEXT)
 -mtp_hotplug_OBJECTS = $(am_mtp_hotplug_OBJECTS)
 -mtp_hotplug_LDADD = $(LDADD)
 -mtp_hotplug_DEPENDENCIES = ../src/libmtp.la
--AM_V_lt = $(am__v_lt_@AM_V@)
--am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
--am__v_lt_0 = --silent
--am__v_lt_1 = 
 -am__mtp_probe_SOURCES_DIST = mtp-probe.c
 -@USE_LINUX_TRUE@am_mtp_probe_OBJECTS = mtp-probe.$(OBJEXT)
 -mtp_probe_OBJECTS = $(am_mtp_probe_OBJECTS)
 -mtp_probe_LDADD = $(LDADD)
 -mtp_probe_DEPENDENCIES = ../src/libmtp.la
--AM_V_P = $(am__v_P_@AM_V@)
--am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
--am__v_P_0 = false
--am__v_P_1 = :
--AM_V_GEN = $(am__v_GEN_@AM_V@)
--am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
--am__v_GEN_0 = @echo "  GEN     " $@;
--am__v_GEN_1 = 
--AM_V_at = $(am__v_at_@AM_V@)
--am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
--am__v_at_0 = @
--am__v_at_1 = 
 -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 -depcomp = $(SHELL) $(top_srcdir)/depcomp
 -am__depfiles_maybe = depfiles
 -am__mv = mv -f
 -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 -       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--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_@AM_V@)
--am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
--am__v_CC_0 = @echo "  CC      " $@;
--am__v_CC_1 = 
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+-       --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 -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_@AM_V@)
--am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
--am__v_CCLD_0 = @echo "  CCLD    " $@;
--am__v_CCLD_1 = 
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+-       --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+-       $(LDFLAGS) -o $@
 -SOURCES = $(mtp_hotplug_SOURCES) $(mtp_probe_SOURCES)
 -DIST_SOURCES = $(am__mtp_hotplug_SOURCES_DIST) \
 -       $(am__mtp_probe_SOURCES_DIST)
--am__can_run_installinfo = \
--  case $$AM_UPDATE_INFO_DIR in \
--    n|no|NO) false;; \
--    *) (install-info --version) >/dev/null 2>&1;; \
--  esac
--am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
--# Read a list of newline-separated strings from the standard input,
--# and print each of them once, without duplicates.  Input order is
--# *not* preserved.
--am__uniquify_input = $(AWK) '\
--  BEGIN { nonempty = 0; } \
--  { items[$$0] = 1; nonempty = 1; } \
--  END { if (nonempty) { for (i in items) print i; }; } \
--'
--# Make sure the list of sources is unique.  This is necessary because,
--# e.g., the same source file might be shared among _SOURCES variables
--# for different programs/libraries.
--am__define_uniq_tagged_files = \
--  list='$(am__tagged_files)'; \
--  unique=`for i in $$list; do \
--    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
--  done | $(am__uniquify_input)`
 -ETAGS = etags
 -CTAGS = ctags
 +SOURCES =
 +DIST_SOURCES =
- am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  ACLOCAL = @ACLOCAL@
-@@ -314,15 +237,11 @@ target_alias = @target_alias@
+ AMTAR = @AMTAR@
+@@ -211,15 +189,11 @@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -@USE_LINUX_TRUE@mtp_hotplug_SOURCES = mtp-hotplug.c
 -@USE_LINUX_TRUE@mtp_probedir = @UDEV@
 -@USE_LINUX_TRUE@mtp_probe_SOURCES = mtp-probe.c
  AM_CPPFLAGS = -I$(top_builddir)/src
  LDADD = ../src/libmtp.la
  all: all-am
  
  .SUFFIXES:
 -.SUFFIXES: .c .lo .o .obj
  $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
         @for dep in $?; do \
           case '$(am__configure_deps)' in \
-@@ -352,142 +271,6 @@ $(top_srcdir)/configure:  $(am__configure_deps)
+@@ -250,187 +224,19 @@
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(am__aclocal_m4_deps):
 -install-binPROGRAMS: $(bin_PROGRAMS)
 -       @$(NORMAL_INSTALL)
+-       test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 -       @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
--       if test -n "$$list"; then \
--         echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
--         $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
--       fi; \
 -       for p in $$list; do echo "$$p $$p"; done | \
 -       sed 's/$(EXEEXT)$$//' | \
--       while read p p1; do if test -f $$p \
--        || test -f $$p1 \
--         ; then echo "$$p"; echo "$$p"; else :; fi; \
+-       while read p p1; do if test -f $$p || test -f $$p1; \
+-         then echo "$$p"; echo "$$p"; else :; fi; \
 -       done | \
--       sed -e 'p;s,.*/,,;n;h' \
--           -e 's|.*|.|' \
+-       sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
 -           -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 -       sed 'N;N;N;s,\n, ,g' | \
 -       $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
 -         { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
 -           if ($$2 == $$4) files[d] = files[d] " " $$1; \
 -           else { print "f", $$3 "/" $$4, $$1; } } \
 -         END { for (d in files) print "f", d, files[d] }' | \
 -       while read type dir files; do \
 -           if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
 -           test -z "$$files" || { \
 -           echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
 -           $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
 -           } \
 -       ; done
--
+ 
 -uninstall-binPROGRAMS:
 -       @$(NORMAL_UNINSTALL)
 -       @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 -       files=`for p in $$list; do echo "$$p"; done | \
 -         sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
--             -e 's/$$/$(EXEEXT)/' \
--       `; \
+-             -e 's/$$/$(EXEEXT)/' `; \
 -       test -n "$$list" || exit 0; \
 -       echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 -       cd "$(DESTDIR)$(bindir)" && rm -f $$files
 -
 -clean-binPROGRAMS:
 -       @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
 -       echo " rm -f" $$list; \
 -       rm -f $$list || exit $$?; \
 -       test -n "$(EXEEXT)" || exit 0; \
 -       list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 -       echo " rm -f" $$list; \
 -       rm -f $$list
 -install-mtp_probePROGRAMS: $(mtp_probe_PROGRAMS)
 -       @$(NORMAL_INSTALL)
+-       test -z "$(mtp_probedir)" || $(MKDIR_P) "$(DESTDIR)$(mtp_probedir)"
 -       @list='$(mtp_probe_PROGRAMS)'; test -n "$(mtp_probedir)" || list=; \
--       if test -n "$$list"; then \
--         echo " $(MKDIR_P) '$(DESTDIR)$(mtp_probedir)'"; \
--         $(MKDIR_P) "$(DESTDIR)$(mtp_probedir)" || exit 1; \
--       fi; \
 -       for p in $$list; do echo "$$p $$p"; done | \
 -       sed 's/$(EXEEXT)$$//' | \
--       while read p p1; do if test -f $$p \
--        || test -f $$p1 \
--         ; then echo "$$p"; echo "$$p"; else :; fi; \
+-       while read p p1; do if test -f $$p || test -f $$p1; \
+-         then echo "$$p"; echo "$$p"; else :; fi; \
 -       done | \
--       sed -e 'p;s,.*/,,;n;h' \
--           -e 's|.*|.|' \
+-       sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
 -           -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 -       sed 'N;N;N;s,\n, ,g' | \
 -       $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
 -         { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
 -           if ($$2 == $$4) files[d] = files[d] " " $$1; \
 -           else { print "f", $$3 "/" $$4, $$1; } } \
 -         END { for (d in files) print "f", d, files[d] }' | \
 -       while read type dir files; do \
 -           if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
 -           test -z "$$files" || { \
 -           echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(mtp_probedir)$$dir'"; \
 -           $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(mtp_probedir)$$dir" || exit $$?; \
 -           } \
 -       ; done
 -
 -uninstall-mtp_probePROGRAMS:
 -       @$(NORMAL_UNINSTALL)
 -       @list='$(mtp_probe_PROGRAMS)'; test -n "$(mtp_probedir)" || list=; \
 -       files=`for p in $$list; do echo "$$p"; done | \
 -         sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
--             -e 's/$$/$(EXEEXT)/' \
--       `; \
+-             -e 's/$$/$(EXEEXT)/' `; \
 -       test -n "$$list" || exit 0; \
 -       echo " ( cd '$(DESTDIR)$(mtp_probedir)' && rm -f" $$files ")"; \
 -       cd "$(DESTDIR)$(mtp_probedir)" && rm -f $$files
 -
 -clean-mtp_probePROGRAMS:
 -       @list='$(mtp_probe_PROGRAMS)'; test -n "$$list" || exit 0; \
 -       echo " rm -f" $$list; \
 -       rm -f $$list || exit $$?; \
 -       test -n "$(EXEEXT)" || exit 0; \
 -       list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 -       echo " rm -f" $$list; \
 -       rm -f $$list
--
 -mtp-hotplug$(EXEEXT): $(mtp_hotplug_OBJECTS) $(mtp_hotplug_DEPENDENCIES) $(EXTRA_mtp_hotplug_DEPENDENCIES) 
 -       @rm -f mtp-hotplug$(EXEEXT)
--       $(AM_V_CCLD)$(LINK) $(mtp_hotplug_OBJECTS) $(mtp_hotplug_LDADD) $(LIBS)
--
+-       $(LINK) $(mtp_hotplug_OBJECTS) $(mtp_hotplug_LDADD) $(LIBS)
 -mtp-probe$(EXEEXT): $(mtp_probe_OBJECTS) $(mtp_probe_DEPENDENCIES) $(EXTRA_mtp_probe_DEPENDENCIES) 
 -       @rm -f mtp-probe$(EXEEXT)
--       $(AM_V_CCLD)$(LINK) $(mtp_probe_OBJECTS) $(mtp_probe_LDADD) $(LIBS)
+-       $(LINK) $(mtp_probe_OBJECTS) $(mtp_probe_LDADD) $(LIBS)
 -
 -mostlyclean-compile:
 -       -rm -f *.$(OBJEXT)
 -
 -distclean-compile:
 -       -rm -f *.tab.c
 -
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mtp-hotplug.Po@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mtp-probe.Po@am__quote@
 -
 -.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
--@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 -@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+-@am__fastdepCC_FALSE@  $(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
--@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 -@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_FALSE@  $(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
--@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@am__fastdepCC_TRUE@   $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 -@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
- 
+-@am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
+-
  mostlyclean-libtool:
         -rm -f *.lo
-@@ -497,37 +280,12 @@ clean-libtool:
  
- ID: $(am__tagged_files)
-        $(am__define_uniq_tagged_files); mkid -fID $$unique
--tags: tags-am
--TAGS: tags
+ clean-libtool:
+        -rm -rf .libs _libs
 -
--tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+-       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+-       unique=`for i in $$list; do \
+-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+-         done | \
+-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+-             END { if (nonempty) { for (i in files) print i; }; }'`; \
+-       mkid -fID $$unique
+ tags: TAGS
++TAGS:
+ 
+-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+-               $(TAGS_FILES) $(LISP)
 -       set x; \
 -       here=`pwd`; \
--       $(am__define_uniq_tagged_files); \
+-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+-       unique=`for i in $$list; do \
+-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+-         done | \
+-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+-             END { if (nonempty) { for (i in files) print i; }; }'`; \
 -       shift; \
 -       if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 -         test -n "$$unique" || unique=$$empty_fix; \
 -         if test $$# -gt 0; then \
 -           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 -             "$$@" $$unique; \
 -         else \
 -           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 -             $$unique; \
 -         fi; \
 -       fi
--ctags: ctags-am
--
--CTAGS: ctags
--ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
--       $(am__define_uniq_tagged_files); \
+ ctags: CTAGS
+-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+-               $(TAGS_FILES) $(LISP)
+-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+-       unique=`for i in $$list; do \
+-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+-         done | \
+-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+-             END { if (nonempty) { for (i in files) print i; }; }'`; \
 -       test -z "$(CTAGS_ARGS)$$unique" \
 -         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 -            $$unique
--
++CTAGS:
+ 
 -GTAGS:
 -       here=`$(am__cd) $(top_builddir) && pwd` \
 -         && $(am__cd) $(top_srcdir) \
 -         && gtags -i $(GTAGS_ARGS) "$$here"
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
- cscopelist: cscopelist-am
- 
- cscopelist-am: $(am__tagged_files)
-@@ -544,9 +302,6 @@ cscopelist-am: $(am__tagged_files)
-          fi; \
-        done >> $(top_builddir)/cscope.files
  
 -distclean-tags:
 -       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 -
  distdir: $(DISTFILES)
         @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-@@ -579,11 +334,8 @@ distdir: $(DISTFILES)
+@@ -463,11 +269,8 @@
         done
  check-am: all-am
  check: check-am
 -all-am: Makefile $(PROGRAMS)
 +all-am: Makefile
  installdirs:
 -       for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(mtp_probedir)"; do \
 -         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 -       done
  install: install-am
  install-exec: install-exec-am
  install-data: install-data-am
-@@ -616,14 +368,11 @@ maintainer-clean-generic:
+@@ -500,14 +303,11 @@
         @echo "it deletes files that may require special tools to rebuild."
  clean: clean-am
  
 -clean-am: clean-binPROGRAMS clean-generic clean-libtool \
 -       clean-mtp_probePROGRAMS mostlyclean-am
 +clean-am: clean-generic clean-libtool mostlyclean-am
  
  distclean: distclean-am
 -       -rm -rf ./$(DEPDIR)
         -rm -f Makefile
 -distclean-am: clean-am distclean-compile distclean-generic \
 -       distclean-tags
 +distclean-am: clean-am distclean-generic
  
  dvi: dvi-am
  
-@@ -637,13 +386,13 @@ info: info-am
+@@ -521,13 +321,13 @@
  
  info-am:
  
 -install-data-am: install-mtp_probePROGRAMS
 +install-data-am:
  
  install-dvi: install-dvi-am
  
  install-dvi-am:
  
 -install-exec-am: install-binPROGRAMS
 +install-exec-am:
  
  install-html: install-html-am
  
-@@ -666,14 +415,12 @@ install-ps-am:
+@@ -550,14 +350,12 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
 -       -rm -rf ./$(DEPDIR)
         -rm -f Makefile
  maintainer-clean-am: distclean-am maintainer-clean-generic
  
  mostlyclean: mostlyclean-am
  
 -mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 -       mostlyclean-libtool
 +mostlyclean-am: mostlyclean-generic mostlyclean-libtool
  
  pdf: pdf-am
  
-@@ -683,25 +430,24 @@ ps: ps-am
+@@ -567,25 +365,20 @@
  
  ps-am:
  
 -uninstall-am: uninstall-binPROGRAMS uninstall-mtp_probePROGRAMS
 +uninstall-am:
  
  .MAKE: install-am install-strip
  
--.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
--       clean-binPROGRAMS clean-generic clean-libtool \
--       clean-mtp_probePROGRAMS cscopelist-am ctags ctags-am distclean \
-+.PHONY: all all-am check check-am clean \
-+       clean-generic clean-libtool \
-+       cscopelist-am distclean \
-        distclean-compile distclean-generic distclean-libtool \
-        distclean-tags distdir dvi dvi-am html html-am info info-am \
--       install install-am install-binPROGRAMS install-data \
-+       install install-am install-data \
-        install-data-am install-dvi install-dvi-am install-exec \
-        install-exec-am install-html install-html-am install-info \
--       install-info-am install-man install-mtp_probePROGRAMS \
-+       install-info-am install-man \
-        install-pdf install-pdf-am install-ps install-ps-am \
-        install-strip installcheck installcheck-am installdirs \
-        maintainer-clean maintainer-clean-generic mostlyclean \
-        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
--       pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
--       uninstall-binPROGRAMS uninstall-mtp_probePROGRAMS
-+       pdf pdf-am ps ps-am uninstall uninstall-am
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+-       clean-generic clean-libtool clean-mtp_probePROGRAMS ctags \
+-       distclean distclean-compile distclean-generic \
+-       distclean-libtool distclean-tags distdir dvi dvi-am html \
+-       html-am info info-am install install-am install-binPROGRAMS \
++.PHONY: all all-am check check-am clean clean-generic clean-libtool \
++       distclean distclean-generic distclean-libtool distdir dvi \
++       dvi-am html html-am info info-am install install-am \
+        install-data install-data-am install-dvi install-dvi-am \
+        install-exec install-exec-am install-html install-html-am \
+-       install-info install-info-am install-man \
+-       install-mtp_probePROGRAMS install-pdf install-pdf-am \
+-       install-ps install-ps-am install-strip installcheck \
+-       installcheck-am installdirs maintainer-clean \
+-       maintainer-clean-generic mostlyclean mostlyclean-compile \
+-       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-       tags uninstall uninstall-am uninstall-binPROGRAMS \
+-       uninstall-mtp_probePROGRAMS
++       install-info install-info-am install-man install-pdf \
++       install-pdf-am install-ps install-ps-am install-strip \
++       installcheck installcheck-am installdirs maintainer-clean \
++       maintainer-clean-generic mostlyclean mostlyclean-generic \
++       mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
  
- .PRECIOUS: Makefile
  
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.