Merge branch 'upstream'

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

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 231b77bb8d925ca0764abf9b11c060490858433c..335958d8193456d30dd80f8de03e9c38ecd045ab 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -40,12 +40,18 @@ 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 \
 am__aclocal_m4_deps = $(top_srcdir)/aclocal/bsdsignals.m4 \
        $(top_srcdir)/aclocal/ipv6.m4 \
        $(top_srcdir)/aclocal/kerberos5.m4 \

+       $(top_srcdir)/aclocal/keyutils.m4 \

        $(top_srcdir)/aclocal/libblkid.m4 \
        $(top_srcdir)/aclocal/libcap.m4 \
        $(top_srcdir)/aclocal/libevent.m4 \
        $(top_srcdir)/aclocal/libnfsidmap.m4 \
        $(top_srcdir)/aclocal/librpcsecgss.m4 \
        $(top_srcdir)/aclocal/libtirpc.m4 \
        $(top_srcdir)/aclocal/libblkid.m4 \
        $(top_srcdir)/aclocal/libcap.m4 \
        $(top_srcdir)/aclocal/libevent.m4 \
        $(top_srcdir)/aclocal/libnfsidmap.m4 \
        $(top_srcdir)/aclocal/librpcsecgss.m4 \
        $(top_srcdir)/aclocal/libtirpc.m4 \

+       $(top_srcdir)/aclocal/libtool.m4 \
+       $(top_srcdir)/aclocal/ltoptions.m4 \
+       $(top_srcdir)/aclocal/ltsugar.m4 \
+       $(top_srcdir)/aclocal/ltversion.m4 \
+       $(top_srcdir)/aclocal/lt~obsolete.m4 \

        $(top_srcdir)/aclocal/nfs-utils.m4 \
        $(top_srcdir)/aclocal/rpcsec_vers.m4 \
        $(top_srcdir)/aclocal/tcp-wrappers.m4 \
        $(top_srcdir)/aclocal/nfs-utils.m4 \
        $(top_srcdir)/aclocal/rpcsec_vers.m4 \
        $(top_srcdir)/aclocal/tcp-wrappers.m4 \


@@ -72,7 +78,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
        distdir
 ETAGS = etags
 CTAGS = ctags
        distdir
 ETAGS = etags
 CTAGS = ctags

-DIST_SUBDIRS = locktest rpcdebug nlmtest rpcgen
+DIST_SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat rpcgen

 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \


@@ -126,6 +132,7 @@ CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@

+DLLTOOL = @DLLTOOL@

 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@


@@ -158,6 +165,8 @@ LIBBLKID = @LIBBLKID@
 LIBBSD = @LIBBSD@
 LIBCAP = @LIBCAP@
 LIBCRYPT = @LIBCRYPT@
 LIBBSD = @LIBBSD@
 LIBCAP = @LIBCAP@
 LIBCRYPT = @LIBCRYPT@

+LIBKEYUTILS = @LIBKEYUTILS@
+LIBMOUNT = @LIBMOUNT@

 LIBNSL = @LIBNSL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBNSL = @LIBNSL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@


@@ -169,6 +178,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@

+MANIFEST_TOOL = @MANIFEST_TOOL@

 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@


@@ -181,9 +191,12 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@

+PACKAGE_URL = @PACKAGE_URL@

 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

 RANLIB = @RANLIB@
 RELEASE = @RELEASE@
 RPCGEN_PATH = @RPCGEN_PATH@
 RANLIB = @RANLIB@
 RELEASE = @RELEASE@
 RPCGEN_PATH = @RPCGEN_PATH@


@@ -199,6 +212,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@

+ac_ct_AR = @ac_ct_AR@

 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@


@@ -239,7 +253,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@

-lt_ECHO = @lt_ECHO@

 mandir = @mandir@
 mkdir_p = @mkdir_p@
 mountfile = @mountfile@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 mountfile = @mountfile@


@@ -260,7 +273,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 OPTDIRS = $(am__append_1)
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 OPTDIRS = $(am__append_1)

-SUBDIRS = locktest rpcdebug nlmtest $(OPTDIRS)
+SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat $(OPTDIRS)

 MAINTAINERCLEANFILES = Makefile.in
 all: all-recursive
 
 MAINTAINERCLEANFILES = Makefile.in
 all: all-recursive