[src/trunk]: src/sys/rump/kern/lib Make the cool syscall autogeneration featu...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/831085cc7a33
branches:  trunk
changeset: 338031:831085cc7a33
user:      pooka <pooka%NetBSD.org@localhost>
date:      Sat May 09 12:03:10 2015 +0000

description:
Make the cool syscall autogeneration feature work with the
newfangled r/o src feature.

diffstat:

 sys/rump/kern/lib/Makefile.sys           |  16 ++++++++++++----
 sys/rump/kern/lib/libsys_cygwin/Makefile |  12 ++++++------
 sys/rump/kern/lib/libsys_linux/Makefile  |  12 ++++++------
 sys/rump/kern/lib/libsys_sunos/Makefile  |  12 ++++++------
 4 files changed, 30 insertions(+), 22 deletions(-)

diffs (106 lines):

diff -r c7b344c0e4dc -r 831085cc7a33 sys/rump/kern/lib/Makefile.sys
--- a/sys/rump/kern/lib/Makefile.sys    Sat May 09 11:53:34 2015 +0000
+++ b/sys/rump/kern/lib/Makefile.sys    Sat May 09 12:03:10 2015 +0000
@@ -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}
diff -r c7b344c0e4dc -r 831085cc7a33 sys/rump/kern/lib/libsys_cygwin/Makefile
--- a/sys/rump/kern/lib/libsys_cygwin/Makefile  Sat May 09 11:53:34 2015 +0000
+++ b/sys/rump/kern/lib/libsys_cygwin/Makefile  Sat May 09 12:03:10 2015 +0000
@@ -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
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
+
+SYS_P=rump_cygwin_sys
+.include "../Makefile.sys"
 
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>
-
-SYS_P=rump_cygwin_sys
-.include "../Makefile.sys"
diff -r c7b344c0e4dc -r 831085cc7a33 sys/rump/kern/lib/libsys_linux/Makefile
--- a/sys/rump/kern/lib/libsys_linux/Makefile   Sat May 09 11:53:34 2015 +0000
+++ b/sys/rump/kern/lib/libsys_linux/Makefile   Sat May 09 12:03:10 2015 +0000
@@ -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 @@
        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
 
+SYS_P=rump_linux_sys
+.include "../Makefile.sys"
+
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>
-
-SYS_P=rump_linux_sys
-.include "../Makefile.sys"
diff -r c7b344c0e4dc -r 831085cc7a33 sys/rump/kern/lib/libsys_sunos/Makefile
--- a/sys/rump/kern/lib/libsys_sunos/Makefile   Sat May 09 11:53:34 2015 +0000
+++ b/sys/rump/kern/lib/libsys_sunos/Makefile   Sat May 09 12:03:10 2015 +0000
@@ -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
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
+
+SYS_P=rump_sunos_sys
+.include "../Makefile.sys"
 
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>
-
-SYS_P=rump_sunos_sys
-.include "../Makefile.sys"