diff options
Diffstat (limited to 'mount/Makefile.standalone')
| -rw-r--r-- | mount/Makefile.standalone | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/mount/Makefile.standalone b/mount/Makefile.standalone index 2cedcd235..1be375689 100644 --- a/mount/Makefile.standalone +++ b/mount/Makefile.standalone @@ -5,7 +5,7 @@ # For now: a standalone version CC = gcc -CFLAGS = -O2 +CFLAGS = -O2 -I../lib #WARNFLAGS = -Wall -Wstrict-prototypes # We really want @@ -23,11 +23,11 @@ RPC_CFLAGS = -Wno-unused RPCGEN = rpcgen INSTALL = install -INSTALL_SUID = $(INSTALL) -m 4755 -o root -INSTALL_PROG = $(INSTALL) -m 755 -INSTALL_DATA = $(INSTALL) -m 644 -INSTALL_DIR = mkdir -p -INSTALL_MAN = $(INSTALL_DATA) +INSTALLSUID = $(INSTALL) -m 4755 -o root +INSTALLPROG = $(INSTALL) -m 755 +INSTALLDATA = $(INSTALL) -m 644 +INSTALLDIR = mkdir -p +INSTALLMAN = $(INSTALLDATA) MANDIR = /usr/man ## for suid progs (mount, umount) @@ -57,21 +57,22 @@ LO_OBJS=lomount.o all: $(PROGS) install: $(PROGS) - $(INSTALL_DIR) $(BINDIR) $(SBINDIR) - $(INSTALL_SUID) -s $(SUID_PROGS) $(BINDIR) - $(INSTALL_PROG) -s $(NOSUID_PROGS) $(SBINDIR) + $(INSTALLDIR) $(BINDIR) $(SBINDIR) + $(INSTALLSUID) -s $(SUID_PROGS) $(BINDIR) + $(INSTALLPROG) -s $(NOSUID_PROGS) $(SBINDIR) (cd $(SBINDIR); ln -sf swapon swapoff) - $(INSTALL_DIR) $(MANDIR)/man5 $(MANDIR)/man8 - $(INSTALL_MAN) $(MAN5) $(MANDIR)/man5 - $(INSTALL_MAN) $(MAN8) $(MANDIR)/man8 + $(INSTALLDIR) $(MANDIR)/man5 $(MANDIR)/man8 + $(INSTALLMAN) $(MAN5) $(MANDIR)/man5 + $(INSTALLMAN) $(MAN8) $(MANDIR)/man8 %.o: %.c $(COMPILE) $< -mount: mount.o fstab.o sundries.o realpath.o version.o $(NFS_OBJS) $(LO_OBJS) +mount: mount.o fstab.o sundries.o realpath.o mntent.o version.o \ + mount_guess_fstype.o mount_by_label.o ../lib/setproctitle.o $(NFS_OBJS) $(LO_OBJS) $(LINK) $^ -o $@ -umount: umount.o fstab.o sundries.o realpath.o version.o $(LO_OBJS) +umount: umount.o fstab.o sundries.o realpath.o mntent.o version.o $(LO_OBJS) $(LINK) $^ -o $@ swapon: swapon.o version.o @@ -84,14 +85,20 @@ mount.o umount.o nfsmount.o losetup.o fstab.o sundries.o: sundries.h mount.o umount.o fstab.o sundries.o: fstab.h -mount.o umount.o losetup.o: lomount.h loop.h +mount.o fstab.o mntent.o: mntent.h -swapon.o: swap.h swapargs.h +mount.o mount_guess_fstype.o: mount_guess_fstype.h + +mount.o umount.o losetup.o lomount.o: lomount.h loop.h + +swapon.o: swap_constants.h swapargs.h sundries.o nfsmount.o nfsmount_xdr.o nfsmount_clnt.o: nfsmount.h umount.o: mount_constants.h +mount.o mount_by_label.o mount_guess_fstype.o: linux_fs.h + nfsmount_clnt.o: nfsmount_clnt.c $(COMPILE) $(RPC_CFLAGS) nfsmount_clnt.c @@ -110,8 +117,6 @@ nfsmount.x: nfsmount.o: nfs_mountversion.h nfs_mount3.h NFSMOUNTH=/usr/include/linux/nfs_mount.h -SWAPH=/usr/include/linux/swap.h -LOOPH=/usr/include/linux/loop.h nfs_mountversion.h: rm -f nfs_mountversion.h @@ -122,20 +127,15 @@ nfs_mountversion.h: echo '#define KERNEL_NFS_MOUNT_VERSION 0'; \ fi > nfs_mountversion.h -swap.h: - rm -f swap.h - if [ -f $(SWAPH) ]; then cp $(SWAPH) .; else touch swap.h; fi - swapargs.h: sh swap.configure loop.h: - rm -f loop.h - if [ -f $(LOOPH) ]; then cp $(LOOPH) .; else touch loop.h; fi + sh mk_loop_h clean: rm -f a.out core *~ *.o swapargs.h $(PROGS) swapoff - rm -f swap.h loop.h nfs_mountversion.h + rm -f loop.h nfs_mountversion.h clobber distclean realclean: clean rm -f $(GEN_FILES) |