Update to upstream 1.0.1

Change-Id: Ibda71ee45e57dd921e49d36ffb57c3b23e972179

1 files changed, 36 insertions, 50 deletions

diff --git a/src/plugins/password/Makefile.in b/src/plugins/password/Makefile.in
index 74d6c6b..796e435 100644
--- a/src/plugins/password/Makefile.in
+++ b/src/plugins/password/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 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,
@@ -16,23 +16,6 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -93,8 +76,8 @@ am__uninstall_files_from_dir = { \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
-am__installdirs = "$(DESTDIR)$(pluginsdir)"
-LTLIBRARIES = $(plugins_LTLIBRARIES)
+am__installdirs = "$(DESTDIR)$(gpluginsdir)"
+LTLIBRARIES = $(gplugins_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libpassword_la_DEPENDENCIES =  \
 	$(top_builddir)/src/common/libgsignond-common.la \
@@ -106,6 +89,10 @@ libpassword_la_OBJECTS = $(am_libpassword_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+libpassword_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libpassword_la_LDFLAGS) $(LDFLAGS) -o \
+	$@
 DEFAULT_INCLUDES = 
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -134,11 +121,6 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libpassword_la_SOURCES)
 DIST_SOURCES = $(libpassword_la_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -150,6 +132,7 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BASE_STORAGE_DIR = @BASE_STORAGE_DIR@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -176,6 +159,7 @@ GREP = @GREP@
 GSIGNOND_CFLAGS = @GSIGNOND_CFLAGS@
 GSIGNOND_LIBS = @GSIGNOND_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -188,6 +172,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KEYCHAIN_SYSCTX = @KEYCHAIN_SYSCTX@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBECRYPTFS_CFLAGS = @LIBECRYPTFS_CFLAGS@
@@ -281,8 +266,9 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 extensionsdir = $(pkglibdir)/extensions
-pluginsdir = $(pkglibdir)/plugins
-plugins_LTLIBRARIES = libpassword.la
+pluginloadersdir = $(pkglibdir)/pluginloaders
+gpluginsdir = $(pkglibdir)/gplugins
+gplugins_LTLIBRARIES = libpassword.la
 NULL = 
 libpassword_la_CPPFLAGS = \
     -I$(top_builddir) \
@@ -301,6 +287,7 @@ libpassword_la_SOURCES = \
     gsignond-password-plugin.c \
     $(NULL)
 
+libpassword_la_LDFLAGS = -avoid-version
 all: all-am
 
 .SUFFIXES:
@@ -336,40 +323,39 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-pluginsLTLIBRARIES: $(plugins_LTLIBRARIES)
+install-gpluginsLTLIBRARIES: $(gplugins_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	@list='$(plugins_LTLIBRARIES)'; test -n "$(pluginsdir)" || list=; \
+	test -z "$(gpluginsdir)" || $(MKDIR_P) "$(DESTDIR)$(gpluginsdir)"
+	@list='$(gplugins_LTLIBRARIES)'; test -n "$(gpluginsdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
 	    list2="$$list2 $$p"; \
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pluginsdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pluginsdir)" || exit 1; \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pluginsdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pluginsdir)"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(gpluginsdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(gpluginsdir)"; \
 	}
 
-uninstall-pluginsLTLIBRARIES:
+uninstall-gpluginsLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(plugins_LTLIBRARIES)'; test -n "$(pluginsdir)" || list=; \
+	@list='$(gplugins_LTLIBRARIES)'; test -n "$(gpluginsdir)" || list=; \
 	for p in $$list; do \
 	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pluginsdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pluginsdir)/$$f"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(gpluginsdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(gpluginsdir)/$$f"; \
 	done
 
-clean-pluginsLTLIBRARIES:
-	-test -z "$(plugins_LTLIBRARIES)" || rm -f $(plugins_LTLIBRARIES)
-	@list='$(plugins_LTLIBRARIES)'; for p in $$list; do \
+clean-gpluginsLTLIBRARIES:
+	-test -z "$(gplugins_LTLIBRARIES)" || rm -f $(gplugins_LTLIBRARIES)
+	@list='$(gplugins_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
 	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libpassword.la: $(libpassword_la_OBJECTS) $(libpassword_la_DEPENDENCIES) $(EXTRA_libpassword_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(LINK) -rpath $(pluginsdir) $(libpassword_la_OBJECTS) $(libpassword_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(libpassword_la_LINK) -rpath $(gpluginsdir) $(libpassword_la_OBJECTS) $(libpassword_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -502,7 +488,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES) all-local
 installdirs:
-	for dir in "$(DESTDIR)$(pluginsdir)"; do \
+	for dir in "$(DESTDIR)$(gpluginsdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -537,7 +523,7 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libtool clean-pluginsLTLIBRARIES \
+clean-am: clean-generic clean-gpluginsLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
@@ -558,7 +544,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-pluginsLTLIBRARIES
+install-data-am: install-gpluginsLTLIBRARIES
 
 install-dvi: install-dvi-am
 
@@ -604,24 +590,24 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-pluginsLTLIBRARIES
+uninstall-am: uninstall-gpluginsLTLIBRARIES
 
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
-	clean-generic clean-libtool clean-pluginsLTLIBRARIES ctags \
+	clean-generic clean-gpluginsLTLIBRARIES clean-libtool ctags \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags 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-pdf install-pdf-am \
-	install-pluginsLTLIBRARIES install-ps install-ps-am \
+	install-exec-am install-gpluginsLTLIBRARIES install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-pluginsLTLIBRARIES
+	uninstall-gpluginsLTLIBRARIES
 
 
 all-local: slink