-EXTRA_DIST = nfsmount.x $(man8_MANS)
-mount_nfs_SOURCES = mount.c nfsmount.c nfs4mount.c nfsumount.c \
- mount_constants.h nfs4_mount.h nfs_mount4.h
+EXTRA_DIST = nfsmount.x $(man8_MANS) $(man5_MANS)
+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
+
+if MOUNT_CONFIG
+mount_common += configfile.c
+man5_MANS += nfsmount.conf.man
+EXTRA_DIST += nfsmount.conf
+endif