From 90665a1b48b1503e7a9ee6d59639c99b1cbdeac6 Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Tue, 7 Jul 1998 02:27:09 +0000 Subject: [PATCH] Finished previous fix - don't forget to add one dummy options header to CLEANFILES. Fixed lots of style bugs. --- lkm/nfs/Makefile | 23 ++++++++++------------- sys/modules/nfs/Makefile | 23 ++++++++++------------- sys/modules/nfsclient/Makefile | 23 ++++++++++------------- sys/modules/nfsserver/Makefile | 23 ++++++++++------------- 4 files changed, 40 insertions(+), 52 deletions(-) diff --git a/lkm/nfs/Makefile b/lkm/nfs/Makefile index a407e676f98..71b19a99db5 100644 --- a/lkm/nfs/Makefile +++ b/lkm/nfs/Makefile @@ -1,26 +1,23 @@ -# $Id: Makefile,v 1.8 1998/06/30 11:29:01 jmg Exp $ +# $Id$ -.PATH: ${.CURDIR}/../../sys/nfs -KMOD= nfs_mod -SRCS= nfs_bio.c nfs_node.c nfs_nqlease.c nfs_serv.c nfs_socket.c \ - nfs_srvcache.c nfs_subs.c nfs_syscalls.c nfs_vfsops.c \ +.PATH: ${.CURDIR}/../../sys/nfs +KMOD= nfs_mod +SRCS= nfs_bio.c nfs_node.c nfs_nqlease.c nfs_serv.c nfs_socket.c \ + nfs_srvcache.c nfs_subs.c nfs_syscalls.c nfs_vfsops.c \ nfs_vnops.c opt_inet.h opt_nfs.h opt_vmpage.h NFS_INET?= 1 # 0/1 - requires INET to be configured in kernel NOMAN= VFS_LKM= - CFLAGS+= -DNFS -CLEANFILES+= opt_inet.h opt_nfs.h +CLEANFILES= opt_inet.h opt_nfs.h opt_vmpage.h opt_inet.h: - touch opt_inet.h + touch ${.TARGET} .if ${NFS_INET} > 0 - echo "#define INET 1" > opt_inet.h + echo "#define INET 1" > ${.TARGET} .endif -opt_nfs.h: - touch opt_nfs.h -opt_vmpage.h: - touch opt_vmpage.h +opt_nfs.h opt_vmpage.h: + touch ${.TARGET} .include diff --git a/sys/modules/nfs/Makefile b/sys/modules/nfs/Makefile index a407e676f98..71b19a99db5 100644 --- a/sys/modules/nfs/Makefile +++ b/sys/modules/nfs/Makefile @@ -1,26 +1,23 @@ -# $Id: Makefile,v 1.8 1998/06/30 11:29:01 jmg Exp $ +# $Id$ -.PATH: ${.CURDIR}/../../sys/nfs -KMOD= nfs_mod -SRCS= nfs_bio.c nfs_node.c nfs_nqlease.c nfs_serv.c nfs_socket.c \ - nfs_srvcache.c nfs_subs.c nfs_syscalls.c nfs_vfsops.c \ +.PATH: ${.CURDIR}/../../sys/nfs +KMOD= nfs_mod +SRCS= nfs_bio.c nfs_node.c nfs_nqlease.c nfs_serv.c nfs_socket.c \ + nfs_srvcache.c nfs_subs.c nfs_syscalls.c nfs_vfsops.c \ nfs_vnops.c opt_inet.h opt_nfs.h opt_vmpage.h NFS_INET?= 1 # 0/1 - requires INET to be configured in kernel NOMAN= VFS_LKM= - CFLAGS+= -DNFS -CLEANFILES+= opt_inet.h opt_nfs.h +CLEANFILES= opt_inet.h opt_nfs.h opt_vmpage.h opt_inet.h: - touch opt_inet.h + touch ${.TARGET} .if ${NFS_INET} > 0 - echo "#define INET 1" > opt_inet.h + echo "#define INET 1" > ${.TARGET} .endif -opt_nfs.h: - touch opt_nfs.h -opt_vmpage.h: - touch opt_vmpage.h +opt_nfs.h opt_vmpage.h: + touch ${.TARGET} .include diff --git a/sys/modules/nfsclient/Makefile b/sys/modules/nfsclient/Makefile index a407e676f98..71b19a99db5 100644 --- a/sys/modules/nfsclient/Makefile +++ b/sys/modules/nfsclient/Makefile @@ -1,26 +1,23 @@ -# $Id: Makefile,v 1.8 1998/06/30 11:29:01 jmg Exp $ +# $Id$ -.PATH: ${.CURDIR}/../../sys/nfs -KMOD= nfs_mod -SRCS= nfs_bio.c nfs_node.c nfs_nqlease.c nfs_serv.c nfs_socket.c \ - nfs_srvcache.c nfs_subs.c nfs_syscalls.c nfs_vfsops.c \ +.PATH: ${.CURDIR}/../../sys/nfs +KMOD= nfs_mod +SRCS= nfs_bio.c nfs_node.c nfs_nqlease.c nfs_serv.c nfs_socket.c \ + nfs_srvcache.c nfs_subs.c nfs_syscalls.c nfs_vfsops.c \ nfs_vnops.c opt_inet.h opt_nfs.h opt_vmpage.h NFS_INET?= 1 # 0/1 - requires INET to be configured in kernel NOMAN= VFS_LKM= - CFLAGS+= -DNFS -CLEANFILES+= opt_inet.h opt_nfs.h +CLEANFILES= opt_inet.h opt_nfs.h opt_vmpage.h opt_inet.h: - touch opt_inet.h + touch ${.TARGET} .if ${NFS_INET} > 0 - echo "#define INET 1" > opt_inet.h + echo "#define INET 1" > ${.TARGET} .endif -opt_nfs.h: - touch opt_nfs.h -opt_vmpage.h: - touch opt_vmpage.h +opt_nfs.h opt_vmpage.h: + touch ${.TARGET} .include diff --git a/sys/modules/nfsserver/Makefile b/sys/modules/nfsserver/Makefile index a407e676f98..71b19a99db5 100644 --- a/sys/modules/nfsserver/Makefile +++ b/sys/modules/nfsserver/Makefile @@ -1,26 +1,23 @@ -# $Id: Makefile,v 1.8 1998/06/30 11:29:01 jmg Exp $ +# $Id$ -.PATH: ${.CURDIR}/../../sys/nfs -KMOD= nfs_mod -SRCS= nfs_bio.c nfs_node.c nfs_nqlease.c nfs_serv.c nfs_socket.c \ - nfs_srvcache.c nfs_subs.c nfs_syscalls.c nfs_vfsops.c \ +.PATH: ${.CURDIR}/../../sys/nfs +KMOD= nfs_mod +SRCS= nfs_bio.c nfs_node.c nfs_nqlease.c nfs_serv.c nfs_socket.c \ + nfs_srvcache.c nfs_subs.c nfs_syscalls.c nfs_vfsops.c \ nfs_vnops.c opt_inet.h opt_nfs.h opt_vmpage.h NFS_INET?= 1 # 0/1 - requires INET to be configured in kernel NOMAN= VFS_LKM= - CFLAGS+= -DNFS -CLEANFILES+= opt_inet.h opt_nfs.h +CLEANFILES= opt_inet.h opt_nfs.h opt_vmpage.h opt_inet.h: - touch opt_inet.h + touch ${.TARGET} .if ${NFS_INET} > 0 - echo "#define INET 1" > opt_inet.h + echo "#define INET 1" > ${.TARGET} .endif -opt_nfs.h: - touch opt_nfs.h -opt_vmpage.h: - touch opt_vmpage.h +opt_nfs.h opt_vmpage.h: + touch ${.TARGET} .include