Merge branch 'sid'

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

diff --git a/utils/mount/Makefile.am b/utils/mount/Makefile.am
index 459fa45e21c92e56e6150df4bdb2a9f75b0d56a2..5810936893985c6274f2e09fa1da0fc42de842ee 100644 (file)
--- a/utils/mount/Makefile.am
+++ b/utils/mount/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 # These binaries go in /sbin (not /usr/sbin), and that cannot be
-# overriden at config time.
+# overridden at config time.
 sbindir = /sbin
 
 man8_MANS      = mount.nfs.man umount.nfs.man
@@ -9,16 +9,33 @@ 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
+                   nfs4_mount.h nfs_mount4.h stropts.h version.h \
+                   mount_config.h utils.c utils.h
+
+if MOUNT_CONFIG
+mount_common += configfile.c
+man5_MANS += nfsmount.conf.man
+EXTRA_DIST += nfsmount.conf
+endif
 
 mount_nfs_LDADD = ../../support/nfs/libnfs.a \
-                 ../../support/export/libexport.a
+                 ../../support/export/libexport.a \
+                 $(LIBTIRPC)
+
+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