Remove a whole bunch of "CFLAGS+= -DFSNAME" cruft. It hasn't been

needed for ages, but keeps getting cut/pasted into new Makefiles.
(Once apon a time it was used to activate mount arguments in
 <sys/mount.h>, but that was killed with extreme prejudice long ago)

15 files changed, 3 insertions, 24 deletions

diff --git a/sys/modules/cd9660/Makefile b/sys/modules/cd9660/Makefile
index fd32c1c97a7e..8443e318d824 100644
--- a/sys/modules/cd9660/Makefile
+++ b/sys/modules/cd9660/Makefile
@@ -6,6 +6,5 @@ SRCS=	vnode_if.h \
 	cd9660_bmap.c cd9660_lookup.c cd9660_node.c cd9660_rrip.c \
 	cd9660_util.c cd9660_vfsops.c cd9660_vnops.c
 NOMAN=
-CFLAGS+= -DCD9660
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/hpfs/Makefile b/sys/modules/hpfs/Makefile
index 05d71b4c9c80..9e10cd22cd98 100644
--- a/sys/modules/hpfs/Makefile
+++ b/sys/modules/hpfs/Makefile
@@ -4,12 +4,7 @@
 KMOD=	hpfs
 SRCS=	vnode_if.h \
 	hpfs_vfsops.c hpfs_vnops.c hpfs_hash.c hpfs_subr.c hpfs_lookup.c \
-	hpfs_alsubr.c opt_vmpage.h
+	hpfs_alsubr.c
 NOMAN=
-CFLAGS+= -DHPFS
-CLEANFILES= opt_vmpage.h
-
-opt_vmpage.h:
-	touch ${.TARGET}
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/kernfs/Makefile b/sys/modules/kernfs/Makefile
index 287db6965166..cf28e6ca5f47 100644
--- a/sys/modules/kernfs/Makefile
+++ b/sys/modules/kernfs/Makefile
@@ -5,6 +5,5 @@ KMOD=	kernfs
 SRCS=	vnode_if.h \
 	kernfs_vfsops.c kernfs_vnops.c
 NOMAN=
-CFLAGS+= -DKERNFS
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/msdos/Makefile b/sys/modules/msdos/Makefile
index 8d40861e00d8..1ac0016ca6f6 100644
--- a/sys/modules/msdos/Makefile
+++ b/sys/modules/msdos/Makefile
@@ -6,6 +6,5 @@ SRCS=	vnode_if.h \
 	msdosfs_conv.c msdosfs_denode.c msdosfs_fat.c msdosfs_lookup.c \
 	msdosfs_vfsops.c msdosfs_vnops.c
 NOMAN=
-CFLAGS+= -DMSDOSFS
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/msdosfs/Makefile b/sys/modules/msdosfs/Makefile
index 8d40861e00d8..1ac0016ca6f6 100644
--- a/sys/modules/msdosfs/Makefile
+++ b/sys/modules/msdosfs/Makefile
@@ -6,6 +6,5 @@ SRCS=	vnode_if.h \
 	msdosfs_conv.c msdosfs_denode.c msdosfs_fat.c msdosfs_lookup.c \
 	msdosfs_vfsops.c msdosfs_vnops.c
 NOMAN=
-CFLAGS+= -DMSDOSFS
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/nfs/Makefile b/sys/modules/nfs/Makefile
index e40b13a85879..34d4006a038f 100644
--- a/sys/modules/nfs/Makefile
+++ b/sys/modules/nfs/Makefile
@@ -8,7 +8,6 @@ SRCS=	vnode_if.h \
 	nfs_vnops.c opt_inet.h opt_nfs.h opt_vmpage.h opt_bootp.h
 NFS_INET?=	1	# 0/1 - requires INET to be configured in kernel
 NOMAN=
-CFLAGS+= -DNFS
 
 opt_inet.h:
 	touch ${.TARGET}
diff --git a/sys/modules/nfsclient/Makefile b/sys/modules/nfsclient/Makefile
index e40b13a85879..34d4006a038f 100644
--- a/sys/modules/nfsclient/Makefile
+++ b/sys/modules/nfsclient/Makefile
@@ -8,7 +8,6 @@ SRCS=	vnode_if.h \
 	nfs_vnops.c opt_inet.h opt_nfs.h opt_vmpage.h opt_bootp.h
 NFS_INET?=	1	# 0/1 - requires INET to be configured in kernel
 NOMAN=
-CFLAGS+= -DNFS
 
 opt_inet.h:
 	touch ${.TARGET}
diff --git a/sys/modules/nfsserver/Makefile b/sys/modules/nfsserver/Makefile
index e40b13a85879..34d4006a038f 100644
--- a/sys/modules/nfsserver/Makefile
+++ b/sys/modules/nfsserver/Makefile
@@ -8,7 +8,6 @@ SRCS=	vnode_if.h \
 	nfs_vnops.c opt_inet.h opt_nfs.h opt_vmpage.h opt_bootp.h
 NFS_INET?=	1	# 0/1 - requires INET to be configured in kernel
 NOMAN=
-CFLAGS+= -DNFS
 
 opt_inet.h:
 	touch ${.TARGET}
diff --git a/sys/modules/ntfs/Makefile b/sys/modules/ntfs/Makefile
index 5482847011e9..d13373b7e29d 100644
--- a/sys/modules/ntfs/Makefile
+++ b/sys/modules/ntfs/Makefile
@@ -4,8 +4,7 @@
 KMOD=	ntfs
 SRCS=	vnode_if.h \
 	ntfs_vfsops.c ntfs_vnops.c ntfs_subr.c ntfs_ihash.c \
-	ntfs_compr.c opt_vmpage.h
+	ntfs_compr.c
 NOMAN=
-CFLAGS+= -DNTFS
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/nwfs/Makefile b/sys/modules/nwfs/Makefile
index 72fee15b8d1d..0f8471f7a90d 100644
--- a/sys/modules/nwfs/Makefile
+++ b/sys/modules/nwfs/Makefile
@@ -11,8 +11,6 @@ SRCS=	vnode_if.h \
 
 NOMAN=true
 
-CFLAGS+= -DNWFS
-
 .if defined(VNPRINT)
 CFLAGS+= -DVNPRINT
 .endif
diff --git a/sys/modules/portal/Makefile b/sys/modules/portal/Makefile
index 2a529e425301..5cc476778021 100644
--- a/sys/modules/portal/Makefile
+++ b/sys/modules/portal/Makefile
@@ -5,6 +5,5 @@ KMOD=	portal
 SRCS=	vnode_if.h \
 	portal_vfsops.c portal_vnops.c
 NOMAN=
-CFLAGS+= -DPORTAL
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/portalfs/Makefile b/sys/modules/portalfs/Makefile
index 2a529e425301..5cc476778021 100644
--- a/sys/modules/portalfs/Makefile
+++ b/sys/modules/portalfs/Makefile
@@ -5,6 +5,5 @@ KMOD=	portal
 SRCS=	vnode_if.h \
 	portal_vfsops.c portal_vnops.c
 NOMAN=
-CFLAGS+= -DPORTAL
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/procfs/Makefile b/sys/modules/procfs/Makefile
index 21369ed6dfc0..28d899028451 100644
--- a/sys/modules/procfs/Makefile
+++ b/sys/modules/procfs/Makefile
@@ -2,12 +2,10 @@
 
 .PATH:	${.CURDIR}/../../miscfs/procfs
 KMOD=	procfs
-SRCS=	vnode_if.h opt_vmpage.h \
+SRCS=	vnode_if.h \
 	procfs_ctl.c procfs_map.c procfs_note.c procfs_rlimit.c \
 	procfs_status.c procfs_subr.c procfs_type.c procfs_vfsops.c \
 	procfs_vnops.c
 NOMAN=
-CFLAGS+= -DPROCFS
-CLEANFILES+=	opt_vmpage.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/union/Makefile b/sys/modules/union/Makefile
index b6b3fb466ad0..6825a6376d91 100644
--- a/sys/modules/union/Makefile
+++ b/sys/modules/union/Makefile
@@ -5,6 +5,5 @@ KMOD=	union
 SRCS=	vnode_if.h \
 	union_subr.c union_vfsops.c union_vnops.c
 NOMAN=
-CFLAGS+=	-DUNION
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/unionfs/Makefile b/sys/modules/unionfs/Makefile
index b6b3fb466ad0..6825a6376d91 100644
--- a/sys/modules/unionfs/Makefile
+++ b/sys/modules/unionfs/Makefile
@@ -5,6 +5,5 @@ KMOD=	union
 SRCS=	vnode_if.h \
 	union_subr.c union_vfsops.c union_vnops.c
 NOMAN=
-CFLAGS+=	-DUNION
 
 .include <bsd.kmod.mk>