Merge branch 'upstream'

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

diff --git a/utils/Makefile.in b/utils/Makefile.in
index 34c64df33bff1d78eb2ab3953cff1f24fc078403..c3cfd2867613d6f3945eefe70a317f7c9d9dc93b 100644 (file)
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -35,18 +35,18 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@CONFIG_RQUOTAD_TRUE@am__append_1 = rquotad
-@CONFIG_NFSV4_TRUE@am__append_2 = idmapd
-@CONFIG_GSS_TRUE@am__append_3 = gssd
-@CONFIG_MOUNT_TRUE@am__append_4 = mount
+@CONFIG_NFSV4_TRUE@am__append_1 = idmapd
+@CONFIG_GSS_TRUE@am__append_2 = gssd
+@CONFIG_MOUNT_TRUE@am__append_3 = mount
 subdir = utils
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/aclocal/bsdsignals.m4 \
        $(top_srcdir)/aclocal/kerberos5.m4 \
+       $(top_srcdir)/aclocal/libblkid.m4 \
        $(top_srcdir)/aclocal/nfs-utils.m4 \
        $(top_srcdir)/aclocal/tcp-wrappers.m4 \
-       $(top_srcdir)/configure.in
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -62,8 +62,8 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
        uninstall-recursive
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = exportfs lockd mountd nfsd nfsstat showmount statd \
-       rquotad idmapd gssd mount
+DIST_SUBDIRS = exportfs mountd nfsd nfsstat showmount statd idmapd \
+       gssd mount
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -89,8 +89,8 @@ CONFIG_MOUNT_FALSE = @CONFIG_MOUNT_FALSE@
 CONFIG_MOUNT_TRUE = @CONFIG_MOUNT_TRUE@
 CONFIG_NFSV4_FALSE = @CONFIG_NFSV4_FALSE@
 CONFIG_NFSV4_TRUE = @CONFIG_NFSV4_TRUE@
-CONFIG_RQUOTAD_FALSE = @CONFIG_RQUOTAD_FALSE@
-CONFIG_RQUOTAD_TRUE = @CONFIG_RQUOTAD_TRUE@
+CONFIG_RPCGEN_FALSE = @CONFIG_RPCGEN_FALSE@
+CONFIG_RPCGEN_TRUE = @CONFIG_RPCGEN_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
@@ -129,6 +129,7 @@ KRBLIBS = @KRBLIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBLKID = @LIBBLKID@
 LIBBSD = @LIBBSD@
 LIBCRYPT = @LIBCRYPT@
 LIBNSL = @LIBNSL@
@@ -139,6 +140,9 @@ LIBTOOL = @LIBTOOL@
 LIBWRAP = @LIBWRAP@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -151,8 +155,10 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 RELEASE = @RELEASE@
+RPCGEN_PATH = @RPCGEN_PATH@
 RPCSECGSS_CFLAGS = @RPCSECGSS_CFLAGS@
 RPCSECGSS_LIBS = @RPCSECGSS_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -208,15 +214,14 @@ psdir = @psdir@
 sbindir = @sbindir@
 secure_statd = @secure_statd@
 sharedstatedir = @sharedstatedir@
+startstatd = @startstatd@
 statduser = @statduser@
 statedir = @statedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-OPTDIRS = $(am__append_1) $(am__append_2) $(am__append_3) \
-       $(am__append_4)
+OPTDIRS = $(am__append_1) $(am__append_2) $(am__append_3)
 SUBDIRS = \
        exportfs \
-       lockd \
        mountd \
        nfsd \
        nfsstat \
@@ -228,7 +233,7 @@ MAINTAINERCLEANFILES = Makefile.in
 all: all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
        @for dep in $?; do \
          case '$(am__configure_deps)' in \
            *$$dep*) \
@@ -253,9 +258,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool: