Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/modules/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/modules/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.10
retrieving revision 1.10.2.3
diff -u -p -r1.10 -r1.10.2.3
--- src/sys/modules/Makefile	2008/09/23 07:56:59	1.10
+++ src/sys/modules/Makefile	2009/04/28 07:37:16	1.10.2.3
@@ -1,45 +1,98 @@
-# $NetBSD: Makefile,v 1.10 2008/09/23 07:56:59 hannken Exp $
+#	$NetBSD: Makefile,v 1.10.2.3 2009/04/28 07:37:16 skrll Exp $
 
-SUBDIR=		miniroot
-SUBDIR+=	fss
-SUBDIR+=	putter
-
-.if ${MACHINE} == "i386" || ${MACHINE} == "amd64"
-SUBDIR+=	azalia drm i915drm
-.endif
-.if ${MACHINE} == "i386"
-SUBDIR+=	radeondrm
-.endif
+# For all platforms
 
-# file systems
+SUBDIR=		accf_dataready
+SUBDIR+=	accf_httpready
 SUBDIR+=	adosfs
+SUBDIR+=	aio
 SUBDIR+=	cd9660
 SUBDIR+=	coda
 SUBDIR+=	coda5
+SUBDIR+=	compat
+SUBDIR+=	compat_ossaudio
+SUBDIR+=	coredump
 SUBDIR+=	efs
 SUBDIR+=	ext2fs
+SUBDIR+=	exec_script
 SUBDIR+=	fdesc
 SUBDIR+=	ffs
-SUBDIR+=	filecorefs
+SUBDIR+=	filecore
+SUBDIR+=	fss
 SUBDIR+=	hfs
 SUBDIR+=	kernfs
+SUBDIR+=	ksem
+SUBDIR+=	layerfs
 SUBDIR+=	lfs
 SUBDIR+=	mfs
-SUBDIR+=	msdosfs
+SUBDIR+=	msdos
+SUBDIR+=	nfs
+SUBDIR+=	nfsserver
 SUBDIR+=	ntfs
-SUBDIR+=	nullfs
+SUBDIR+=	null
 SUBDIR+=	overlay
 SUBDIR+=	portal
+SUBDIR+=	ppp_bsdcomp
+SUBDIR+=	ppp_deflate
 SUBDIR+=	procfs
 SUBDIR+=	ptyfs
 SUBDIR+=	puffs
+SUBDIR+=	putter
+SUBDIR+=	miniroot
 SUBDIR+=	smbfs
+SUBDIR+=	sysvbfs
 SUBDIR+=	tmpfs
 SUBDIR+=	udf
-SUBDIR+=	umapfs
+SUBDIR+=	umap
 SUBDIR+=	union
+SUBDIR+=	vnd
+SUBDIR+=	tprof
 .if (defined(NOTYET))
 SUBDIR+=	unionfs
 .endif
 
+# Machine dependent section
+.if ${MACHINE_ARCH} != "alpha"
+SUBDIR+=	exec_elf32
+.endif
+
+.if ${MACHINE_ARCH} == "alpha" || \
+    ${MACHINE_ARCH} == "sparc64" || \
+    ${MACHINE_ARCH} == "x86_64"
+SUBDIR+=	exec_elf64
+.endif
+
+.if ${MACHINE_ARCH} == "i386" || \
+    ${MACHINE_ARCH} == "x86_64"
+SUBDIR+=	tprof_pmi
+.endif
+
+.if ${MACHINE_ARCH} == "x86_64"
+SUBDIR+=	azalia
+SUBDIR+=	compat_linux
+SUBDIR+=	compat_linux32
+SUBDIR+=	compat_netbsd32
+SUBDIR+=	drm
+SUBDIR+=	i915drm
+.endif
+
+.if ${MACHINE_ARCH} == "i386"
+SUBDIR+=	azalia
+SUBDIR+=	compat_freebsd
+SUBDIR+=	compat_ibcs2
+SUBDIR+=	compat_linux
+SUBDIR+=	compat_svr4
+SUBDIR+=	drm
+SUBDIR+=	exec_aout
+SUBDIR+=	i915drm
+SUBDIR+=	radeondrm
+.endif
+
+.include <bsd.own.mk>
+
+# we need our device mapper for LVM
+.if (${MKLVM} != "no")
+SUBDIR+= 	dm
+.endif
+
 .include <bsd.subdir.mk>