Module Name: src
Committed By: pooka
Date: Sun Dec 5 16:53:47 UTC 2010
Modified Files:
src/sys/rump/dev/lib: Makefile
src/sys/rump/fs/lib: Makefile
src/sys/rump/net/lib: Makefile
Added Files:
src/sys/rump/dev: Makefile.rumpdevcomp
src/sys/rump/fs: Makefile.rumpfscomp
src/sys/rump/net: Makefile.rumpnetcomp
Removed Files:
src/sys/rump/dev: Makefile.rumpdev
src/sys/rump/fs: Makefile.rumpfs
src/sys/rump/net: Makefile.rumpnet
Log Message:
Rename Makefile.rump${x} to Makefile.rump${x}comp for consistency.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r0 src/sys/rump/dev/Makefile.rumpdev
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/Makefile.rumpdevcomp
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/Makefile
cvs rdiff -u -r1.26 -r0 src/sys/rump/fs/Makefile.rumpfs
cvs rdiff -u -r0 -r1.1 src/sys/rump/fs/Makefile.rumpfscomp
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/fs/lib/Makefile
cvs rdiff -u -r1.7 -r0 src/sys/rump/net/Makefile.rumpnet
cvs rdiff -u -r0 -r1.1 src/sys/rump/net/Makefile.rumpnetcomp
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/net/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/dev/lib/Makefile
diff -u src/sys/rump/dev/lib/Makefile:1.1 src/sys/rump/dev/lib/Makefile:1.2
--- src/sys/rump/dev/lib/Makefile:1.1 Tue Jun 9 16:16:15 2009
+++ src/sys/rump/dev/lib/Makefile Sun Dec 5 16:53:46 2010
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2009/06/09 16:16:15 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2010/12/05 16:53:46 pooka Exp $
#
-.include "${.CURDIR}/../Makefile.rumpdev"
+.include "${.CURDIR}/../Makefile.rumpdevcomp"
SUBDIR+= ${RUMPDEVLIBS}
Index: src/sys/rump/fs/lib/Makefile
diff -u src/sys/rump/fs/lib/Makefile:1.1 src/sys/rump/fs/lib/Makefile:1.2
--- src/sys/rump/fs/lib/Makefile:1.1 Sun Aug 5 22:28:03 2007
+++ src/sys/rump/fs/lib/Makefile Sun Dec 5 16:53:46 2010
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2007/08/05 22:28:03 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2010/12/05 16:53:46 pooka Exp $
#
-.include "${.CURDIR}/../Makefile.rumpfs"
+.include "${.CURDIR}/../Makefile.rumpfscomp"
SUBDIR+= ${RUMPFSLIBS}
Index: src/sys/rump/net/lib/Makefile
diff -u src/sys/rump/net/lib/Makefile:1.1 src/sys/rump/net/lib/Makefile:1.2
--- src/sys/rump/net/lib/Makefile:1.1 Thu Oct 2 21:59:19 2008
+++ src/sys/rump/net/lib/Makefile Sun Dec 5 16:53:47 2010
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2008/10/02 21:59:19 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2010/12/05 16:53:47 pooka Exp $
#
-.include "${.CURDIR}/../Makefile.rumpnet"
+.include "${.CURDIR}/../Makefile.rumpnetcomp"
SUBDIR+= ${RUMPNETLIBS}
Added files:
Index: src/sys/rump/dev/Makefile.rumpdevcomp
diff -u /dev/null src/sys/rump/dev/Makefile.rumpdevcomp:1.1
--- /dev/null Sun Dec 5 16:53:47 2010
+++ src/sys/rump/dev/Makefile.rumpdevcomp Sun Dec 5 16:53:46 2010
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile.rumpdevcomp,v 1.1 2010/12/05 16:53:46 pooka Exp $
+#
+
+RUMPDEVLIST= audio bpf cgd disk dm fss md netsmb pad putter raidframe \
+ rnd scsipi scsitest sysmon ubt ucom ugenhc ulpt umass usb wscons
+
+.for var in ${RUMPDEVLIST}
+RUMPDEVLIBS+=lib${var}
+RUMPDEVLDADD+=-lrumpdev_${var}
+.endfor
Index: src/sys/rump/fs/Makefile.rumpfscomp
diff -u /dev/null src/sys/rump/fs/Makefile.rumpfscomp:1.1
--- /dev/null Sun Dec 5 16:53:47 2010
+++ src/sys/rump/fs/Makefile.rumpfscomp Sun Dec 5 16:53:46 2010
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile.rumpfscomp,v 1.1 2010/12/05 16:53:46 pooka Exp $
+#
+
+RUMPFSCOMP= cd9660 efs ext2fs fdesc ffs hfs kernfs lfs mfs msdos \
+ nfs nilfs ntfs null ptyfs smbfs syspuffs sysvbfs \
+ tmpfs udf umap union
+
+RUMPFSCOMP+= nfsserver
+
+RUMPVFSCOMP+= fifo layer
+
+.for var in ${RUMPFSCOMP}
+RUMPFSLIBS+=lib${var}
+RUMPFSLDADD+=-lrumpfs_${var}
+.endfor
+
+.for var in ${RUMPVFSCOMP}
+RUMPFSLIBS+=lib${var}vfs
+RUMPFSLDADD+=-lrumpvfs_${var}fs
+.endfor
Index: src/sys/rump/net/Makefile.rumpnetcomp
diff -u /dev/null src/sys/rump/net/Makefile.rumpnetcomp:1.1
--- /dev/null Sun Dec 5 16:53:47 2010
+++ src/sys/rump/net/Makefile.rumpnetcomp Sun Dec 5 16:53:46 2010
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile.rumpnetcomp,v 1.1 2010/12/05 16:53:46 pooka Exp $
+#
+
+RUMPNETCOMP= net net80211 netbt netinet local sockin shmif virtif
+
+.for var in ${RUMPNETCOMP}
+RUMPNETLIBS+=lib${var}
+RUMPNETLDADD+=-lrumpnet_${var}
+.endfor
