nfsidmap: Added Error Logging

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

diff --git a/utils/mount/Makefile.am b/utils/mount/Makefile.am
index a9553dc76dea46e3a40f04ee3f693758547bcf1d..7bc3e2bf5b00731289905b229dfc258612c95159 100644 (file)
--- a/utils/mount/Makefile.am
+++ b/utils/mount/Makefile.am
@@ -9,17 +9,16 @@ man5_MANS     = nfs.man
 
 sbin_PROGRAMS  = mount.nfs
 EXTRA_DIST = nfsmount.x $(man8_MANS) $(man5_MANS)
-mount_nfs_SOURCES = mount.c error.c network.c fstab.c token.c \
+mount_common = error.c network.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 \
+                   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
 
 if MOUNT_CONFIG
-mount_nfs_SOURCES += configfile.c
+mount_common += configfile.c
 man5_MANS += nfsmount.conf.man
 EXTRA_DIST += nfsmount.conf
 endif
@@ -27,6 +26,16 @@ endif
 mount_nfs_LDADD = ../../support/nfs/libnfs.a \
                  ../../support/export/libexport.a
 
+mount_nfs_SOURCES = $(mount_common)
+
+if CONFIG_LIBMOUNT
+mount_nfs_SOURCES += mount_libmount.c
+mount_nfs_LDADD += $(LIBMOUNT)
+else
+mount_nfs_SOURCES += mount.c fstab.c nfsumount.c fstab.h
+
+endif
+
 MAINTAINERCLEANFILES = Makefile.in
 
 install-exec-hook: