X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils%2Fmount%2FMakefile.am;h=5810936893985c6274f2e09fa1da0fc42de842ee;hb=020fc9855c69f74361a416be357fb882e80dcdd8;hp=cdd78d8daa0fe90a101ca760c0841f1807100dc2;hpb=16db99b56a532bf56fa27618a6ef30763cd9006f;p=nfs-utils.git

diff --git a/utils/mount/Makefile.am b/utils/mount/Makefile.am
index cdd78d8..5810936 100644
--- 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,11 +9,33 @@ man5_MANS	= nfs.man
 
 sbin_PROGRAMS	= mount.nfs
 EXTRA_DIST = nfsmount.x $(man8_MANS) $(man5_MANS)
-mount_nfs_SOURCES = mount.c nfsmount.c nfs4mount.c nfsumount.c \
-		  mount_constants.h nfs4_mount.h nfs_mount4.h
+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
 
 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
 
@@ -21,7 +43,8 @@ install-exec-hook:
 	(cd $(DESTDIR)$(sbindir) && \
 	  ln -sf mount.nfs mount.nfs4 && \
 	  ln -sf mount.nfs umount.nfs && \
-	  ln -sf mount.nfs umount.nfs4)
+	  ln -sf mount.nfs umount.nfs4 && \
+	  chmod 4511 mount.nfs )
 uninstall-hook:
 	(cd $(DESTDIR)$(sbindir) && \
 	    rm -f mount.nfs4 umount.nfs umount.nfs4)