Module Name: src
Committed By: pooka
Date: Sat May 9 12:03:11 UTC 2015
Modified Files:
src/sys/rump/kern/lib: Makefile.sys
src/sys/rump/kern/lib/libsys_cygwin: Makefile
src/sys/rump/kern/lib/libsys_linux: Makefile
src/sys/rump/kern/lib/libsys_sunos: Makefile
Log Message:
Make the cool syscall autogeneration feature work with the
newfangled r/o src feature.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/kern/lib/Makefile.sys
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/kern/lib/libsys_cygwin/Makefile
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/kern/lib/libsys_linux/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/kern/lib/libsys_sunos/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/kern/lib/Makefile.sys
diff -u src/sys/rump/kern/lib/Makefile.sys:1.1 src/sys/rump/kern/lib/Makefile.sys:1.2
--- src/sys/rump/kern/lib/Makefile.sys:1.1 Sun Mar 8 15:22:02 2015
+++ src/sys/rump/kern/lib/Makefile.sys Sat May 9 12:03:10 2015
@@ -1,8 +1,16 @@
-# $NetBSD: Makefile.sys,v 1.1 2015/03/08 15:22:02 christos Exp $
+# $NetBSD: Makefile.sys,v 1.2 2015/05/09 12:03:10 pooka Exp $
SYS_MKSYSCALLS=${.CURDIR}/../../../../kern/makesyscalls.sh
-SYS_DST=${SYS_P}calls.c ${SYS_P}ent.c ${SYS_P}callargs.h ${SYS_P}call.h:
-SYS_SRC=${SYS_MKSYSCALLS} syscalls.conf syscalls.master
+
+SYS_DST= ${SYS_P}calls.c ${SYS_P}ent.c ${SYS_P}callargs.h ${SYS_P}call.h
+SYS_SRC=${SYS_MKSYSCALLS} ${.CURDIR}/syscalls.conf ${.CURDIR}/syscalls.master
${SYS_DST}: ${SYS_SRC}
- cd ${.CURDIR} && ${HOST_SH} ${.ALLSRC}
+ cd ${.OBJDIR} && ${HOST_SH} ${.ALLSRC}
+
+CPPFLAGS+= -I${.OBJDIR}
+
+DPSRCS+= ${SYS_P}callargs.h
+SRCS+= ${SYS_P}ent.c
+
+CLEANFILES+= ${SYS_DST}
Index: src/sys/rump/kern/lib/libsys_cygwin/Makefile
diff -u src/sys/rump/kern/lib/libsys_cygwin/Makefile:1.3 src/sys/rump/kern/lib/libsys_cygwin/Makefile:1.4
--- src/sys/rump/kern/lib/libsys_cygwin/Makefile:1.3 Sun Mar 8 15:19:40 2015
+++ src/sys/rump/kern/lib/libsys_cygwin/Makefile Sat May 9 12:03:10 2015
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.3 2015/03/08 15:19:40 christos Exp $
+# $NetBSD: Makefile,v 1.4 2015/05/09 12:03:10 pooka Exp $
#
LIB= rumpkern_sys_cygwin
-SRCS= rump_cygwin_compat.c rump_cygwin_sysent.c
+SRCS= rump_cygwin_compat.c
SRCS+= sys_cygwin_component.c
# XXX
-CPPFLAGS+= -I${.CURDIR} -I${RUMPTOP}/librump/rumpkern
-
-.include <bsd.lib.mk>
-.include <bsd.klinks.mk>
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
SYS_P=rump_cygwin_sys
.include "../Makefile.sys"
+
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>
Index: src/sys/rump/kern/lib/libsys_linux/Makefile
diff -u src/sys/rump/kern/lib/libsys_linux/Makefile:1.8 src/sys/rump/kern/lib/libsys_linux/Makefile:1.9
--- src/sys/rump/kern/lib/libsys_linux/Makefile:1.8 Sun Mar 8 15:20:07 2015
+++ src/sys/rump/kern/lib/libsys_linux/Makefile Sat May 9 12:03:10 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/03/08 15:20:07 christos Exp $
+# $NetBSD: Makefile,v 1.9 2015/05/09 12:03:10 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../compat/linux/common
@@ -11,15 +11,15 @@ SRCS= linux_blkio.c linux_cdrom.c linux_
linux_sysctl.c linux_termios.c linux_time.c linux_file64.c \
linux_pipe.c
-SRCS+= rump_linux_sysent.c linux_rump.c
+SRCS+= linux_rump.c
SRCS+= sys_linux_component.c
# XXX
-CPPFLAGS+= -I${.CURDIR} -I${RUMPTOP}/librump/rumpkern
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
CPPFLAGS+= -DINET6
-.include <bsd.lib.mk>
-.include <bsd.klinks.mk>
-
SYS_P=rump_linux_sys
.include "../Makefile.sys"
+
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>
Index: src/sys/rump/kern/lib/libsys_sunos/Makefile
diff -u src/sys/rump/kern/lib/libsys_sunos/Makefile:1.4 src/sys/rump/kern/lib/libsys_sunos/Makefile:1.5
--- src/sys/rump/kern/lib/libsys_sunos/Makefile:1.4 Sun Mar 8 15:21:20 2015
+++ src/sys/rump/kern/lib/libsys_sunos/Makefile Sat May 9 12:03:11 2015
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.4 2015/03/08 15:21:20 christos Exp $
+# $NetBSD: Makefile,v 1.5 2015/05/09 12:03:11 pooka Exp $
#
LIB= rumpkern_sys_sunos
-SRCS= rump_sunos_compat.c rump_sunos_sysent.c
+SRCS= rump_sunos_compat.c
SRCS+= sys_sunos_component.c
# XXX
-CPPFLAGS+= -I${.CURDIR} -I${RUMPTOP}/librump/rumpkern
-
-.include <bsd.lib.mk>
-.include <bsd.klinks.mk>
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
SYS_P=rump_sunos_sys
.include "../Makefile.sys"
+
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>
