proper merge

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

diff --git a/utils/mount/Makefile.in b/utils/mount/Makefile.in
index e5a366e04d588a5bd49ac236b58398379d53936f..07ef240e1fbf17bd349eed3081c94780623e1e3f 100644 (file)
--- a/utils/mount/Makefile.in
+++ b/utils/mount/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38,16 +38,22 @@ sbin_PROGRAMS = mount.nfs$(EXEEXT)
 @MOUNT_CONFIG_TRUE@am__append_1 = configfile.c
 @MOUNT_CONFIG_TRUE@am__append_2 = nfsmount.conf.man
 @MOUNT_CONFIG_TRUE@am__append_3 = nfsmount.conf
+@CONFIG_LIBMOUNT_TRUE@am__append_4 = mount_libmount.c
+@CONFIG_LIBMOUNT_TRUE@am__append_5 = $(LIBMOUNT)
+@CONFIG_LIBMOUNT_FALSE@am__append_6 = mount.c fstab.c nfsumount.c fstab.h
 subdir = utils/mount
 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/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/libsqlite3.m4 \
        $(top_srcdir)/aclocal/libtirpc.m4 \
        $(top_srcdir)/aclocal/nfs-utils.m4 \
        $(top_srcdir)/aclocal/rpcsec_vers.m4 \
@@ -62,20 +68,28 @@ CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man5dir)" \
        "$(DESTDIR)$(man8dir)"
 PROGRAMS = $(sbin_PROGRAMS)
-am__mount_nfs_SOURCES_DIST = mount.c error.c network.c fstab.c token.c \
-       parse_opt.c parse_dev.c nfsmount.c nfs4mount.c stropts.c \
-       nfsumount.c mount_constants.h error.h network.h fstab.h \
-       token.h parse_opt.h parse_dev.h nfs4_mount.h nfs_mount4.h \
-       stropts.h version.h mount_config.h configfile.c
+am__mount_nfs_SOURCES_DIST = error.c network.c token.c parse_opt.c \
+       parse_dev.c nfsmount.c nfs4mount.c stropts.c mount_constants.h \
+       error.h network.h token.h parse_opt.h parse_dev.h nfs4_mount.h \
+       nfs_mount4.h stropts.h version.h mount_config.h utils.c \
+       utils.h configfile.c mount_libmount.c mount.c fstab.c \
+       nfsumount.c fstab.h
 @MOUNT_CONFIG_TRUE@am__objects_1 = configfile.$(OBJEXT)
-am_mount_nfs_OBJECTS = mount.$(OBJEXT) error.$(OBJEXT) \
-       network.$(OBJEXT) fstab.$(OBJEXT) token.$(OBJEXT) \
+am__objects_2 = error.$(OBJEXT) network.$(OBJEXT) token.$(OBJEXT) \
        parse_opt.$(OBJEXT) parse_dev.$(OBJEXT) nfsmount.$(OBJEXT) \
-       nfs4mount.$(OBJEXT) stropts.$(OBJEXT) nfsumount.$(OBJEXT) \
+       nfs4mount.$(OBJEXT) stropts.$(OBJEXT) utils.$(OBJEXT) \
        $(am__objects_1)
+@CONFIG_LIBMOUNT_TRUE@am__objects_3 = mount_libmount.$(OBJEXT)
+@CONFIG_LIBMOUNT_FALSE@am__objects_4 = mount.$(OBJEXT) fstab.$(OBJEXT) \
+@CONFIG_LIBMOUNT_FALSE@        nfsumount.$(OBJEXT)
+am_mount_nfs_OBJECTS = $(am__objects_2) $(am__objects_3) \
+       $(am__objects_4)
 mount_nfs_OBJECTS = $(am_mount_nfs_OBJECTS)
+am__DEPENDENCIES_1 =
+@CONFIG_LIBMOUNT_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 mount_nfs_DEPENDENCIES = ../../support/nfs/libnfs.a \
-       ../../support/export/libexport.a
+       ../../support/export/libexport.a $(am__DEPENDENCIES_1) \
+       $(am__DEPENDENCIES_2)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -146,6 +160,7 @@ CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -176,11 +191,19 @@ LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
 LIBBLKID = @LIBBLKID@
 LIBBSD = @LIBBSD@
+LIBCAP = @LIBCAP@
 LIBCRYPT = @LIBCRYPT@
+LIBDL = @LIBDL@
+LIBEVENT = @LIBEVENT@
+LIBKEYUTILS = @LIBKEYUTILS@
+LIBMOUNT = @LIBMOUNT@
+LIBNFSIDMAP = @LIBNFSIDMAP@
 LIBNSL = @LIBNSL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOCKET = @LIBSOCKET@
+LIBSQLITE = @LIBSQLITE@
+LIBTIRPC = @LIBTIRPC@
 LIBTOOL = @LIBTOOL@
 LIBWRAP = @LIBWRAP@
 LIPO = @LIPO@
@@ -188,6 +211,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -200,9 +224,12 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 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@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 RELEASE = @RELEASE@
 RPCGEN_PATH = @RPCGEN_PATH@
@@ -218,6 +245,7 @@ abs_builddir = @abs_builddir@
 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@
@@ -240,8 +268,8 @@ dvidir = @dvidir@
 enable_gss = @enable_gss@
 enable_ipv6 = @enable_ipv6@
 enable_mountconfig = @enable_mountconfig@
-enable_nfsv3 = @enable_nfsv3@
 enable_nfsv4 = @enable_nfsv4@
+enable_nfsv41 = @enable_nfsv41@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
@@ -257,7 +285,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 mountfile = @mountfile@
@@ -273,6 +300,7 @@ sbindir = /sbin
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 startstatd = @startstatd@
+statdpath = @statdpath@
 statduser = @statduser@
 statedir = @statedir@
 sysconfdir = @sysconfdir@
@@ -283,14 +311,14 @@ top_srcdir = @top_srcdir@
 man8_MANS = mount.nfs.man umount.nfs.man
 man5_MANS = nfs.man $(am__append_2)
 EXTRA_DIST = nfsmount.x $(man8_MANS) $(man5_MANS) $(am__append_3)
-mount_nfs_SOURCES = mount.c error.c network.c fstab.c token.c \
-       parse_opt.c parse_dev.c nfsmount.c nfs4mount.c stropts.c \
-       nfsumount.c mount_constants.h error.h network.h fstab.h \
-       token.h parse_opt.h parse_dev.h nfs4_mount.h nfs_mount4.h \
-       stropts.h version.h mount_config.h $(am__append_1)
+mount_common = error.c network.c token.c parse_opt.c parse_dev.c \
+       nfsmount.c nfs4mount.c stropts.c mount_constants.h error.h \
+       network.h token.h parse_opt.h parse_dev.h nfs4_mount.h \
+       nfs_mount4.h stropts.h version.h mount_config.h utils.c \
+       utils.h $(am__append_1)
 mount_nfs_LDADD = ../../support/nfs/libnfs.a \
-                 ../../support/export/libexport.a
-
+       ../../support/export/libexport.a $(LIBTIRPC) $(am__append_5)
+mount_nfs_SOURCES = $(mount_common) $(am__append_4) $(am__append_6)
 MAINTAINERCLEANFILES = Makefile.in
 all: all-am
 
@@ -383,6 +411,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstab.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount_libmount.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nfs4mount.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nfsmount.Po@am__quote@
@@ -391,6 +420,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse_opt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stropts.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/token.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<