[src/trunk]: src/sys/rump/dev/lib/libpci Rework how the external hypercalls a...

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

details:   https://anonhg.NetBSD.org/src/rev/669bc9470d5c
branches:  trunk
changeset: 808810:669bc9470d5c
user:      pooka <pooka%NetBSD.org@localhost>
date:      Wed Jun 03 13:41:56 2015 +0000

description:
Rework how the external hypercalls are specified, more in the direction of
something general.  I'm not sure if it's entirely general yet (since PCI
is the only place to use it), but at least a step in the right direction.

diffstat:

 sys/rump/dev/lib/libpci/Makefile |  20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diffs (38 lines):

diff -r 77f106b88d49 -r 669bc9470d5c sys/rump/dev/lib/libpci/Makefile
--- a/sys/rump/dev/lib/libpci/Makefile  Wed Jun 03 13:06:26 2015 +0000
+++ b/sys/rump/dev/lib/libpci/Makefile  Wed Jun 03 13:41:56 2015 +0000
@@ -1,8 +1,10 @@
-#      $NetBSD: Makefile,v 1.4 2014/08/22 14:28:58 pooka Exp $
+#      $NetBSD: Makefile,v 1.5 2015/06/03 13:41:56 pooka Exp $
 #
 
 RUMPTOP= ${TOPRUMP}
 
+.include <bsd.own.mk>
+
 .PATH: ${RUMPTOP}/../dev/pci
 
 LIB=   rumpdev_pci
@@ -27,11 +29,17 @@
 CPPFLAGS+=-DRUMP_PCI_IOSPACE
 .endif
 
-.if defined(RUMP_PCI_USER)
-RUMPCOMP_USER_SRCS=    ${RUMP_PCI_USER}
-RUMPCOMP_INCS_DIR:=    ${.PARSEDIR}
-RUMPCOMP_USER_CPPFLAGS=-I${RUMPCOMP_INCS_DIR}
-.endif
+.PATH:                 ${RUMPCOMP_USER_PATH.rumpdev_pci}
+RUMPCOMP_USER_SRCS=    ${RUMPCOMP_USER_SRCS.rumpdev_pci}
+MYDIR:=                        ${.PARSEDIR}
+RUMPCOMP_USER_CPPFLAGS=        -I${MYDIR}
+RUMPCOMP_USER_CPPFLAGS+=${RUMPCOMP_USER_CPPFLAGS.rumpdev_pci}
+RUMPCOMP_USER_CFLAGS=  ${RUMPCOMP_USER_CFLAGS.rumpdev_pci}
+
+CPPFLAGS+=             ${RUMPCOMP_CPPFLAGS.rumpdev_pci}
+
+# XXX: messy
+.undef RUMPKERN_ONLY
 
 .include "${RUMPTOP}/Makefile.rump"
 .include <bsd.lib.mk>