Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use RUMP_ACTION to avoid having to specify the same information

Browse Source 
in the Makefiles of all the consumers.
This commit is contained in:
pooka 2009-12-19 15:03:34 +00:00
parent 67bcc5b200
commit eb2ef0c632
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sbin/cgdconfig/Makefile
View File

@ -1,10 +1,8 @@
# $NetBSD: Makefile,v 1.12 2009/09/08 21:36:35 pooka Exp $
# $NetBSD: Makefile,v 1.13 2009/12/19 15:03:34 pooka Exp $
PROG= cgdconfig
MAN= cgdconfig.8
SRCS+= cgd_kernelops.c
.include "${.CURDIR}/Makefile.cgdconfig"
.include <bsd.prog.mk>

10
sbin/cgdconfig/Makefile.cgdconfig
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.cgdconfig,v 1.1 2009/09/08 21:36:35 pooka Exp $
# $NetBSD: Makefile.cgdconfig,v 1.2 2009/12/19 15:03:34 pooka Exp $
#
SRCS+= cgdconfig.c \
@ -22,3 +22,11 @@ CGDCONFIGDIR= ${NETBSDSRCDIR}/sbin/cgdconfig
.PATH: ${CGDCONFIGDIR}
CPPFLAGS+= -I${CGDCONFIGDIR}
.ifdef RUMP_ACTION
LDADD+= -lrumpdev_cgd -lrumpdev_disk -lrumpdev -lrumpcrypto
LDADD+= -lrumpvfs -lrump -lrumpuser -lpthread
SRCS+= cgd_rumpops.c
.else
SRCS+= cgd_kernelops.c
.endif

4
share/examples/rump/img2cgd/cgd_rumpops.c → sbin/cgdconfig/cgd_rumpops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cgd_rumpops.c,v 1.1 2009/09/08 21:48:25 pooka Exp $ */
/* $NetBSD: cgd_rumpops.c,v 1.1 2009/12/19 15:03:34 pooka Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: cgd_rumpops.c,v 1.1 2009/09/08 21:48:25 pooka Exp $");
__RCSID("$NetBSD: cgd_rumpops.c,v 1.1 2009/12/19 15:03:34 pooka Exp $");
#endif /* !lint */
#include <sys/types.h>

12
share/examples/rump/img2cgd/Makefile
View File

@ -1,16 +1,14 @@
PROG= img2cgd
SRCS= img2cgd.c cgd_rumpops.c
SRCS= img2cgd.c
NOMAN=
.include <bsd.own.mk>
RUMP_ACTION= #defined
CPPFLAGS+= -DCGDCONFIG_AS_LIB
.include "${NETBSDSRCDIR}/sbin/cgdconfig/Makefile.cgdconfig"
LDADD+= -lrumpdev_cgd -lrumpdev_disk -lrumpdev -lrumpcrypto
LDADD+= -lrumpvfs -lrump -lrumpuser -lpthread
CPPFLAGS+= -DCGDCONFIG_AS_LIB
DBG=-g -O0
DBG= -g -O0
WARNS= 3
.include <bsd.prog.mk>