Module Name: src Committed By: pooka Date: Wed Jun 3 13:41:56 UTC 2015
Modified Files: src/sys/rump/dev/lib/libpci: Makefile Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libpci/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/libpci/Makefile diff -u src/sys/rump/dev/lib/libpci/Makefile:1.4 src/sys/rump/dev/lib/libpci/Makefile:1.5 --- src/sys/rump/dev/lib/libpci/Makefile:1.4 Fri Aug 22 14:28:58 2014 +++ src/sys/rump/dev/lib/libpci/Makefile Wed Jun 3 13:41:56 2015 @@ -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+= -I${RUMPTOP}/librump/rumpvfs 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>