Module Name: src
Committed By: pooka
Date: Tue Dec 2 01:59:17 UTC 2014
Modified Files:
src/sys/rump: Makefile.rump
src/sys/rump/librump/rumpdev: Makefile.rumpdev
src/sys/rump/librump/rumpkern: Makefile.rumpkern
src/sys/rump/librump/rumpnet: Makefile.rumpnet
src/sys/rump/librump/rumpvfs: Makefile.rumpvfs
Removed Files:
src/sys/rump/dev/lib/libaudio: shlib_version
src/sys/rump/dev/lib/libaudio_ac97: shlib_version
src/sys/rump/dev/lib/libbpf: shlib_version
src/sys/rump/dev/lib/libcgd: shlib_version
src/sys/rump/dev/lib/libdisk: shlib_version
src/sys/rump/dev/lib/libdm: shlib_version
src/sys/rump/dev/lib/libdrvctl: shlib_version
src/sys/rump/dev/lib/libfss: shlib_version
src/sys/rump/dev/lib/libhdaudio_hdafg: shlib_version
src/sys/rump/dev/lib/libmd: shlib_version
src/sys/rump/dev/lib/libmiiphy: shlib_version
src/sys/rump/dev/lib/libnetsmb: shlib_version
src/sys/rump/dev/lib/libopencrypto: shlib_version
src/sys/rump/dev/lib/libpad: shlib_version
src/sys/rump/dev/lib/libpci: shlib_version
src/sys/rump/dev/lib/libpci_eap: shlib_version
src/sys/rump/dev/lib/libpci_hdaudio: shlib_version
src/sys/rump/dev/lib/libpci_if_iwn: shlib_version
src/sys/rump/dev/lib/libpci_if_pcn: shlib_version
src/sys/rump/dev/lib/libpci_if_wm: shlib_version
src/sys/rump/dev/lib/libpci_virtio: shlib_version
src/sys/rump/dev/lib/libpud: shlib_version
src/sys/rump/dev/lib/libputter: shlib_version
src/sys/rump/dev/lib/libraidframe: shlib_version
src/sys/rump/dev/lib/librnd: shlib_version
src/sys/rump/dev/lib/libscsipi: shlib_version
src/sys/rump/dev/lib/libsysmon: shlib_version
src/sys/rump/dev/lib/libubt: shlib_version
src/sys/rump/dev/lib/libucom: shlib_version
src/sys/rump/dev/lib/libugenhc: shlib_version
src/sys/rump/dev/lib/libulpt: shlib_version
src/sys/rump/dev/lib/libumass: shlib_version
src/sys/rump/dev/lib/libusb: shlib_version
src/sys/rump/dev/lib/libvirtio_if_vioif: shlib_version
src/sys/rump/dev/lib/libvirtio_ld: shlib_version
src/sys/rump/dev/lib/libvirtio_viornd: shlib_version
src/sys/rump/dev/lib/libvnd: shlib_version
src/sys/rump/dev/lib/libwscons: shlib_version
src/sys/rump/dev/wip/libukbd: shlib_version
src/sys/rump/dev/wip/libums: shlib_version
src/sys/rump/dev/wip/libusbrum: shlib_version
src/sys/rump/fs/lib/libaio: shlib_version
src/sys/rump/fs/lib/libcd9660: shlib_version
src/sys/rump/fs/lib/libefs: shlib_version
src/sys/rump/fs/lib/libext2fs: shlib_version
src/sys/rump/fs/lib/libfdesc: shlib_version
src/sys/rump/fs/lib/libffs: shlib_version
src/sys/rump/fs/lib/libfifovfs: shlib_version
src/sys/rump/fs/lib/libhfs: shlib_version
src/sys/rump/fs/lib/libkernfs: shlib_version
src/sys/rump/fs/lib/liblayervfs: shlib_version
src/sys/rump/fs/lib/liblfs: shlib_version
src/sys/rump/fs/lib/libmfs: shlib_version
src/sys/rump/fs/lib/libmsdos: shlib_version
src/sys/rump/fs/lib/libnfs: shlib_version
src/sys/rump/fs/lib/libnfsserver: shlib_version
src/sys/rump/fs/lib/libnilfs: shlib_version
src/sys/rump/fs/lib/libntfs: shlib_version
src/sys/rump/fs/lib/libnull: shlib_version
src/sys/rump/fs/lib/libptyfs: shlib_version
src/sys/rump/fs/lib/libsmbfs: shlib_version
src/sys/rump/fs/lib/libsyspuffs: shlib_version
src/sys/rump/fs/lib/libsysvbfs: shlib_version
src/sys/rump/fs/lib/libtmpfs: shlib_version
src/sys/rump/fs/lib/libudf: shlib_version
src/sys/rump/fs/lib/libumap: shlib_version
src/sys/rump/fs/lib/libunion: shlib_version
src/sys/rump/fs/lib/libv7fs: shlib_version
src/sys/rump/fs/lib/libzfs: shlib_version
src/sys/rump/kern/lib/libcrypto: shlib_version
src/sys/rump/kern/lib/libsljit: shlib_version
src/sys/rump/kern/lib/libsolaris: shlib_version
src/sys/rump/kern/lib/libsys_cygwin: shlib_version
src/sys/rump/kern/lib/libsys_linux: shlib_version
src/sys/rump/kern/lib/libsys_sunos: shlib_version
src/sys/rump/kern/lib/libtty: shlib_version
src/sys/rump/kern/lib/libz: shlib_version
src/sys/rump/net/lib/libagr: shlib_version
src/sys/rump/net/lib/libbpfjit: shlib_version
src/sys/rump/net/lib/libbridge: shlib_version
src/sys/rump/net/lib/liblocal: shlib_version
src/sys/rump/net/lib/libnet: shlib_version
src/sys/rump/net/lib/libnet80211: shlib_version
src/sys/rump/net/lib/libnetbt: shlib_version
src/sys/rump/net/lib/libnetinet: shlib_version
src/sys/rump/net/lib/libnetinet6: shlib_version
src/sys/rump/net/lib/libnetmpls: shlib_version
src/sys/rump/net/lib/libnpf: shlib_version
src/sys/rump/net/lib/libshmif: shlib_version
src/sys/rump/net/lib/libsockin: shlib_version
src/sys/rump/net/lib/libvirtif: shlib_version
Log Message:
Remove shlib_version files and just use Makefile SHLIB_MAJOR/MINOR,
with the default provided by Makefile.rump (they're all 0.0 anyway)
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/sys/rump/Makefile.rump
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libaudio/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libaudio_ac97/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libbpf/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libcgd/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libdisk/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libdm/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libdrvctl/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libfss/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libhdaudio_hdafg/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libmd/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libmiiphy/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libnetsmb/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libopencrypto/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libpad/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libpci/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libpci_eap/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libpci_hdaudio/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libpci_if_iwn/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libpci_if_pcn/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libpci_if_wm/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libpci_virtio/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libpud/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libputter/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libraidframe/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/librnd/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libscsipi/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libsysmon/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libubt/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libucom/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libugenhc/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libulpt/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libumass/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libusb/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libvirtio_if_vioif/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libvirtio_ld/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libvirtio_viornd/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libvnd/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libwscons/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/wip/libukbd/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/wip/libums/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/wip/libusbrum/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libaio/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libcd9660/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libefs/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libext2fs/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libfdesc/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libffs/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libfifovfs/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libhfs/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libkernfs/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/liblayervfs/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/liblfs/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libmfs/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libmsdos/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libnfs/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libnfsserver/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libnilfs/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libntfs/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libnull/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libptyfs/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libsmbfs/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libsyspuffs/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libsysvbfs/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libtmpfs/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libudf/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libumap/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libunion/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libv7fs/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libzfs/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/kern/lib/libcrypto/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/kern/lib/libsljit/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/kern/lib/libsolaris/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/kern/lib/libsys_cygwin/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/kern/lib/libsys_linux/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/kern/lib/libsys_sunos/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/kern/lib/libtty/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/kern/lib/libz/shlib_version
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/librump/rumpdev/Makefile.rumpdev
cvs rdiff -u -r1.150 -r1.151 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.15 -r1.16 src/sys/rump/librump/rumpnet/Makefile.rumpnet
cvs rdiff -u -r1.42 -r1.43 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs
cvs rdiff -u -r1.1 -r0 src/sys/rump/net/lib/libagr/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/net/lib/libbpfjit/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/net/lib/libbridge/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/net/lib/liblocal/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/net/lib/libnet/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/net/lib/libnet80211/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/net/lib/libnetbt/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/net/lib/libnetinet/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/net/lib/libnetinet6/shlib_version
cvs rdiff -u -r1.2 -r0 src/sys/rump/net/lib/libnetmpls/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/net/lib/libnpf/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/net/lib/libshmif/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/net/lib/libsockin/shlib_version
cvs rdiff -u -r1.1 -r0 src/sys/rump/net/lib/libvirtif/shlib_version
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/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.102 src/sys/rump/Makefile.rump:1.103
--- src/sys/rump/Makefile.rump:1.102 Mon Dec 1 23:08:15 2014
+++ src/sys/rump/Makefile.rump Tue Dec 2 01:59:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.102 2014/12/01 23:08:15 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.103 2014/12/02 01:59:10 pooka Exp $
#
.if !defined(_RUMP_MK)
@@ -44,6 +44,9 @@ CPPFLAGS+= -I${RUMPTOP}/../../common/inc
CPPFLAGS+= -I${RUMPTOP}/include
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern/opt
+SHLIB_MAJOR?= 0
+SHLIB_MINOR?= 0
+
.ifdef NEED_ISYSTEM
CPPFLAGS+= -isystem ${RUMPTOP}/../arch
CPPFLAGS+= -isystem ${RUMPTOP}/..
Index: src/sys/rump/librump/rumpdev/Makefile.rumpdev
diff -u src/sys/rump/librump/rumpdev/Makefile.rumpdev:1.8 src/sys/rump/librump/rumpdev/Makefile.rumpdev:1.9
--- src/sys/rump/librump/rumpdev/Makefile.rumpdev:1.8 Fri Sep 20 16:49:00 2013
+++ src/sys/rump/librump/rumpdev/Makefile.rumpdev Tue Dec 2 01:59:15 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpdev,v 1.8 2013/09/20 16:49:00 pooka Exp $
+# $NetBSD: Makefile.rumpdev,v 1.9 2014/12/02 01:59:15 pooka Exp $
#
LIB= rumpdev
@@ -14,10 +14,6 @@ SRCS= rump_dev.c autoconf.c
# sys/kern
SRCS+= kern_pmf.c subr_autoconf.c
-# automatically in sync src/lib
-SHLIB_MAJOR= 0
-SHLIB_MINOR= 0
-
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpdev/opt
.include "${RUMPTOP}/Makefile.rump"
Index: src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.150 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.151
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.150 Sun Nov 9 17:39:38 2014
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Tue Dec 2 01:59:15 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.150 2014/11/09 17:39:38 pooka Exp $
+# $NetBSD: Makefile.rumpkern,v 1.151 2014/12/02 01:59:15 pooka Exp $
#
.include "${RUMPTOP}/Makefile.rump"
@@ -182,10 +182,6 @@ SRCS+= subr_lockdebug.c
SRCS+= kern_ktrace.c
.endif
-# no shlib_version because this is automatically in sync with lib/librump
-SHLIB_MAJOR= 0
-SHLIB_MINOR= 0
-
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpvfs
CPPFLAGS+= -I${RUMPTOP}/librump/rumpnet -I${RUMPTOP}/librump/rumpdev
AFLAGS+= -D_LOCORE -Wa,--fatal-warnings
Index: src/sys/rump/librump/rumpnet/Makefile.rumpnet
diff -u src/sys/rump/librump/rumpnet/Makefile.rumpnet:1.15 src/sys/rump/librump/rumpnet/Makefile.rumpnet:1.16
--- src/sys/rump/librump/rumpnet/Makefile.rumpnet:1.15 Thu Jun 5 23:48:17 2014
+++ src/sys/rump/librump/rumpnet/Makefile.rumpnet Tue Dec 2 01:59:16 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpnet,v 1.15 2014/06/05 23:48:17 rmind Exp $
+# $NetBSD: Makefile.rumpnet,v 1.16 2014/12/02 01:59:16 pooka Exp $
#
LIB= rumpnet
@@ -31,10 +31,6 @@ SRCS+=
# bpf stubs, required for all kernels
SRCS+= bpf_stub.c
-# automatically in sync src/lib
-SHLIB_MAJOR= 0
-SHLIB_MINOR= 0
-
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpnet/opt
.include "${RUMPTOP}/Makefile.rump"
Index: src/sys/rump/librump/rumpvfs/Makefile.rumpvfs
diff -u src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.42 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.43
--- src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.42 Sun Nov 9 17:39:38 2014
+++ src/sys/rump/librump/rumpvfs/Makefile.rumpvfs Tue Dec 2 01:59:16 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpvfs,v 1.42 2014/11/09 17:39:38 pooka Exp $
+# $NetBSD: Makefile.rumpvfs,v 1.43 2014/12/02 01:59:16 pooka Exp $
#
.include "${RUMPTOP}/Makefile.rump"
@@ -74,10 +74,6 @@ SRCS+= vfs_syscalls_50.c compat.c
SRCS+= rumpvnode_if.c
-# no shlib_version because this is automatically in sync with lib/librump
-SHLIB_MAJOR= 0
-SHLIB_MINOR= 0
-
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
.include <bsd.lib.mk>
