Merge branch 'upstream'

[nfs-utils.git] / linux-nfs / Makefile.in

diff --git a/linux-nfs/Makefile.in b/linux-nfs/Makefile.in
index 813b53b3cf1ee2cf03b92ab0a3ae9f4fd4808884..dfdec9e5b39a8cf49fb7b09ec70217fccaa310a3 100644 (file)
--- a/linux-nfs/Makefile.in
+++ b/linux-nfs/Makefile.in
@@ -36,9 +36,15 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        ChangeLog INSTALL THANKS TODO
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/aclocal/bsdsignals.m4 \
+       $(top_srcdir)/aclocal/ipv6.m4 \
        $(top_srcdir)/aclocal/kerberos5.m4 \
        $(top_srcdir)/aclocal/libblkid.m4 \
+       $(top_srcdir)/aclocal/libevent.m4 \
+       $(top_srcdir)/aclocal/libnfsidmap.m4 \
+       $(top_srcdir)/aclocal/librpcsecgss.m4 \
+       $(top_srcdir)/aclocal/libtirpc.m4 \
        $(top_srcdir)/aclocal/nfs-utils.m4 \
+       $(top_srcdir)/aclocal/rpcsec_vers.m4 \
        $(top_srcdir)/aclocal/tcp-wrappers.m4 \
        $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -76,6 +82,7 @@ CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -118,6 +125,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -195,6 +203,7 @@ statduser = @statduser@
 statedir = @statedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 EXTRA_DIST = ChangeLog INSTALL KNOWNBUGS NEW README THANKS TODO