$OpenBSD: patch-common_Makefile_in,v 1.1 2008/06/02 13:38:48 ajacoutot Exp $
--- common/Makefile.in.orig	Mon Jun  2 15:16:35 2008
+++ common/Makefile.in	Mon Jun  2 15:10:52 2008
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005  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.
@@ -14,11 +14,15 @@
 
 @SET_MAKE@
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -57,45 +61,41 @@ am_libgkr_common_la_OBJECTS = libgkr_common_la-gkr-asy
 	libgkr_common_la-gkr-unix-signal.lo \
 	libgkr_common_la-gkr-wakeup.lo
 libgkr_common_la_OBJECTS = $(am_libgkr_common_la_OBJECTS)
-libgkr_common_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgkr_common_la_CFLAGS) \
-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-libgkr_module_common_la_LIBADD =
-am_libgkr_module_common_la_OBJECTS = gkr-buffer.lo \
-	gkr-secure-memory.lo gkr-unix-credentials.lo
+libgkr_module_common_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_libgkr_module_common_la_OBJECTS =  \
+	libgkr_module_common_la-gkr-buffer.lo \
+	libgkr_module_common_la-gkr-secure-memory.lo \
+	libgkr_module_common_la-gkr-unix-credentials.lo
 libgkr_module_common_la_OBJECTS =  \
 	$(am_libgkr_module_common_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libgkr_common_la_SOURCES) \
 	$(libgkr_module_common_la_SOURCES)
 DIST_SOURCES = $(libgkr_common_la_SOURCES) \
 	$(libgkr_module_common_la_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
+	install-exec-recursive install-info-recursive \
+	install-recursive installcheck-recursive installdirs-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	uninstall-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = . tests
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -129,11 +129,15 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GCONF_CFLAGS = @GCONF_CFLAGS@
 GCONF_LIBS = @GCONF_LIBS@
+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
 GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
 GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -147,42 +151,19 @@ GOBJECT_LIBS = @GOBJECT_LIBS@
 GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
-GTKDOC_CHECK = @GTKDOC_CHECK@
 GTK_CFLAGS = @GTK_CFLAGS@
+GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
+GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
 GTK_LIBS = @GTK_LIBS@
 HAL_CFLAGS = @HAL_CFLAGS@
 HAL_LIBS = @HAL_LIBS@
 HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 LDFLAGS = @LDFLAGS@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
@@ -199,12 +180,12 @@ LIB_GNOME_KEYRING_LT_VERSION = @LIB_GNOME_KEYRING_LT_V
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
-MSGMERGE = @MSGMERGE@
 NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -227,14 +208,24 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+WITH_DBUS_FALSE = @WITH_DBUS_FALSE@
+WITH_DBUS_TRUE = @WITH_DBUS_TRUE@
+WITH_HAL_FALSE = @WITH_HAL_FALSE@
+WITH_HAL_TRUE = @WITH_HAL_TRUE@
+WITH_PAM_FALSE = @WITH_PAM_FALSE@
+WITH_PAM_TRUE = @WITH_PAM_TRUE@
+WITH_SSH_FALSE = @WITH_SSH_FALSE@
+WITH_SSH_TRUE = @WITH_SSH_TRUE@
+WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
+WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
 XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -246,7 +237,6 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -274,11 +264,8 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
 noinst_LTLIBRARIES = \
 	libgkr-common.la \
 	libgkr-module-common.la
@@ -325,6 +312,13 @@ libgkr_module_common_la_SOURCES = \
 	gkr-secure-memory.c gkr-secure-memory.h \
 	gkr-unix-credentials.c gkr-unix-credentials.h
 
+libgkr_module_common_la_CFLAGS = \
+	$(GTK_CFLAGS) \
+	$(GLIB_CFLAGS)
+
+libgkr_module_common_la_LIBADD = \
+	$(GLIB_LIBS)
+
 @WITH_TESTS_FALSE@TESTS_DIR = 
 @WITH_TESTS_TRUE@TESTS_DIR = tests
 SUBDIRS = . $(TESTS_DIR)
@@ -371,9 +365,9 @@ clean-noinstLTLIBRARIES:
 	  rm -f "$${dir}/so_locations"; \
 	done
 libgkr-common.la: $(libgkr_common_la_OBJECTS) $(libgkr_common_la_DEPENDENCIES) 
-	$(libgkr_common_la_LINK)  $(libgkr_common_la_OBJECTS) $(libgkr_common_la_LIBADD) $(LIBS)
+	$(LINK)  $(libgkr_common_la_LDFLAGS) $(libgkr_common_la_OBJECTS) $(libgkr_common_la_LIBADD) $(LIBS)
 libgkr-module-common.la: $(libgkr_module_common_la_OBJECTS) $(libgkr_module_common_la_DEPENDENCIES) 
-	$(LINK)  $(libgkr_module_common_la_OBJECTS) $(libgkr_module_common_la_LIBADD) $(LIBS)
+	$(LINK)  $(libgkr_module_common_la_LDFLAGS) $(libgkr_module_common_la_OBJECTS) $(libgkr_module_common_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -381,9 +375,6 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gkr-buffer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gkr-secure-memory.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gkr-unix-credentials.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgkr_common_la-gkr-async.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgkr_common_la-gkr-buffer.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgkr_common_la-gkr-cleanup.Plo@am__quote@
@@ -397,125 +388,153 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgkr_common_la-gkr-unix-credentials.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgkr_common_la-gkr-unix-signal.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgkr_common_la-gkr-wakeup.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgkr_module_common_la-gkr-buffer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgkr_module_common_la-gkr-secure-memory.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgkr_module_common_la-gkr-unix-credentials.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 libgkr_common_la-gkr-async.lo: gkr-async.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -MT libgkr_common_la-gkr-async.lo -MD -MP -MF $(DEPDIR)/libgkr_common_la-gkr-async.Tpo -c -o libgkr_common_la-gkr-async.lo `test -f 'gkr-async.c' || echo '$(srcdir)/'`gkr-async.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgkr_common_la-gkr-async.Tpo $(DEPDIR)/libgkr_common_la-gkr-async.Plo
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -MT libgkr_common_la-gkr-async.lo -MD -MP -MF "$(DEPDIR)/libgkr_common_la-gkr-async.Tpo" -c -o libgkr_common_la-gkr-async.lo `test -f 'gkr-async.c' || echo '$(srcdir)/'`gkr-async.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgkr_common_la-gkr-async.Tpo" "$(DEPDIR)/libgkr_common_la-gkr-async.Plo"; else rm -f "$(DEPDIR)/libgkr_common_la-gkr-async.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gkr-async.c' object='libgkr_common_la-gkr-async.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -c -o libgkr_common_la-gkr-async.lo `test -f 'gkr-async.c' || echo '$(srcdir)/'`gkr-async.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -c -o libgkr_common_la-gkr-async.lo `test -f 'gkr-async.c' || echo '$(srcdir)/'`gkr-async.c
 
 libgkr_common_la-gkr-buffer.lo: gkr-buffer.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -MT libgkr_common_la-gkr-buffer.lo -MD -MP -MF $(DEPDIR)/libgkr_common_la-gkr-buffer.Tpo -c -o libgkr_common_la-gkr-buffer.lo `test -f 'gkr-buffer.c' || echo '$(srcdir)/'`gkr-buffer.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgkr_common_la-gkr-buffer.Tpo $(DEPDIR)/libgkr_common_la-gkr-buffer.Plo
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -MT libgkr_common_la-gkr-buffer.lo -MD -MP -MF "$(DEPDIR)/libgkr_common_la-gkr-buffer.Tpo" -c -o libgkr_common_la-gkr-buffer.lo `test -f 'gkr-buffer.c' || echo '$(srcdir)/'`gkr-buffer.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgkr_common_la-gkr-buffer.Tpo" "$(DEPDIR)/libgkr_common_la-gkr-buffer.Plo"; else rm -f "$(DEPDIR)/libgkr_common_la-gkr-buffer.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gkr-buffer.c' object='libgkr_common_la-gkr-buffer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -c -o libgkr_common_la-gkr-buffer.lo `test -f 'gkr-buffer.c' || echo '$(srcdir)/'`gkr-buffer.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -c -o libgkr_common_la-gkr-buffer.lo `test -f 'gkr-buffer.c' || echo '$(srcdir)/'`gkr-buffer.c
 
 libgkr_common_la-gkr-cleanup.lo: gkr-cleanup.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -MT libgkr_common_la-gkr-cleanup.lo -MD -MP -MF $(DEPDIR)/libgkr_common_la-gkr-cleanup.Tpo -c -o libgkr_common_la-gkr-cleanup.lo `test -f 'gkr-cleanup.c' || echo '$(srcdir)/'`gkr-cleanup.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgkr_common_la-gkr-cleanup.Tpo $(DEPDIR)/libgkr_common_la-gkr-cleanup.Plo
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -MT libgkr_common_la-gkr-cleanup.lo -MD -MP -MF "$(DEPDIR)/libgkr_common_la-gkr-cleanup.Tpo" -c -o libgkr_common_la-gkr-cleanup.lo `test -f 'gkr-cleanup.c' || echo '$(srcdir)/'`gkr-cleanup.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgkr_common_la-gkr-cleanup.Tpo" "$(DEPDIR)/libgkr_common_la-gkr-cleanup.Plo"; else rm -f "$(DEPDIR)/libgkr_common_la-gkr-cleanup.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gkr-cleanup.c' object='libgkr_common_la-gkr-cleanup.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -c -o libgkr_common_la-gkr-cleanup.lo `test -f 'gkr-cleanup.c' || echo '$(srcdir)/'`gkr-cleanup.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -c -o libgkr_common_la-gkr-cleanup.lo `test -f 'gkr-cleanup.c' || echo '$(srcdir)/'`gkr-cleanup.c
 
 libgkr_common_la-gkr-crypto.lo: gkr-crypto.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -MT libgkr_common_la-gkr-crypto.lo -MD -MP -MF $(DEPDIR)/libgkr_common_la-gkr-crypto.Tpo -c -o libgkr_common_la-gkr-crypto.lo `test -f 'gkr-crypto.c' || echo '$(srcdir)/'`gkr-crypto.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgkr_common_la-gkr-crypto.Tpo $(DEPDIR)/libgkr_common_la-gkr-crypto.Plo
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -MT libgkr_common_la-gkr-crypto.lo -MD -MP -MF "$(DEPDIR)/libgkr_common_la-gkr-crypto.Tpo" -c -o libgkr_common_la-gkr-crypto.lo `test -f 'gkr-crypto.c' || echo '$(srcdir)/'`gkr-crypto.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgkr_common_la-gkr-crypto.Tpo" "$(DEPDIR)/libgkr_common_la-gkr-crypto.Plo"; else rm -f "$(DEPDIR)/libgkr_common_la-gkr-crypto.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gkr-crypto.c' object='libgkr_common_la-gkr-crypto.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -c -o libgkr_common_la-gkr-crypto.lo `test -f 'gkr-crypto.c' || echo '$(srcdir)/'`gkr-crypto.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -c -o libgkr_common_la-gkr-crypto.lo `test -f 'gkr-crypto.c' || echo '$(srcdir)/'`gkr-crypto.c
 
 libgkr_common_la-gkr-daemon-util.lo: gkr-daemon-util.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -MT libgkr_common_la-gkr-daemon-util.lo -MD -MP -MF $(DEPDIR)/libgkr_common_la-gkr-daemon-util.Tpo -c -o libgkr_common_la-gkr-daemon-util.lo `test -f 'gkr-daemon-util.c' || echo '$(srcdir)/'`gkr-daemon-util.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgkr_common_la-gkr-daemon-util.Tpo $(DEPDIR)/libgkr_common_la-gkr-daemon-util.Plo
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -MT libgkr_common_la-gkr-daemon-util.lo -MD -MP -MF "$(DEPDIR)/libgkr_common_la-gkr-daemon-util.Tpo" -c -o libgkr_common_la-gkr-daemon-util.lo `test -f 'gkr-daemon-util.c' || echo '$(srcdir)/'`gkr-daemon-util.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgkr_common_la-gkr-daemon-util.Tpo" "$(DEPDIR)/libgkr_common_la-gkr-daemon-util.Plo"; else rm -f "$(DEPDIR)/libgkr_common_la-gkr-daemon-util.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gkr-daemon-util.c' object='libgkr_common_la-gkr-daemon-util.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -c -o libgkr_common_la-gkr-daemon-util.lo `test -f 'gkr-daemon-util.c' || echo '$(srcdir)/'`gkr-daemon-util.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -c -o libgkr_common_la-gkr-daemon-util.lo `test -f 'gkr-daemon-util.c' || echo '$(srcdir)/'`gkr-daemon-util.c
 
 libgkr_common_la-gkr-dbus.lo: gkr-dbus.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -MT libgkr_common_la-gkr-dbus.lo -MD -MP -MF $(DEPDIR)/libgkr_common_la-gkr-dbus.Tpo -c -o libgkr_common_la-gkr-dbus.lo `test -f 'gkr-dbus.c' || echo '$(srcdir)/'`gkr-dbus.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgkr_common_la-gkr-dbus.Tpo $(DEPDIR)/libgkr_common_la-gkr-dbus.Plo
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -MT libgkr_common_la-gkr-dbus.lo -MD -MP -MF "$(DEPDIR)/libgkr_common_la-gkr-dbus.Tpo" -c -o libgkr_common_la-gkr-dbus.lo `test -f 'gkr-dbus.c' || echo '$(srcdir)/'`gkr-dbus.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgkr_common_la-gkr-dbus.Tpo" "$(DEPDIR)/libgkr_common_la-gkr-dbus.Plo"; else rm -f "$(DEPDIR)/libgkr_common_la-gkr-dbus.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gkr-dbus.c' object='libgkr_common_la-gkr-dbus.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -c -o libgkr_common_la-gkr-dbus.lo `test -f 'gkr-dbus.c' || echo '$(srcdir)/'`gkr-dbus.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -c -o libgkr_common_la-gkr-dbus.lo `test -f 'gkr-dbus.c' || echo '$(srcdir)/'`gkr-dbus.c
 
 libgkr_common_la-gkr-location.lo: gkr-location.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -MT libgkr_common_la-gkr-location.lo -MD -MP -MF $(DEPDIR)/libgkr_common_la-gkr-location.Tpo -c -o libgkr_common_la-gkr-location.lo `test -f 'gkr-location.c' || echo '$(srcdir)/'`gkr-location.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgkr_common_la-gkr-location.Tpo $(DEPDIR)/libgkr_common_la-gkr-location.Plo
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -MT libgkr_common_la-gkr-location.lo -MD -MP -MF "$(DEPDIR)/libgkr_common_la-gkr-location.Tpo" -c -o libgkr_common_la-gkr-location.lo `test -f 'gkr-location.c' || echo '$(srcdir)/'`gkr-location.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgkr_common_la-gkr-location.Tpo" "$(DEPDIR)/libgkr_common_la-gkr-location.Plo"; else rm -f "$(DEPDIR)/libgkr_common_la-gkr-location.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gkr-location.c' object='libgkr_common_la-gkr-location.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -c -o libgkr_common_la-gkr-location.lo `test -f 'gkr-location.c' || echo '$(srcdir)/'`gkr-location.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -c -o libgkr_common_la-gkr-location.lo `test -f 'gkr-location.c' || echo '$(srcdir)/'`gkr-location.c
 
 libgkr_common_la-gkr-location-watch.lo: gkr-location-watch.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -MT libgkr_common_la-gkr-location-watch.lo -MD -MP -MF $(DEPDIR)/libgkr_common_la-gkr-location-watch.Tpo -c -o libgkr_common_la-gkr-location-watch.lo `test -f 'gkr-location-watch.c' || echo '$(srcdir)/'`gkr-location-watch.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgkr_common_la-gkr-location-watch.Tpo $(DEPDIR)/libgkr_common_la-gkr-location-watch.Plo
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -MT libgkr_common_la-gkr-location-watch.lo -MD -MP -MF "$(DEPDIR)/libgkr_common_la-gkr-location-watch.Tpo" -c -o libgkr_common_la-gkr-location-watch.lo `test -f 'gkr-location-watch.c' || echo '$(srcdir)/'`gkr-location-watch.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgkr_common_la-gkr-location-watch.Tpo" "$(DEPDIR)/libgkr_common_la-gkr-location-watch.Plo"; else rm -f "$(DEPDIR)/libgkr_common_la-gkr-location-watch.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gkr-location-watch.c' object='libgkr_common_la-gkr-location-watch.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -c -o libgkr_common_la-gkr-location-watch.lo `test -f 'gkr-location-watch.c' || echo '$(srcdir)/'`gkr-location-watch.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -c -o libgkr_common_la-gkr-location-watch.lo `test -f 'gkr-location-watch.c' || echo '$(srcdir)/'`gkr-location-watch.c
 
 libgkr_common_la-gkr-secure-memory.lo: gkr-secure-memory.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -MT libgkr_common_la-gkr-secure-memory.lo -MD -MP -MF $(DEPDIR)/libgkr_common_la-gkr-secure-memory.Tpo -c -o libgkr_common_la-gkr-secure-memory.lo `test -f 'gkr-secure-memory.c' || echo '$(srcdir)/'`gkr-secure-memory.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgkr_common_la-gkr-secure-memory.Tpo $(DEPDIR)/libgkr_common_la-gkr-secure-memory.Plo
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -MT libgkr_common_la-gkr-secure-memory.lo -MD -MP -MF "$(DEPDIR)/libgkr_common_la-gkr-secure-memory.Tpo" -c -o libgkr_common_la-gkr-secure-memory.lo `test -f 'gkr-secure-memory.c' || echo '$(srcdir)/'`gkr-secure-memory.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgkr_common_la-gkr-secure-memory.Tpo" "$(DEPDIR)/libgkr_common_la-gkr-secure-memory.Plo"; else rm -f "$(DEPDIR)/libgkr_common_la-gkr-secure-memory.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gkr-secure-memory.c' object='libgkr_common_la-gkr-secure-memory.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -c -o libgkr_common_la-gkr-secure-memory.lo `test -f 'gkr-secure-memory.c' || echo '$(srcdir)/'`gkr-secure-memory.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -c -o libgkr_common_la-gkr-secure-memory.lo `test -f 'gkr-secure-memory.c' || echo '$(srcdir)/'`gkr-secure-memory.c
 
 libgkr_common_la-gkr-id.lo: gkr-id.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -MT libgkr_common_la-gkr-id.lo -MD -MP -MF $(DEPDIR)/libgkr_common_la-gkr-id.Tpo -c -o libgkr_common_la-gkr-id.lo `test -f 'gkr-id.c' || echo '$(srcdir)/'`gkr-id.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgkr_common_la-gkr-id.Tpo $(DEPDIR)/libgkr_common_la-gkr-id.Plo
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -MT libgkr_common_la-gkr-id.lo -MD -MP -MF "$(DEPDIR)/libgkr_common_la-gkr-id.Tpo" -c -o libgkr_common_la-gkr-id.lo `test -f 'gkr-id.c' || echo '$(srcdir)/'`gkr-id.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgkr_common_la-gkr-id.Tpo" "$(DEPDIR)/libgkr_common_la-gkr-id.Plo"; else rm -f "$(DEPDIR)/libgkr_common_la-gkr-id.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gkr-id.c' object='libgkr_common_la-gkr-id.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -c -o libgkr_common_la-gkr-id.lo `test -f 'gkr-id.c' || echo '$(srcdir)/'`gkr-id.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -c -o libgkr_common_la-gkr-id.lo `test -f 'gkr-id.c' || echo '$(srcdir)/'`gkr-id.c
 
 libgkr_common_la-gkr-unix-credentials.lo: gkr-unix-credentials.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -MT libgkr_common_la-gkr-unix-credentials.lo -MD -MP -MF $(DEPDIR)/libgkr_common_la-gkr-unix-credentials.Tpo -c -o libgkr_common_la-gkr-unix-credentials.lo `test -f 'gkr-unix-credentials.c' || echo '$(srcdir)/'`gkr-unix-credentials.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgkr_common_la-gkr-unix-credentials.Tpo $(DEPDIR)/libgkr_common_la-gkr-unix-credentials.Plo
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -MT libgkr_common_la-gkr-unix-credentials.lo -MD -MP -MF "$(DEPDIR)/libgkr_common_la-gkr-unix-credentials.Tpo" -c -o libgkr_common_la-gkr-unix-credentials.lo `test -f 'gkr-unix-credentials.c' || echo '$(srcdir)/'`gkr-unix-credentials.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgkr_common_la-gkr-unix-credentials.Tpo" "$(DEPDIR)/libgkr_common_la-gkr-unix-credentials.Plo"; else rm -f "$(DEPDIR)/libgkr_common_la-gkr-unix-credentials.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gkr-unix-credentials.c' object='libgkr_common_la-gkr-unix-credentials.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -c -o libgkr_common_la-gkr-unix-credentials.lo `test -f 'gkr-unix-credentials.c' || echo '$(srcdir)/'`gkr-unix-credentials.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -c -o libgkr_common_la-gkr-unix-credentials.lo `test -f 'gkr-unix-credentials.c' || echo '$(srcdir)/'`gkr-unix-credentials.c
 
 libgkr_common_la-gkr-unix-signal.lo: gkr-unix-signal.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -MT libgkr_common_la-gkr-unix-signal.lo -MD -MP -MF $(DEPDIR)/libgkr_common_la-gkr-unix-signal.Tpo -c -o libgkr_common_la-gkr-unix-signal.lo `test -f 'gkr-unix-signal.c' || echo '$(srcdir)/'`gkr-unix-signal.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgkr_common_la-gkr-unix-signal.Tpo $(DEPDIR)/libgkr_common_la-gkr-unix-signal.Plo
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -MT libgkr_common_la-gkr-unix-signal.lo -MD -MP -MF "$(DEPDIR)/libgkr_common_la-gkr-unix-signal.Tpo" -c -o libgkr_common_la-gkr-unix-signal.lo `test -f 'gkr-unix-signal.c' || echo '$(srcdir)/'`gkr-unix-signal.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgkr_common_la-gkr-unix-signal.Tpo" "$(DEPDIR)/libgkr_common_la-gkr-unix-signal.Plo"; else rm -f "$(DEPDIR)/libgkr_common_la-gkr-unix-signal.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gkr-unix-signal.c' object='libgkr_common_la-gkr-unix-signal.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -c -o libgkr_common_la-gkr-unix-signal.lo `test -f 'gkr-unix-signal.c' || echo '$(srcdir)/'`gkr-unix-signal.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -c -o libgkr_common_la-gkr-unix-signal.lo `test -f 'gkr-unix-signal.c' || echo '$(srcdir)/'`gkr-unix-signal.c
 
 libgkr_common_la-gkr-wakeup.lo: gkr-wakeup.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -MT libgkr_common_la-gkr-wakeup.lo -MD -MP -MF $(DEPDIR)/libgkr_common_la-gkr-wakeup.Tpo -c -o libgkr_common_la-gkr-wakeup.lo `test -f 'gkr-wakeup.c' || echo '$(srcdir)/'`gkr-wakeup.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgkr_common_la-gkr-wakeup.Tpo $(DEPDIR)/libgkr_common_la-gkr-wakeup.Plo
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -MT libgkr_common_la-gkr-wakeup.lo -MD -MP -MF "$(DEPDIR)/libgkr_common_la-gkr-wakeup.Tpo" -c -o libgkr_common_la-gkr-wakeup.lo `test -f 'gkr-wakeup.c' || echo '$(srcdir)/'`gkr-wakeup.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgkr_common_la-gkr-wakeup.Tpo" "$(DEPDIR)/libgkr_common_la-gkr-wakeup.Plo"; else rm -f "$(DEPDIR)/libgkr_common_la-gkr-wakeup.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gkr-wakeup.c' object='libgkr_common_la-gkr-wakeup.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -c -o libgkr_common_la-gkr-wakeup.lo `test -f 'gkr-wakeup.c' || echo '$(srcdir)/'`gkr-wakeup.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_common_la_CFLAGS) $(CFLAGS) -c -o libgkr_common_la-gkr-wakeup.lo `test -f 'gkr-wakeup.c' || echo '$(srcdir)/'`gkr-wakeup.c
 
+libgkr_module_common_la-gkr-buffer.lo: gkr-buffer.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_module_common_la_CFLAGS) $(CFLAGS) -MT libgkr_module_common_la-gkr-buffer.lo -MD -MP -MF "$(DEPDIR)/libgkr_module_common_la-gkr-buffer.Tpo" -c -o libgkr_module_common_la-gkr-buffer.lo `test -f 'gkr-buffer.c' || echo '$(srcdir)/'`gkr-buffer.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgkr_module_common_la-gkr-buffer.Tpo" "$(DEPDIR)/libgkr_module_common_la-gkr-buffer.Plo"; else rm -f "$(DEPDIR)/libgkr_module_common_la-gkr-buffer.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gkr-buffer.c' object='libgkr_module_common_la-gkr-buffer.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_module_common_la_CFLAGS) $(CFLAGS) -c -o libgkr_module_common_la-gkr-buffer.lo `test -f 'gkr-buffer.c' || echo '$(srcdir)/'`gkr-buffer.c
+
+libgkr_module_common_la-gkr-secure-memory.lo: gkr-secure-memory.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_module_common_la_CFLAGS) $(CFLAGS) -MT libgkr_module_common_la-gkr-secure-memory.lo -MD -MP -MF "$(DEPDIR)/libgkr_module_common_la-gkr-secure-memory.Tpo" -c -o libgkr_module_common_la-gkr-secure-memory.lo `test -f 'gkr-secure-memory.c' || echo '$(srcdir)/'`gkr-secure-memory.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgkr_module_common_la-gkr-secure-memory.Tpo" "$(DEPDIR)/libgkr_module_common_la-gkr-secure-memory.Plo"; else rm -f "$(DEPDIR)/libgkr_module_common_la-gkr-secure-memory.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gkr-secure-memory.c' object='libgkr_module_common_la-gkr-secure-memory.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_module_common_la_CFLAGS) $(CFLAGS) -c -o libgkr_module_common_la-gkr-secure-memory.lo `test -f 'gkr-secure-memory.c' || echo '$(srcdir)/'`gkr-secure-memory.c
+
+libgkr_module_common_la-gkr-unix-credentials.lo: gkr-unix-credentials.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_module_common_la_CFLAGS) $(CFLAGS) -MT libgkr_module_common_la-gkr-unix-credentials.lo -MD -MP -MF "$(DEPDIR)/libgkr_module_common_la-gkr-unix-credentials.Tpo" -c -o libgkr_module_common_la-gkr-unix-credentials.lo `test -f 'gkr-unix-credentials.c' || echo '$(srcdir)/'`gkr-unix-credentials.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgkr_module_common_la-gkr-unix-credentials.Tpo" "$(DEPDIR)/libgkr_module_common_la-gkr-unix-credentials.Plo"; else rm -f "$(DEPDIR)/libgkr_module_common_la-gkr-unix-credentials.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gkr-unix-credentials.c' object='libgkr_module_common_la-gkr-unix-credentials.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgkr_module_common_la_CFLAGS) $(CFLAGS) -c -o libgkr_module_common_la-gkr-unix-credentials.lo `test -f 'gkr-unix-credentials.c' || echo '$(srcdir)/'`gkr-unix-credentials.c
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
 
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -547,7 +566,8 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -591,8 +611,8 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -617,8 +637,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEP
 	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; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -628,12 +648,13 @@ ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	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; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -647,21 +668,22 @@ 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'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -675,7 +697,7 @@ distdir: $(DISTFILES)
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -683,8 +705,6 @@ distdir: $(DISTFILES)
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -727,7 +747,7 @@ distclean: distclean-recursive
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-libtool distclean-tags
 
 dvi: dvi-recursive
 
@@ -741,20 +761,12 @@ info-am:
 
 install-data-am:
 
-install-dvi: install-dvi-recursive
-
 install-exec-am:
 
-install-html: install-html-recursive
-
 install-info: install-info-recursive
 
 install-man:
 
-install-pdf: install-pdf-recursive
-
-install-ps: install-ps-recursive
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -775,25 +787,23 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am:
+uninstall-am: uninstall-info-am
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+uninstall-info: uninstall-info-recursive
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	clean-noinstLTLIBRARIES ctags ctags-recursive distclean \
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+	clean clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	clean-recursive ctags ctags-recursive 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-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
+	distclean-recursive distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic maintainer-clean-recursive \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
+	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am uninstall-info-am
 
 	-I$(top_builddir) 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
